diff --git a/dbflute.xml b/dbflute.xml
index c867d8f8ebe2e14627493e833d9f6c15cb780790..25d86f2042ebf9e7ba339f7902a9995a48cdf24c 100644
--- a/dbflute.xml
+++ b/dbflute.xml
@@ -2,7 +2,7 @@
 <project name="dbflute" basedir=".">
 	<property name="mydbflute.dir" value="${basedir}/mydbflute" />
 	<property name="target.dir" value="${basedir}/target" />
-	<property name="branch.name" value="es-5.6" />
+	<property name="branch.name" value="es-6.0" />
 	<property name="mydbflute.url" value="https://github.com/lastaflute/lastaflute-example-waterfront/archive/${branch.name}.zip" />
 
 	<target name="mydbflute.check">
diff --git a/dbflute_fess/dfprop/esfluteMap.dfprop b/dbflute_fess/dfprop/esfluteMap.dfprop
index 3921a80c4dcd0f54eb900fe448e9b37baee9e624..154bf9dfe260961604fa5463a30c128c452c5871 100644
--- a/dbflute_fess/dfprop/esfluteMap.dfprop
+++ b/dbflute_fess/dfprop/esfluteMap.dfprop
@@ -8,19 +8,209 @@ map:{
     # settings for indexes
     ; indexMap = map:{
         # Index: .fess_user
-        ; .fess_user = map:{
+        ; .fess_user.group = map:{
+            ; package = user
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_user.xml
+        }
+        ; .fess_user.role = map:{
+            ; package = user
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_user.xml
+        }
+        ; .fess_user.user = map:{
             ; package = user
             ; esclientDiFile = esclient.xml
             ; esfluteDiFile = esflute_user.xml
         }
         # Index: .fess_user
-        ; .fess_config = map:{
+        ; .fess_config.access_token = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.bad_word = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.boost_document_rule = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.crawling_info = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.crawling_info_param = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.data_config = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.data_config_to_label = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.data_config_to_role = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.duplicate_host = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.elevate_word = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.elevate_word_to_label = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.failure_url = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.file_authentication = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.file_config = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.file_config_to_label = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.file_config_to_role = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.job_log = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.key_match = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.label_to_role = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.label_type = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.path_mapping = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.related_content = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.related_query = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.request_header = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.role_type = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.scheduled_job = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.thumbnail_queue = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.web_authentication = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.web_config = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.web_config_to_label = map:{
+            ; package = config
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_config.xml
+        }
+        ; .fess_config.web_config_to_role = map:{
             ; package = config
             ; esclientDiFile = esclient.xml
             ; esfluteDiFile = esflute_config.xml
         }
         # Index: .fess_user
-        ; fess_log = map:{
+        ; fess_log.click_log = map:{
+            ; package = log
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_log.xml
+            ; mappingMap = map:{
+                ; type = map:{
+                    ; date@dateOptionalTime = LocalDateTime
+                }
+            }
+        }
+        ; fess_log.favorite_log = map:{
+            ; package = log
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_log.xml
+            ; mappingMap = map:{
+                ; type = map:{
+                    ; date@dateOptionalTime = LocalDateTime
+                }
+            }
+        }
+        ; fess_log.search_log = map:{
+            ; package = log
+            ; esclientDiFile = esclient.xml
+            ; esfluteDiFile = esflute_log.xml
+            ; mappingMap = map:{
+                ; type = map:{
+                    ; date@dateOptionalTime = LocalDateTime
+                }
+            }
+        }
+        ; fess_log.user_info = map:{
             ; package = log
             ; esclientDiFile = esclient.xml
             ; esfluteDiFile = esflute_log.xml
@@ -31,5 +221,5 @@ map:{
             }
         }
     }
-    ; elasticsearchVersion = 5.0.2
+    ; elasticsearchVersion = 6.0.0
 }
diff --git a/plugin.xml b/plugin.xml
index dc68f9dc7d329c53407a095422f8bc6ebb0768ca..8ddbe3dea9698b0f2b83a29e537307b671be874d 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -15,66 +15,66 @@
 		<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="5.5.0" />
-			<param name="plugin.zip.version" value="5.5.0" />
+			<param name="plugin.version" value="6.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.0.0-20170929.212801-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="5.5.0" />
-			<param name="plugin.zip.version" value="5.5.0" />
+			<param name="plugin.version" value="6.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.0.0-20171009.082300-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="5.5.0" />
-			<param name="plugin.zip.version" value="5.5.0" />
+			<param name="plugin.version" value="6.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.0.0-20171009.124614-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="5.5.0" />
-			<param name="plugin.zip.version" value="5.5.0" />
+			<param name="plugin.version" value="6.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.0.0-20171021.010126-1" />
 		</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="5.5.0" />
-			<param name="plugin.zip.version" value="5.5.0" />
+			<param name="plugin.version" value="6.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.0.0-20171021.021412-1" />
 		</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="5.5.0" />
-			<param name="plugin.zip.version" value="5.5.0" />
+			<param name="plugin.version" value="6.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.0.0-20171021.060118-1" />
 		</antcall>
 		<!-- minhash -->
 		<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="minhash" />
-			<param name="plugin.version" value="5.5.0" />
-			<param name="plugin.zip.version" value="5.5.0" />
+			<param name="plugin.version" value="6.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.0.0-20171021.021949-1" />
 		</antcall>
 		<!-- kopf -->
 		<get dest="${target.dir}/kopf.zip">
@@ -130,7 +130,7 @@ mv plugins/analysis-seunjeon/elasticsearch/* plugins/analysis-seunjeon/
 
 # Japanese
 # https://github.com/codelibs/elasticsearch-analysis-kuromoji-neologd
-PLUGIN_VERSION=5.5.0
+PLUGIN_VERSION=6.0.0-SNAPSHOT
 rm -rf plugins/analysis-kuromoji-neologd
 wget -O target/analysis-kuromoji-neologd.zip http://central.maven.org/maven2/org/codelibs/elasticsearch-analysis-kuromoji-neologd/${PLUGIN_VERSION}/elasticsearch-analysis-kuromoji-neologd-${PLUGIN_VERSION}.zip
 unzip -d plugins/analysis-kuromoji-neologd target/analysis-kuromoji-neologd.zip
@@ -138,7 +138,7 @@ mv plugins/analysis-kuromoji-neologd/elasticsearch/* plugins/analysis-kuromoji-n
 
 # Vietnamese
 # https://github.com/duydo/elasticsearch-analysis-vietnamese
-PLUGIN_VERSION=5.5.0
+PLUGIN_VERSION=6.0.0-SNAPSHOT
 rm -rf plugins/analysis-vietnamese
 wget -O target/analysis-vietnamese.zip https://github.com/duydo/elasticsearch-analysis-vietnamese/releases/download/v${PLUGIN_VERSION}/elasticsearch-analysis-vietnamese-${PLUGIN_VERSION}.zip
 unzip -d plugins/analysis-vietnamese target/analysis-vietnamese.zip
@@ -149,7 +149,7 @@ rm plugins/analysis-vietnamese/opennlp-maxent-*.jar
 rm plugins/analysis-vietnamese/jwnl-*.jar
 
 # Simplified Chinese
-PLUGIN_VERSION=5.5.0
+PLUGIN_VERSION=6.0.0-SNAPSHOT
 rm -rf plugins/analysis-smartcn
 wget -O target/analysis-smartcn.zip https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-smartcn/analysis-smartcn-${PLUGIN_VERSION}.zip
 unzip -d plugins/analysis-smartcn target/analysis-smartcn.zip
@@ -157,7 +157,7 @@ mv plugins/analysis-smartcn/elasticsearch/* plugins/analysis-smartcn/
 
 # Traditional Chinese
 # https://github.com/medcl/elasticsearch-analysis-stconvert
-PLUGIN_VERSION=5.5.0
+PLUGIN_VERSION=6.0.0-SNAPSHOT
 rm -rf plugins/analysis-stconvert
 wget -O target/analysis-stconvert.zip https://github.com/medcl/elasticsearch-analysis-stconvert/releases/download/v${PLUGIN_VERSION}/elasticsearch-analysis-stconvert-${PLUGIN_VERSION}.zip
 unzip -d plugins/analysis-stconvert target/analysis-stconvert.zip
diff --git a/pom.xml b/pom.xml
index 9b25291c0c2f3dbc10e969c8a5fb25bf16327ea5..29f1a610645e769435f94d5b30954050079a3de2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,15 +60,15 @@
 		<utflute.version>0.8.1</utflute.version>
 
 		<!-- Crawler -->
-		<crawler.version>1.5.0-SNAPSHOT</crawler.version>
+		<crawler.version>2.0.0-SNAPSHOT</crawler.version>
 
 		<!-- Suggest -->
-		<suggest.version>5.5.1-SNAPSHOT</suggest.version>
+		<suggest.version>6.0.0-SNAPSHOT</suggest.version>
 
 		<!-- Elasticsearch -->
-		<elasticsearch.version>5.5.2</elasticsearch.version>
-		<elasticsearch.min.version>5.3.0</elasticsearch.min.version>
-		<cluster.runner.version>5.5.2.0</cluster.runner.version>
+		<elasticsearch.version>6.0.0-rc1</elasticsearch.version>
+		<elasticsearch.min.version>6.0.0</elasticsearch.min.version>
+		<cluster.runner.version>6.0.0.0-rc1</cluster.runner.version>
 
 		<!-- Tomcat -->
 		<tomcat.version>8.5.21</tomcat.version>
diff --git a/src/main/config/es/fess_config.json b/src/main/config/es/fess_config.json
deleted file mode 100644
index 531548ac146c54ea03d0e4d3ad8a7b276151b504..0000000000000000000000000000000000000000
--- a/src/main/config/es/fess_config.json
+++ /dev/null
@@ -1,1007 +0,0 @@
-{
-  ".fess_config" : {
-    "mappings" : {
-      "access_token": {
-        "_all": {
-          "enabled": false
-        },
-        "properties": {
-          "name": {
-            "type": "keyword"
-          },
-          "token": {
-            "type": "keyword"
-          },
-          "permissions": {
-            "type": "keyword"
-          },
-          "parameter_name" : {
-            "type": "keyword"
-          },
-          "expiredTime" : {
-            "type" : "long"
-          },
-          "createdBy": {
-            "type": "keyword"
-          },
-          "createdTime": {
-            "type": "long"
-          },
-          "updatedBy": {
-            "type": "keyword"
-          },
-          "updatedTime": {
-            "type": "long"
-          }
-        }
-      },
-      "web_config_to_label" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "labelTypeId" : {
-            "type" : "keyword"
-          },
-          "webConfigId" : {
-            "type" : "keyword"
-          }
-        }
-      },
-      "data_config_to_role" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "dataConfigId" : {
-            "type" : "keyword"
-          },
-          "roleTypeId" : {
-            "type" : "keyword"
-          }
-        }
-      },
-      "path_mapping" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "processType" : {
-            "type": "keyword"
-          },
-          "regex" : {
-            "type": "keyword"
-          },
-          "replacement" : {
-            "type": "keyword"
-          },
-          "sortOrder" : {
-            "type" : "integer"
-          },
-          "userAgent" : {
-            "type": "keyword"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          }
-        }
-      },
-      "boost_document_rule" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "boostExpr" : {
-            "type": "keyword"
-          },
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "sortOrder" : {
-            "type" : "integer"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          },
-          "urlExpr" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "file_config_to_role" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "fileConfigId" : {
-            "type": "keyword"
-          },
-          "roleTypeId" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "job_log" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "endTime" : {
-            "type" : "long"
-          },
-          "jobName" : {
-            "type": "keyword"
-          },
-          "jobStatus" : {
-            "type": "keyword"
-          },
-          "scriptData" : {
-            "type": "keyword"
-          },
-          "scriptResult" : {
-            "type": "keyword"
-          },
-          "scriptType" : {
-            "type": "keyword"
-          },
-          "startTime" : {
-            "type" : "long"
-          },
-          "target" : {
-            "type": "keyword"
-          },
-          "lastUpdated" : {
-            "type" : "long"
-          }
-        }
-      },
-      "role_type" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "name" : {
-            "type": "keyword"
-          },
-          "sortOrder" : {
-            "type" : "integer"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          },
-          "value" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "web_config" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "available" : {
-            "type" : "boolean"
-          },
-          "boost" : {
-            "type" : "float"
-          },
-          "configParameter" : {
-            "type": "keyword"
-          },
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "depth" : {
-            "type" : "integer"
-          },
-          "description" : {
-            "type": "text"
-          },
-          "excludedDocUrls" : {
-            "type": "keyword"
-          },
-          "excludedUrls" : {
-            "type": "keyword"
-          },
-          "includedDocUrls" : {
-            "type": "keyword"
-          },
-          "includedUrls" : {
-            "type": "keyword"
-          },
-          "intervalTime" : {
-            "type" : "integer"
-          },
-          "timeToLive" : {
-            "type" : "integer"
-          },
-          "maxAccessCount" : {
-            "type" : "long"
-          },
-          "name" : {
-            "type": "keyword"
-          },
-          "numOfThread" : {
-            "type" : "integer"
-          },
-          "permissions" : {
-            "type": "keyword"
-          },
-          "sortOrder" : {
-            "type" : "integer"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          },
-          "urls" : {
-            "type": "keyword"
-          },
-          "userAgent" : {
-            "type": "keyword"
-          },
-          "virtualHosts" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "web_authentication" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "authRealm" : {
-            "type": "keyword"
-          },
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "hostname" : {
-            "type": "keyword"
-          },
-          "parameters" : {
-            "type": "keyword"
-          },
-          "password" : {
-            "type": "keyword"
-          },
-          "port" : {
-            "type" : "integer"
-          },
-          "protocolScheme" : {
-            "type": "keyword"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          },
-          "username" : {
-            "type": "keyword"
-          },
-          "webConfigId" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "data_config_to_label" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "dataConfigId" : {
-            "type": "keyword"
-          },
-          "labelTypeId" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "duplicate_host" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "duplicateHostName" : {
-            "type": "keyword"
-          },
-          "regularName" : {
-            "type": "keyword"
-          },
-          "sortOrder" : {
-            "type" : "integer"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          }
-        }
-      },
-      "request_header" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "name" : {
-            "type": "keyword"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          },
-          "value" : {
-            "type": "keyword"
-          },
-          "webConfigId" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "bad_word" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "suggestWord" : {
-            "type": "keyword"
-          },
-          "targetLabel" : {
-            "type": "keyword"
-          },
-          "targetRole" : {
-            "type": "keyword"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          }
-        }
-      },
-      "data_config" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "available" : {
-            "type" : "boolean"
-          },
-          "boost" : {
-            "type" : "float"
-          },
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "description" : {
-            "type": "text"
-          },
-          "handlerName" : {
-            "type": "keyword"
-          },
-          "handlerParameter" : {
-            "type": "keyword"
-          },
-          "handlerScript" : {
-            "type": "keyword"
-          },
-          "name" : {
-            "type": "keyword"
-          },
-          "permissions" : {
-            "type": "keyword"
-          },
-          "sortOrder" : {
-            "type" : "integer"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          },
-          "virtualHosts" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "crawling_info_param" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "crawlingInfoId" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "key" : {
-            "type": "keyword"
-          },
-          "value" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "web_config_to_role" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "roleTypeId" : {
-            "type": "keyword"
-          },
-          "webConfigId" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "file_authentication" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "fileConfigId" : {
-            "type": "keyword"
-          },
-          "hostname" : {
-            "type": "keyword"
-          },
-          "parameters" : {
-            "type": "keyword"
-          },
-          "password" : {
-            "type": "keyword"
-          },
-          "port" : {
-            "type" : "integer"
-          },
-          "protocolScheme" : {
-            "type": "keyword"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          },
-          "username" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "crawling_info" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "createdTime" : {
-            "type" : "long"
-          },
-          "expiredTime" : {
-            "type" : "long"
-          },
-          "name" : {
-            "type": "keyword"
-          },
-          "sessionId" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "key_match" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "boost" : {
-            "type" : "float"
-          },
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "maxSize" : {
-            "type" : "integer"
-          },
-          "query" : {
-            "type": "keyword"
-          },
-          "term" : {
-            "type": "keyword"
-          },
-          "virtualHost" : {
-            "type": "keyword"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          }
-        }
-      },
-      "label_to_role" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "labelTypeId" : {
-            "type": "keyword"
-          },
-          "roleTypeId" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "elevate_word_to_label" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "elevateWordId" : {
-            "type": "keyword"
-          },
-          "labelTypeId" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "elevate_word" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "boost" : {
-            "type" : "float"
-          },
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "reading" : {
-            "type": "keyword"
-          },
-          "suggestWord" : {
-            "type": "keyword"
-          },
-          "targetLabel" : {
-            "type": "keyword"
-          },
-          "targetRole" : {
-            "type": "keyword"
-          },
-          "permissions" : {
-            "type": "keyword"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          }
-        }
-      },
-      "file_config_to_label" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "fileConfigId" : {
-            "type": "keyword"
-          },
-          "labelTypeId" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "file_config" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "available" : {
-            "type" : "boolean"
-          },
-          "boost" : {
-            "type" : "float"
-          },
-          "configParameter" : {
-            "type": "keyword"
-          },
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "depth" : {
-            "type" : "integer"
-          },
-          "description" : {
-            "type": "text"
-          },
-          "excludedDocPaths" : {
-            "type": "keyword"
-          },
-          "excludedPaths" : {
-            "type": "keyword"
-          },
-          "includedDocPaths" : {
-            "type": "keyword"
-          },
-          "includedPaths" : {
-            "type": "keyword"
-          },
-          "intervalTime" : {
-            "type" : "integer"
-          },
-          "timeToLive" : {
-            "type" : "integer"
-          },
-          "maxAccessCount" : {
-            "type" : "long"
-          },
-          "name" : {
-            "type": "keyword"
-          },
-          "numOfThread" : {
-            "type" : "integer"
-          },
-          "paths" : {
-            "type": "keyword"
-          },
-          "permissions" : {
-            "type": "keyword"
-          },
-          "sortOrder" : {
-            "type" : "integer"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          },
-          "virtualHosts" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "scheduled_job" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "available" : {
-            "type" : "boolean"
-          },
-          "crawler" : {
-            "type" : "boolean"
-          },
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "cronExpression" : {
-            "type": "keyword"
-          },
-          "jobLogging" : {
-            "type" : "boolean"
-          },
-          "name" : {
-            "type": "keyword"
-          },
-          "scriptData" : {
-            "type": "keyword"
-          },
-          "scriptType" : {
-            "type": "keyword"
-          },
-          "sortOrder" : {
-            "type" : "integer"
-          },
-          "target" : {
-            "type": "keyword"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          }
-        }
-      },
-      "failure_url" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "configId" : {
-            "type": "keyword"
-          },
-          "errorCount" : {
-            "type" : "integer"
-          },
-          "errorLog" : {
-            "type": "keyword"
-          },
-          "errorName" : {
-            "type": "keyword"
-          },
-          "lastAccessTime" : {
-            "type" : "long"
-          },
-          "threadName" : {
-            "type": "keyword"
-          },
-          "url" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "label_type" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "excludedPaths" : {
-            "type": "keyword"
-          },
-          "includedPaths" : {
-            "type": "keyword"
-          },
-          "name" : {
-            "type": "keyword"
-          },
-          "permissions" : {
-            "type": "keyword"
-          },
-          "virtualHost" : {
-            "type": "keyword"
-          },
-          "sortOrder" : {
-            "type" : "integer"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          },
-          "value" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "thumbnail_queue" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "target" : {
-            "type": "keyword"
-          },
-          "generator" : {
-            "type": "keyword"
-          },
-          "thumbnail_id" : {
-            "type": "keyword"
-          },
-          "path" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "related_content" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          },
-          "term" : {
-            "type": "keyword"
-          },
-          "content" : {
-            "type": "keyword"
-          },
-          "sortOrder" : {
-            "type": "integer"
-          },
-          "virtualHost" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "related_query" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "createdBy" : {
-            "type": "keyword"
-          },
-          "createdTime" : {
-            "type" : "long"
-          },
-          "updatedBy" : {
-            "type": "keyword"
-          },
-          "updatedTime" : {
-            "type" : "long"
-          },
-          "term" : {
-            "type": "keyword"
-          },
-          "queries" : {
-            "type": "keyword"
-          },
-          "virtualHost" : {
-            "type": "keyword"
-          }
-        }
-      }
-    },
-    "settings" : {
-      "index" : {
-        "refresh_interval" : "1s",
-        "dbflute" : {
-          "access_token" : {
-            "properties" : {
-              "permissions" : {
-                "array" : "true"
-              }
-            }
-          },
-          "data_config" : {
-            "properties" : {
-              "permissions" : {
-                "array" : "true"
-              },
-              "virtualHosts" : {
-                "array" : "true"
-              }
-            }
-          },
-          "file_config" : {
-            "properties" : {
-              "permissions" : {
-                "array" : "true"
-              },
-              "virtualHosts" : {
-                "array" : "true"
-              }
-            }
-          },
-          "label_type" : {
-            "properties" : {
-              "permissions" : {
-                "array" : "true"
-              }
-            }
-          },
-          "web_config" : {
-            "properties" : {
-              "permissions" : {
-                "array" : "true"
-              },
-              "virtualHosts" : {
-                "array" : "true"
-              }
-            }
-          },
-          "elevate_word" : {
-            "properties" : {
-              "permissions" : {
-                "array" : "true"
-              }
-            }
-          },
-          "related_query" : {
-            "properties" : {
-              "queries" : {
-                "array" : "true"
-              }
-            }
-          }
-        },
-        "number_of_shards" : "2",
-        "number_of_replicas" : "0"
-      }
-    }
-  }
-}
diff --git a/src/main/config/es/fess_config_access_token.json b/src/main/config/es/fess_config_access_token.json
new file mode 100644
index 0000000000000000000000000000000000000000..77926c7e74a9c0c692981446f188643fa0e605d1
--- /dev/null
+++ b/src/main/config/es/fess_config_access_token.json
@@ -0,0 +1,62 @@
+{
+  ".fess_config.access_token" : {
+    "aliases" : { },
+    "mappings" : {
+      "access_token" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "expiredTime" : {
+            "type" : "long"
+          },
+          "name" : {
+            "type" : "keyword"
+          },
+          "parameter_name" : {
+            "type" : "keyword"
+          },
+          "permissions" : {
+            "type" : "keyword"
+          },
+          "token" : {
+            "type" : "keyword"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "dbflute" : {
+          "access_token" : {
+            "properties" : {
+              "permissions" : {
+                "array" : "true"
+              }
+            }
+          }
+        },
+        "creation_date" : "1509021049417",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "s8tK7hldQzWbNtsfzHIZZQ",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.access_token"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_bad_word.json b/src/main/config/es/fess_config_bad_word.json
new file mode 100644
index 0000000000000000000000000000000000000000..5372849b813003cc280f6e6427dde788aa96aaec
--- /dev/null
+++ b/src/main/config/es/fess_config_bad_word.json
@@ -0,0 +1,47 @@
+{
+  ".fess_config.bad_word" : {
+    "aliases" : { },
+    "mappings" : {
+      "bad_word" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "suggestWord" : {
+            "type" : "keyword"
+          },
+          "targetLabel" : {
+            "type" : "keyword"
+          },
+          "targetRole" : {
+            "type" : "keyword"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021049746",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "0xToIxg0R1KjZqA0ynv9PQ",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.bad_word"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_boost_document_rule.json b/src/main/config/es/fess_config_boost_document_rule.json
new file mode 100644
index 0000000000000000000000000000000000000000..366ade29a031fd2349043a0a6ff679e0c098a6ac
--- /dev/null
+++ b/src/main/config/es/fess_config_boost_document_rule.json
@@ -0,0 +1,47 @@
+{
+  ".fess_config.boost_document_rule" : {
+    "aliases" : { },
+    "mappings" : {
+      "boost_document_rule" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "boostExpr" : {
+            "type" : "keyword"
+          },
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "sortOrder" : {
+            "type" : "integer"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          },
+          "urlExpr" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021050077",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "AHy84s2vSoamP32r62Jy4Q",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.boost_document_rule"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_crawling_info.json b/src/main/config/es/fess_config_crawling_info.json
new file mode 100644
index 0000000000000000000000000000000000000000..92a0c453bb00f00759e6426bb439fe7f57a73b21
--- /dev/null
+++ b/src/main/config/es/fess_config_crawling_info.json
@@ -0,0 +1,38 @@
+{
+  ".fess_config.crawling_info" : {
+    "aliases" : { },
+    "mappings" : {
+      "crawling_info" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "createdTime" : {
+            "type" : "long"
+          },
+          "expiredTime" : {
+            "type" : "long"
+          },
+          "name" : {
+            "type" : "keyword"
+          },
+          "sessionId" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021050413",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "Oh0_KGaLRLGjpIm2zjB83Q",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.crawling_info"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_crawling_info_param.json b/src/main/config/es/fess_config_crawling_info_param.json
new file mode 100644
index 0000000000000000000000000000000000000000..ea43df9242b98daec582a2bd125e0eb377158c9b
--- /dev/null
+++ b/src/main/config/es/fess_config_crawling_info_param.json
@@ -0,0 +1,38 @@
+{
+  ".fess_config.crawling_info_param" : {
+    "aliases" : { },
+    "mappings" : {
+      "crawling_info_param" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "crawlingInfoId" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "key" : {
+            "type" : "keyword"
+          },
+          "value" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021050704",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "X-fixtWRQdGqWMpUEEs_Ag",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.crawling_info_param"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_data_config.json b/src/main/config/es/fess_config_data_config.json
new file mode 100644
index 0000000000000000000000000000000000000000..241c7dfec836024ea577245c3b3bb25ac188a589
--- /dev/null
+++ b/src/main/config/es/fess_config_data_config.json
@@ -0,0 +1,80 @@
+{
+  ".fess_config.data_config" : {
+    "aliases" : { },
+    "mappings" : {
+      "data_config" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "available" : {
+            "type" : "boolean"
+          },
+          "boost" : {
+            "type" : "float"
+          },
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "description" : {
+            "type" : "text"
+          },
+          "handlerName" : {
+            "type" : "keyword"
+          },
+          "handlerParameter" : {
+            "type" : "keyword"
+          },
+          "handlerScript" : {
+            "type" : "keyword"
+          },
+          "name" : {
+            "type" : "keyword"
+          },
+          "permissions" : {
+            "type" : "keyword"
+          },
+          "sortOrder" : {
+            "type" : "integer"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          },
+          "virtualHosts" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "dbflute" : {
+          "data_config" : {
+            "properties" : {
+              "permissions" : {
+                "array" : "true"
+              },
+              "virtualHosts" : {
+                "array" : "true"
+              }
+            }
+          }
+        },
+        "creation_date" : "1509021051038",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "H4zzbuU5SJWFOLRnofoiNw",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.data_config"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_data_config_to_label.json b/src/main/config/es/fess_config_data_config_to_label.json
new file mode 100644
index 0000000000000000000000000000000000000000..ae638993505815db4a47e6a6ff7e6691842fa09c
--- /dev/null
+++ b/src/main/config/es/fess_config_data_config_to_label.json
@@ -0,0 +1,32 @@
+{
+  ".fess_config.data_config_to_label" : {
+    "aliases" : { },
+    "mappings" : {
+      "data_config_to_label" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "dataConfigId" : {
+            "type" : "keyword"
+          },
+          "labelTypeId" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021051328",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "ZqU4UmkNQb2m06-amDuoOw",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.data_config_to_label"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_data_config_to_role.json b/src/main/config/es/fess_config_data_config_to_role.json
new file mode 100644
index 0000000000000000000000000000000000000000..56a7eac2c977f1752dd5d76af1e70d984079b718
--- /dev/null
+++ b/src/main/config/es/fess_config_data_config_to_role.json
@@ -0,0 +1,32 @@
+{
+  ".fess_config.data_config_to_role" : {
+    "aliases" : { },
+    "mappings" : {
+      "data_config_to_role" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "dataConfigId" : {
+            "type" : "keyword"
+          },
+          "roleTypeId" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021051630",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "RpZD3Lk3TD2Xe1-DQhfLzA",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.data_config_to_role"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_duplicate_host.json b/src/main/config/es/fess_config_duplicate_host.json
new file mode 100644
index 0000000000000000000000000000000000000000..832378606e2670568ba25e656f60e5445a7f66c5
--- /dev/null
+++ b/src/main/config/es/fess_config_duplicate_host.json
@@ -0,0 +1,47 @@
+{
+  ".fess_config.duplicate_host" : {
+    "aliases" : { },
+    "mappings" : {
+      "duplicate_host" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "duplicateHostName" : {
+            "type" : "keyword"
+          },
+          "regularName" : {
+            "type" : "keyword"
+          },
+          "sortOrder" : {
+            "type" : "integer"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021051920",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "fP473Sr-RZO2d36NkKGgKQ",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.duplicate_host"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_elevate_word.json b/src/main/config/es/fess_config_elevate_word.json
new file mode 100644
index 0000000000000000000000000000000000000000..b1d8a2270dfb24d61ec12ba9648e23c39dd160d1
--- /dev/null
+++ b/src/main/config/es/fess_config_elevate_word.json
@@ -0,0 +1,65 @@
+{
+  ".fess_config.elevate_word" : {
+    "aliases" : { },
+    "mappings" : {
+      "elevate_word" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "boost" : {
+            "type" : "float"
+          },
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "permissions" : {
+            "type" : "keyword"
+          },
+          "reading" : {
+            "type" : "keyword"
+          },
+          "suggestWord" : {
+            "type" : "keyword"
+          },
+          "targetLabel" : {
+            "type" : "keyword"
+          },
+          "targetRole" : {
+            "type" : "keyword"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "dbflute" : {
+          "elevate_word" : {
+            "properties" : {
+              "permissions" : {
+                "array" : "true"
+              }
+            }
+          }
+        },
+        "creation_date" : "1509021052202",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "KVOz6G2oR1S8lU5BvNyQrg",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.elevate_word"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_elevate_word_to_label.json b/src/main/config/es/fess_config_elevate_word_to_label.json
new file mode 100644
index 0000000000000000000000000000000000000000..a61646bbe6b135174f16e66b5ebfa2add4d12f65
--- /dev/null
+++ b/src/main/config/es/fess_config_elevate_word_to_label.json
@@ -0,0 +1,32 @@
+{
+  ".fess_config.elevate_word_to_label" : {
+    "aliases" : { },
+    "mappings" : {
+      "elevate_word_to_label" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "elevateWordId" : {
+            "type" : "keyword"
+          },
+          "labelTypeId" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021052498",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "z3miZa9NSdywfPRNGhrlzg",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.elevate_word_to_label"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_failure_url.json b/src/main/config/es/fess_config_failure_url.json
new file mode 100644
index 0000000000000000000000000000000000000000..9e49916b5b9a82b81abe9898b120e85b241a6bca
--- /dev/null
+++ b/src/main/config/es/fess_config_failure_url.json
@@ -0,0 +1,47 @@
+{
+  ".fess_config.failure_url" : {
+    "aliases" : { },
+    "mappings" : {
+      "failure_url" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "configId" : {
+            "type" : "keyword"
+          },
+          "errorCount" : {
+            "type" : "integer"
+          },
+          "errorLog" : {
+            "type" : "keyword"
+          },
+          "errorName" : {
+            "type" : "keyword"
+          },
+          "lastAccessTime" : {
+            "type" : "long"
+          },
+          "threadName" : {
+            "type" : "keyword"
+          },
+          "url" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021052830",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "WskRnE71Qsas-ki_GN3RSg",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.failure_url"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_file_authentication.json b/src/main/config/es/fess_config_file_authentication.json
new file mode 100644
index 0000000000000000000000000000000000000000..bb4a89835f9bcb6365b096045f0188e78e8f4d8e
--- /dev/null
+++ b/src/main/config/es/fess_config_file_authentication.json
@@ -0,0 +1,59 @@
+{
+  ".fess_config.file_authentication" : {
+    "aliases" : { },
+    "mappings" : {
+      "file_authentication" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "fileConfigId" : {
+            "type" : "keyword"
+          },
+          "hostname" : {
+            "type" : "keyword"
+          },
+          "parameters" : {
+            "type" : "keyword"
+          },
+          "password" : {
+            "type" : "keyword"
+          },
+          "port" : {
+            "type" : "integer"
+          },
+          "protocolScheme" : {
+            "type" : "keyword"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          },
+          "username" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021053135",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "-gono3d2R0KP5po-ggBr0A",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.file_authentication"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_file_config.json b/src/main/config/es/fess_config_file_config.json
new file mode 100644
index 0000000000000000000000000000000000000000..e25960b7c0ff920808bf21ae58d4dd4376ef51cb
--- /dev/null
+++ b/src/main/config/es/fess_config_file_config.json
@@ -0,0 +1,104 @@
+{
+  ".fess_config.file_config" : {
+    "aliases" : { },
+    "mappings" : {
+      "file_config" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "available" : {
+            "type" : "boolean"
+          },
+          "boost" : {
+            "type" : "float"
+          },
+          "configParameter" : {
+            "type" : "keyword"
+          },
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "depth" : {
+            "type" : "integer"
+          },
+          "description" : {
+            "type" : "text"
+          },
+          "excludedDocPaths" : {
+            "type" : "keyword"
+          },
+          "excludedPaths" : {
+            "type" : "keyword"
+          },
+          "includedDocPaths" : {
+            "type" : "keyword"
+          },
+          "includedPaths" : {
+            "type" : "keyword"
+          },
+          "intervalTime" : {
+            "type" : "integer"
+          },
+          "maxAccessCount" : {
+            "type" : "long"
+          },
+          "name" : {
+            "type" : "keyword"
+          },
+          "numOfThread" : {
+            "type" : "integer"
+          },
+          "paths" : {
+            "type" : "keyword"
+          },
+          "permissions" : {
+            "type" : "keyword"
+          },
+          "sortOrder" : {
+            "type" : "integer"
+          },
+          "timeToLive" : {
+            "type" : "integer"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          },
+          "virtualHosts" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "dbflute" : {
+          "file_config" : {
+            "properties" : {
+              "permissions" : {
+                "array" : "true"
+              },
+              "virtualHosts" : {
+                "array" : "true"
+              }
+            }
+          }
+        },
+        "creation_date" : "1509021053464",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "5fluDb3PStuKaHkl-5gdNw",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.file_config"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_file_config_to_label.json b/src/main/config/es/fess_config_file_config_to_label.json
new file mode 100644
index 0000000000000000000000000000000000000000..b054ffc6f61fa56313cb682b2a25335db7976e2d
--- /dev/null
+++ b/src/main/config/es/fess_config_file_config_to_label.json
@@ -0,0 +1,32 @@
+{
+  ".fess_config.file_config_to_label" : {
+    "aliases" : { },
+    "mappings" : {
+      "file_config_to_label" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "fileConfigId" : {
+            "type" : "keyword"
+          },
+          "labelTypeId" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021053757",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "0Vr5UIoIQ9O27ksYKRECLA",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.file_config_to_label"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_file_config_to_role.json b/src/main/config/es/fess_config_file_config_to_role.json
new file mode 100644
index 0000000000000000000000000000000000000000..43d44f41e62b4a2e68850e456d753d3250868261
--- /dev/null
+++ b/src/main/config/es/fess_config_file_config_to_role.json
@@ -0,0 +1,32 @@
+{
+  ".fess_config.file_config_to_role" : {
+    "aliases" : { },
+    "mappings" : {
+      "file_config_to_role" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "fileConfigId" : {
+            "type" : "keyword"
+          },
+          "roleTypeId" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021054048",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "A-G6NOOuSQStHQrvxshwlA",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.file_config_to_role"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_job_log.json b/src/main/config/es/fess_config_job_log.json
new file mode 100644
index 0000000000000000000000000000000000000000..2c0065e9b3d4176ed83b77a0dc8d5808edcc5b21
--- /dev/null
+++ b/src/main/config/es/fess_config_job_log.json
@@ -0,0 +1,53 @@
+{
+  ".fess_config.job_log" : {
+    "aliases" : { },
+    "mappings" : {
+      "job_log" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "endTime" : {
+            "type" : "long"
+          },
+          "jobName" : {
+            "type" : "keyword"
+          },
+          "jobStatus" : {
+            "type" : "keyword"
+          },
+          "lastUpdated" : {
+            "type" : "long"
+          },
+          "scriptData" : {
+            "type" : "keyword"
+          },
+          "scriptResult" : {
+            "type" : "keyword"
+          },
+          "scriptType" : {
+            "type" : "keyword"
+          },
+          "startTime" : {
+            "type" : "long"
+          },
+          "target" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021054334",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "vIZ3R-jCRzGKaZvpZHRFPw",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.job_log"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_key_match.json b/src/main/config/es/fess_config_key_match.json
new file mode 100644
index 0000000000000000000000000000000000000000..3209abe3774a049dbaff478b8c9911cd70374e7c
--- /dev/null
+++ b/src/main/config/es/fess_config_key_match.json
@@ -0,0 +1,53 @@
+{
+  ".fess_config.key_match" : {
+    "aliases" : { },
+    "mappings" : {
+      "key_match" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "boost" : {
+            "type" : "float"
+          },
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "maxSize" : {
+            "type" : "integer"
+          },
+          "query" : {
+            "type" : "keyword"
+          },
+          "term" : {
+            "type" : "keyword"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          },
+          "virtualHost" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021054613",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "tqxL0WgAR665iLtdrY81AA",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.key_match"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_label_to_role.json b/src/main/config/es/fess_config_label_to_role.json
new file mode 100644
index 0000000000000000000000000000000000000000..20d4fa9e42797924d3a58dd5ca2ca19d58fe4a4d
--- /dev/null
+++ b/src/main/config/es/fess_config_label_to_role.json
@@ -0,0 +1,32 @@
+{
+  ".fess_config.label_to_role" : {
+    "aliases" : { },
+    "mappings" : {
+      "label_to_role" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "labelTypeId" : {
+            "type" : "keyword"
+          },
+          "roleTypeId" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021054906",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "bvuJJ_iRSim-DHeHTGzT6Q",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.label_to_role"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_label_type.json b/src/main/config/es/fess_config_label_type.json
new file mode 100644
index 0000000000000000000000000000000000000000..0f2f64a02bc76512ab309e919f0b12497332cf90
--- /dev/null
+++ b/src/main/config/es/fess_config_label_type.json
@@ -0,0 +1,68 @@
+{
+  ".fess_config.label_type" : {
+    "aliases" : { },
+    "mappings" : {
+      "label_type" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "excludedPaths" : {
+            "type" : "keyword"
+          },
+          "includedPaths" : {
+            "type" : "keyword"
+          },
+          "name" : {
+            "type" : "keyword"
+          },
+          "permissions" : {
+            "type" : "keyword"
+          },
+          "sortOrder" : {
+            "type" : "integer"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          },
+          "value" : {
+            "type" : "keyword"
+          },
+          "virtualHost" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "dbflute" : {
+          "label_type" : {
+            "properties" : {
+              "permissions" : {
+                "array" : "true"
+              }
+            }
+          }
+        },
+        "creation_date" : "1509021055215",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "Zylt7BsVRhiOasQfUWBg0w",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.label_type"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_path_mapping.json b/src/main/config/es/fess_config_path_mapping.json
new file mode 100644
index 0000000000000000000000000000000000000000..37a33077b064b8e10ba6c34dbaa7200c640c8b11
--- /dev/null
+++ b/src/main/config/es/fess_config_path_mapping.json
@@ -0,0 +1,53 @@
+{
+  ".fess_config.path_mapping" : {
+    "aliases" : { },
+    "mappings" : {
+      "path_mapping" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "processType" : {
+            "type" : "keyword"
+          },
+          "regex" : {
+            "type" : "keyword"
+          },
+          "replacement" : {
+            "type" : "keyword"
+          },
+          "sortOrder" : {
+            "type" : "integer"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          },
+          "userAgent" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021055516",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "Vn_Ry5JPRSet5M3Cg2D17w",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.path_mapping"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_related_content.json b/src/main/config/es/fess_config_related_content.json
new file mode 100644
index 0000000000000000000000000000000000000000..8f0e2a7f05a13b6f16f32cb21406ea23d654e74f
--- /dev/null
+++ b/src/main/config/es/fess_config_related_content.json
@@ -0,0 +1,50 @@
+{
+  ".fess_config.related_content" : {
+    "aliases" : { },
+    "mappings" : {
+      "related_content" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "content" : {
+            "type" : "keyword"
+          },
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "sortOrder" : {
+            "type" : "integer"
+          },
+          "term" : {
+            "type" : "keyword"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          },
+          "virtualHost" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021055837",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "34AXOK0ITy6U7fzGItZJsQ",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.related_content"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_related_query.json b/src/main/config/es/fess_config_related_query.json
new file mode 100644
index 0000000000000000000000000000000000000000..c44b0f98145faee73a88bb49d32f3b2d4c43bc75
--- /dev/null
+++ b/src/main/config/es/fess_config_related_query.json
@@ -0,0 +1,56 @@
+{
+  ".fess_config.related_query" : {
+    "aliases" : { },
+    "mappings" : {
+      "related_query" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "queries" : {
+            "type" : "keyword"
+          },
+          "term" : {
+            "type" : "keyword"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          },
+          "virtualHost" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "dbflute" : {
+          "related_query" : {
+            "properties" : {
+              "queries" : {
+                "array" : "true"
+              }
+            }
+          }
+        },
+        "creation_date" : "1509021056135",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "8lLdTVsGQCKFnbgLSkPaUA",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.related_query"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_request_header.json b/src/main/config/es/fess_config_request_header.json
new file mode 100644
index 0000000000000000000000000000000000000000..9bbcda97c2979811e2ca635e353aeae6a6156ed5
--- /dev/null
+++ b/src/main/config/es/fess_config_request_header.json
@@ -0,0 +1,47 @@
+{
+  ".fess_config.request_header" : {
+    "aliases" : { },
+    "mappings" : {
+      "request_header" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "name" : {
+            "type" : "keyword"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          },
+          "value" : {
+            "type" : "keyword"
+          },
+          "webConfigId" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021056434",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "Zrp1Be7PS1ySzKAjlrpICg",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.request_header"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_role_type.json b/src/main/config/es/fess_config_role_type.json
new file mode 100644
index 0000000000000000000000000000000000000000..5b62cb59ddbdae8e4a7dd3057782721ee5d2c0b3
--- /dev/null
+++ b/src/main/config/es/fess_config_role_type.json
@@ -0,0 +1,47 @@
+{
+  ".fess_config.role_type" : {
+    "aliases" : { },
+    "mappings" : {
+      "role_type" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "name" : {
+            "type" : "keyword"
+          },
+          "sortOrder" : {
+            "type" : "integer"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          },
+          "value" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021056731",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "MnnT8tsrT5GqpB8pYafyWg",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.role_type"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_scheduled_job.json b/src/main/config/es/fess_config_scheduled_job.json
new file mode 100644
index 0000000000000000000000000000000000000000..b21fefbb96af5d0c8c8cde96d5491c48d9bc7c2b
--- /dev/null
+++ b/src/main/config/es/fess_config_scheduled_job.json
@@ -0,0 +1,65 @@
+{
+  ".fess_config.scheduled_job" : {
+    "aliases" : { },
+    "mappings" : {
+      "scheduled_job" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "available" : {
+            "type" : "boolean"
+          },
+          "crawler" : {
+            "type" : "boolean"
+          },
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "cronExpression" : {
+            "type" : "keyword"
+          },
+          "jobLogging" : {
+            "type" : "boolean"
+          },
+          "name" : {
+            "type" : "keyword"
+          },
+          "scriptData" : {
+            "type" : "keyword"
+          },
+          "scriptType" : {
+            "type" : "keyword"
+          },
+          "sortOrder" : {
+            "type" : "integer"
+          },
+          "target" : {
+            "type" : "keyword"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021057017",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "bhfc7WeARZymc_hr4dF1og",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.scheduled_job"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_thumbnail_queue.json b/src/main/config/es/fess_config_thumbnail_queue.json
new file mode 100644
index 0000000000000000000000000000000000000000..ef415480cdb7d29cc646cb6cae3de473bbed9c55
--- /dev/null
+++ b/src/main/config/es/fess_config_thumbnail_queue.json
@@ -0,0 +1,44 @@
+{
+  ".fess_config.thumbnail_queue" : {
+    "aliases" : { },
+    "mappings" : {
+      "thumbnail_queue" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "generator" : {
+            "type" : "keyword"
+          },
+          "path" : {
+            "type" : "keyword"
+          },
+          "target" : {
+            "type" : "keyword"
+          },
+          "thumbnail_id" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021057304",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "gofu2g1ATH6L2rVweOWmtg",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.thumbnail_queue"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_web_authentication.json b/src/main/config/es/fess_config_web_authentication.json
new file mode 100644
index 0000000000000000000000000000000000000000..cfd1abbae8baad6ec1c346053836cc0375312dfe
--- /dev/null
+++ b/src/main/config/es/fess_config_web_authentication.json
@@ -0,0 +1,62 @@
+{
+  ".fess_config.web_authentication" : {
+    "aliases" : { },
+    "mappings" : {
+      "web_authentication" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "authRealm" : {
+            "type" : "keyword"
+          },
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "hostname" : {
+            "type" : "keyword"
+          },
+          "parameters" : {
+            "type" : "keyword"
+          },
+          "password" : {
+            "type" : "keyword"
+          },
+          "port" : {
+            "type" : "integer"
+          },
+          "protocolScheme" : {
+            "type" : "keyword"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          },
+          "username" : {
+            "type" : "keyword"
+          },
+          "webConfigId" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021057587",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "8lg38XiCSh-kJgbOgYzMFA",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.web_authentication"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_web_config.json b/src/main/config/es/fess_config_web_config.json
new file mode 100644
index 0000000000000000000000000000000000000000..3363dd389f07dbeb1ffe81de0b339551768699ec
--- /dev/null
+++ b/src/main/config/es/fess_config_web_config.json
@@ -0,0 +1,107 @@
+{
+  ".fess_config.web_config" : {
+    "aliases" : { },
+    "mappings" : {
+      "web_config" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "available" : {
+            "type" : "boolean"
+          },
+          "boost" : {
+            "type" : "float"
+          },
+          "configParameter" : {
+            "type" : "keyword"
+          },
+          "createdBy" : {
+            "type" : "keyword"
+          },
+          "createdTime" : {
+            "type" : "long"
+          },
+          "depth" : {
+            "type" : "integer"
+          },
+          "description" : {
+            "type" : "text"
+          },
+          "excludedDocUrls" : {
+            "type" : "keyword"
+          },
+          "excludedUrls" : {
+            "type" : "keyword"
+          },
+          "includedDocUrls" : {
+            "type" : "keyword"
+          },
+          "includedUrls" : {
+            "type" : "keyword"
+          },
+          "intervalTime" : {
+            "type" : "integer"
+          },
+          "maxAccessCount" : {
+            "type" : "long"
+          },
+          "name" : {
+            "type" : "keyword"
+          },
+          "numOfThread" : {
+            "type" : "integer"
+          },
+          "permissions" : {
+            "type" : "keyword"
+          },
+          "sortOrder" : {
+            "type" : "integer"
+          },
+          "timeToLive" : {
+            "type" : "integer"
+          },
+          "updatedBy" : {
+            "type" : "keyword"
+          },
+          "updatedTime" : {
+            "type" : "long"
+          },
+          "urls" : {
+            "type" : "keyword"
+          },
+          "userAgent" : {
+            "type" : "keyword"
+          },
+          "virtualHosts" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "dbflute" : {
+          "web_config" : {
+            "properties" : {
+              "permissions" : {
+                "array" : "true"
+              },
+              "virtualHosts" : {
+                "array" : "true"
+              }
+            }
+          }
+        },
+        "creation_date" : "1509021057900",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "OYkqmnvbTJami5vnLYfYNg",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.web_config"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_web_config_to_label.json b/src/main/config/es/fess_config_web_config_to_label.json
new file mode 100644
index 0000000000000000000000000000000000000000..6ea873e6a7f1d823aad93c266d2ded1ada68a998
--- /dev/null
+++ b/src/main/config/es/fess_config_web_config_to_label.json
@@ -0,0 +1,32 @@
+{
+  ".fess_config.web_config_to_label" : {
+    "aliases" : { },
+    "mappings" : {
+      "web_config_to_label" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "labelTypeId" : {
+            "type" : "keyword"
+          },
+          "webConfigId" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021058218",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "XyDGcpycSJe7JQ88rqTifg",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.web_config_to_label"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_config_web_config_to_role.json b/src/main/config/es/fess_config_web_config_to_role.json
new file mode 100644
index 0000000000000000000000000000000000000000..8d5d20bbdfaa7d5ebb6e2ba4c5da88d9e7e852a3
--- /dev/null
+++ b/src/main/config/es/fess_config_web_config_to_role.json
@@ -0,0 +1,32 @@
+{
+  ".fess_config.web_config_to_role" : {
+    "aliases" : { },
+    "mappings" : {
+      "web_config_to_role" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "roleTypeId" : {
+            "type" : "keyword"
+          },
+          "webConfigId" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021058509",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "XrBIHsMRToybAujPK3Q1fg",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_config.web_config_to_role"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_log.json b/src/main/config/es/fess_log.json
deleted file mode 100644
index f5919cc3a0b40f547076c9fb82891316ea3eb3f4..0000000000000000000000000000000000000000
--- a/src/main/config/es/fess_log.json
+++ /dev/null
@@ -1,152 +0,0 @@
-{
-  "fess_log" : {
-    "mappings" : {
-      "favorite_log" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "createdAt" : {
-            "type" : "date",
-            "format" : "date_optional_time"
-          },
-          "url" : {
-            "type": "keyword"
-          },
-          "docId" : {
-            "type": "keyword"
-          },
-          "queryId" : {
-            "type": "keyword"
-          },
-          "userInfoId" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "click_log" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "queryRequestedAt" : {
-            "type" : "date",
-            "format" : "date_optional_time"
-          },
-          "requestedAt" : {
-            "type" : "date",
-            "format" : "date_optional_time"
-          },
-          "queryId" : {
-            "type": "keyword"
-          },
-          "docId" : {
-            "type": "keyword"
-          },
-          "userSessionId" : {
-            "type": "keyword"
-          },
-          "url" : {
-            "type": "keyword"
-          },
-          "order" : {
-            "type" : "integer"
-          }
-        }
-      },
-      "search_log" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "accessType" : {
-            "type": "keyword"
-          },
-          "user" : {
-            "type": "keyword"
-          },
-          "roles" : {
-            "type": "keyword"
-          },
-          "queryId" : {
-            "type": "keyword"
-          },
-          "clientIp" : {
-            "type": "keyword"
-          },
-          "hitCount" : {
-            "type" : "long"
-          },
-          "queryOffset" : {
-            "type" : "integer"
-          },
-          "queryPageSize" : {
-            "type" : "integer"
-          },
-          "referer" : {
-            "type": "keyword"
-          },
-          "requestedAt" : {
-            "type" : "date",
-            "format" : "date_optional_time"
-          },
-          "responseTime" : {
-            "type" : "long"
-          },
-          "queryTime" : {
-            "type" : "long"
-          },
-          "searchWord" : {
-            "type": "keyword"
-          },
-          "userAgent" : {
-            "type": "keyword"
-          },
-          "userInfoId" : {
-            "type": "keyword"
-          },
-          "userSessionId" : {
-            "type": "keyword"
-          },
-          "languages" : {
-            "type": "keyword"
-          },
-          "virtualHost" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "user_info" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "createdAt" : {
-            "type" : "date",
-            "format" : "date_optional_time"
-          },
-          "updatedAt" : {
-            "type" : "date",
-            "format" : "date_optional_time"
-          }
-        }
-      }
-    },
-    "settings" : {
-      "index" : {
-        "refresh_interval" : "60s",
-        "dbflute" : {
-          "search_log" : {
-            "properties" : {
-              "roles" : {
-                "array" : "true"
-              }
-            }
-          }
-        },
-        "number_of_shards" : "10",
-        "number_of_replicas" : "0"
-      }
-    }
-  }
-}
diff --git a/src/main/config/es/fess_log_click_log.json b/src/main/config/es/fess_log_click_log.json
new file mode 100644
index 0000000000000000000000000000000000000000..101f2a6371188dd756dfc5f5bd8b6db7ab8efdaa
--- /dev/null
+++ b/src/main/config/es/fess_log_click_log.json
@@ -0,0 +1,49 @@
+{
+  "fess_log.click_log" : {
+    "aliases" : { },
+    "mappings" : {
+      "click_log" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "docId" : {
+            "type" : "keyword"
+          },
+          "order" : {
+            "type" : "integer"
+          },
+          "queryId" : {
+            "type" : "keyword"
+          },
+          "queryRequestedAt" : {
+            "type" : "date",
+            "format" : "date_optional_time"
+          },
+          "requestedAt" : {
+            "type" : "date",
+            "format" : "date_optional_time"
+          },
+          "url" : {
+            "type" : "keyword"
+          },
+          "userSessionId" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021059710",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "zDxbXj7iTiOaGJKWIa5fog",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : "fess_log.click_log"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_log_favorite_log.json b/src/main/config/es/fess_log_favorite_log.json
new file mode 100644
index 0000000000000000000000000000000000000000..9815f41db3a64bbcbb05ac5e3f9f1852e1c76e8e
--- /dev/null
+++ b/src/main/config/es/fess_log_favorite_log.json
@@ -0,0 +1,42 @@
+{
+  "fess_log.favorite_log" : {
+    "aliases" : { },
+    "mappings" : {
+      "favorite_log" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "createdAt" : {
+            "type" : "date",
+            "format" : "date_optional_time"
+          },
+          "docId" : {
+            "type" : "keyword"
+          },
+          "queryId" : {
+            "type" : "keyword"
+          },
+          "url" : {
+            "type" : "keyword"
+          },
+          "userInfoId" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021060038",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "LRohRohXTCGxGdsabXPNnQ",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : "fess_log.favorite_log"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_log_search_log.json b/src/main/config/es/fess_log_search_log.json
new file mode 100644
index 0000000000000000000000000000000000000000..7b390c0946e8b999c8a82c673a37f8ce6faa1711
--- /dev/null
+++ b/src/main/config/es/fess_log_search_log.json
@@ -0,0 +1,90 @@
+{
+  "fess_log.search_log" : {
+    "aliases" : { },
+    "mappings" : {
+      "search_log" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "accessType" : {
+            "type" : "keyword"
+          },
+          "clientIp" : {
+            "type" : "keyword"
+          },
+          "hitCount" : {
+            "type" : "long"
+          },
+          "languages" : {
+            "type" : "keyword"
+          },
+          "queryId" : {
+            "type" : "keyword"
+          },
+          "queryOffset" : {
+            "type" : "integer"
+          },
+          "queryPageSize" : {
+            "type" : "integer"
+          },
+          "queryTime" : {
+            "type" : "long"
+          },
+          "referer" : {
+            "type" : "keyword"
+          },
+          "requestedAt" : {
+            "type" : "date",
+            "format" : "date_optional_time"
+          },
+          "responseTime" : {
+            "type" : "long"
+          },
+          "roles" : {
+            "type" : "keyword"
+          },
+          "searchWord" : {
+            "type" : "keyword"
+          },
+          "user" : {
+            "type" : "keyword"
+          },
+          "userAgent" : {
+            "type" : "keyword"
+          },
+          "userInfoId" : {
+            "type" : "keyword"
+          },
+          "userSessionId" : {
+            "type" : "keyword"
+          },
+          "virtualHost" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "dbflute" : {
+          "search_log" : {
+            "properties" : {
+              "roles" : {
+                "array" : "true"
+              }
+            }
+          }
+        },
+        "creation_date" : "1509021060319",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "XqUliNMJQy-rvkaOi_k9AQ",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : "fess_log.search_log"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_log_user_info.json b/src/main/config/es/fess_log_user_info.json
new file mode 100644
index 0000000000000000000000000000000000000000..b8f19dc92fd138d686c841177e136e8d2363ce73
--- /dev/null
+++ b/src/main/config/es/fess_log_user_info.json
@@ -0,0 +1,34 @@
+{
+  "fess_log.user_info" : {
+    "aliases" : { },
+    "mappings" : {
+      "user_info" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "createdAt" : {
+            "type" : "date",
+            "format" : "date_optional_time"
+          },
+          "updatedAt" : {
+            "type" : "date",
+            "format" : "date_optional_time"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021060613",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "AMHq21z_Rw-8aumu04y_wA",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : "fess_log.user_info"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_user_group.json b/src/main/config/es/fess_user_group.json
new file mode 100644
index 0000000000000000000000000000000000000000..8ae4eaa999895262348929c75fe95835c9142abd
--- /dev/null
+++ b/src/main/config/es/fess_user_group.json
@@ -0,0 +1,32 @@
+{
+  ".fess_user.group" : {
+    "aliases" : { },
+    "mappings" : {
+      "group" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "gidNumber" : {
+            "type" : "long"
+          },
+          "name" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021058796",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "5EWS2-qMT2WwHG0yPrhP3Q",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_user.group"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_user_role.json b/src/main/config/es/fess_user_role.json
new file mode 100644
index 0000000000000000000000000000000000000000..ae637fcf5d28ac1cda81537339525ad61a08fb33
--- /dev/null
+++ b/src/main/config/es/fess_user_role.json
@@ -0,0 +1,29 @@
+{
+  ".fess_user.role" : {
+    "aliases" : { },
+    "mappings" : {
+      "role" : {
+        "_all" : {
+          "enabled" : false
+        },
+        "properties" : {
+          "name" : {
+            "type" : "keyword"
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "creation_date" : "1509021059090",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "ugUWT7UpRCau5xEMgWOBsw",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_user.role"
+      }
+    }
+  }
+}
diff --git a/src/main/config/es/fess_user.json b/src/main/config/es/fess_user_user.json
similarity index 57%
rename from src/main/config/es/fess_user.json
rename to src/main/config/es/fess_user_user.json
index cbb21c41858ba1dd56437d7b92157ff43c56cd08..474466a5c0d0a593ae57bc50099213499d694162 100644
--- a/src/main/config/es/fess_user.json
+++ b/src/main/config/es/fess_user_user.json
@@ -1,160 +1,137 @@
 {
-  ".fess_user" : {
+  ".fess_user.user" : {
+    "aliases" : { },
     "mappings" : {
-      "role" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "name" : {
-            "type": "keyword"
-          }
-        }
-      },
       "user" : {
         "_all" : {
           "enabled" : false
         },
         "properties" : {
-          "name" : {
-            "type": "keyword"
-          },
-          "password" : {
-            "type": "keyword"
+          "businessCategory" : {
+            "type" : "keyword"
           },
-          "surname" : {
-            "type": "keyword"
+          "carLicense" : {
+            "type" : "keyword"
           },
-          "givenName" : {
-            "type": "keyword"
+          "city" : {
+            "type" : "keyword"
           },
-          "employeeNumber" : {
-            "type": "keyword"
+          "departmentNumber" : {
+            "type" : "keyword"
           },
-          "mail" : {
-            "type": "keyword"
+          "description" : {
+            "type" : "keyword"
           },
-          "telephoneNumber" : {
-            "type": "keyword"
+          "destinationIndicator" : {
+            "type" : "keyword"
           },
-          "homePhone" : {
-            "type": "keyword"
+          "displayName" : {
+            "type" : "keyword"
           },
-          "homePostalAddress" : {
-            "type": "keyword"
+          "employeeNumber" : {
+            "type" : "keyword"
           },
-          "labeledURI" : {
-            "type": "keyword"
+          "employeeType" : {
+            "type" : "keyword"
           },
-          "roomNumber" : {
-            "type": "keyword"
+          "facsimileTelephoneNumber" : {
+            "type" : "keyword"
           },
-          "description" : {
-            "type": "keyword"
+          "gidNumber" : {
+            "type" : "long"
           },
-          "title" : {
-            "type": "keyword"
+          "givenName" : {
+            "type" : "keyword"
           },
-          "pager" : {
-            "type": "keyword"
+          "groups" : {
+            "type" : "keyword"
           },
-          "street" : {
-            "type": "keyword"
+          "homeDirectory" : {
+            "type" : "keyword"
           },
-          "postalCode" : {
-            "type": "keyword"
+          "homePhone" : {
+            "type" : "keyword"
           },
-          "physicalDeliveryOfficeName" : {
-            "type": "keyword"
+          "homePostalAddress" : {
+            "type" : "keyword"
           },
-          "destinationIndicator" : {
-            "type": "keyword"
+          "initials" : {
+            "type" : "keyword"
           },
           "internationaliSDNNumber" : {
-            "type": "keyword"
-          },
-          "state" : {
-            "type": "keyword"
+            "type" : "keyword"
           },
-          "employeeType" : {
-            "type": "keyword"
+          "labeledURI" : {
+            "type" : "keyword"
           },
-          "facsimileTelephoneNumber" : {
-            "type": "keyword"
+          "mail" : {
+            "type" : "keyword"
           },
-          "postOfficeBox" : {
-            "type": "keyword"
+          "mobile" : {
+            "type" : "keyword"
           },
-          "initials" : {
-            "type": "keyword"
+          "name" : {
+            "type" : "keyword"
           },
-          "carLicense" : {
-            "type": "keyword"
+          "pager" : {
+            "type" : "keyword"
           },
-          "mobile" : {
-            "type": "keyword"
+          "password" : {
+            "type" : "keyword"
           },
-          "postalAddress" : {
-            "type": "keyword"
+          "physicalDeliveryOfficeName" : {
+            "type" : "keyword"
           },
-          "city" : {
-            "type": "keyword"
+          "postOfficeBox" : {
+            "type" : "keyword"
           },
-          "teletexTerminalIdentifier" : {
-            "type": "keyword"
+          "postalAddress" : {
+            "type" : "keyword"
           },
-          "x121Address" : {
-            "type": "keyword"
+          "postalCode" : {
+            "type" : "keyword"
           },
-          "businessCategory" : {
-            "type": "keyword"
+          "preferredLanguage" : {
+            "type" : "keyword"
           },
           "registeredAddress" : {
-            "type": "keyword"
+            "type" : "keyword"
           },
-          "displayName" : {
-            "type": "keyword"
+          "roles" : {
+            "type" : "keyword"
           },
-          "preferredLanguage" : {
-            "type": "keyword"
+          "roomNumber" : {
+            "type" : "keyword"
           },
-          "departmentNumber" : {
-            "type": "keyword"
+          "state" : {
+            "type" : "keyword"
           },
-          "uidNumber" : {
-            "type" : "long"
+          "street" : {
+            "type" : "keyword"
           },
-          "gidNumber" : {
-            "type" : "long"
+          "surname" : {
+            "type" : "keyword"
           },
-          "homeDirectory" : {
-            "type": "keyword"
+          "telephoneNumber" : {
+            "type" : "keyword"
           },
-          "groups" : {
-            "type": "keyword"
+          "teletexTerminalIdentifier" : {
+            "type" : "keyword"
           },
-          "roles" : {
-            "type": "keyword"
-          }
-        }
-      },
-      "group" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "name" : {
-            "type": "keyword"
+          "title" : {
+            "type" : "keyword"
           },
-          "gidNumber" : {
+          "uidNumber" : {
             "type" : "long"
+          },
+          "x121Address" : {
+            "type" : "keyword"
           }
         }
       }
     },
     "settings" : {
       "index" : {
-        "refresh_interval" : "1s",
         "dbflute" : {
           "user" : {
             "properties" : {
@@ -167,7 +144,14 @@
             }
           }
         },
-        "number_of_replicas" : "0"
+        "creation_date" : "1509021059384",
+        "number_of_shards" : "5",
+        "number_of_replicas" : "1",
+        "uuid" : "-80Q6PZITfaVdBAm23e91Q",
+        "version" : {
+          "created" : "6000051"
+        },
+        "provided_name" : ".fess_user.user"
       }
     }
   }
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 93b4adab5596d94ad6049922e401db3566881ccb..45b514c1d31313981d7f6d89c3a6a5b3e7c833cb 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
@@ -37,7 +37,6 @@ import org.codelibs.fess.es.config.exbhv.WebConfigToRoleBhv;
 import org.codelibs.fess.es.user.exbhv.RoleBhv;
 import org.codelibs.fess.util.UpgradeUtil;
 import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.client.IndicesAdminClient;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
@@ -257,7 +256,7 @@ public class AdminUpgradeAction extends FessAdminAction {
         final String crawlerIndex = fessConfig.getIndexDocumentCrawlerIndex();
 
         // .crawler
-        if (UpgradeUtil.existsIndex(indicesClient, crawlerIndex, IndicesOptions.fromOptions(false, true, true, true))) {
+        if (UpgradeUtil.existsIndex(indicesClient, crawlerIndex, true, true)) {
             UpgradeUtil.deleteIndex(indicesClient, crawlerIndex, response -> {});
         }
     }
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 d9ff239e87b41011bce6ceaf8f4983f0fbd7c3a4..84d173a884e698b1289c95e5def773446b1686d7 100644
--- a/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java
+++ b/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java
@@ -39,7 +39,7 @@ import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.transport.InetSocketTransportAddress;
+import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
@@ -91,19 +91,19 @@ public class EsDataStoreImpl extends AbstractDataStoreImpl {
                                         Collectors.toMap(e -> e.getKey().replaceFirst("^settings\\.", StringUtil.EMPTY), e -> e.getValue())))
                         .build();
         logger.info("Connecting to " + hostsStr + " with [" + settings.toDelimitedString(',') + "]");
-        final InetSocketTransportAddress[] addresses = split(hostsStr, ",").get(stream -> stream.map(h -> {
+        final TransportAddress[] addresses = split(hostsStr, ",").get(stream -> stream.map(h -> {
             final String[] values = h.trim().split(":");
             try {
                 if (values.length == 1) {
-                    return new InetSocketTransportAddress(InetAddress.getByName(values[0]), 9300);
+                    return new TransportAddress(InetAddress.getByName(values[0]), 9300);
                 } else if (values.length == 2) {
-                    return new InetSocketTransportAddress(InetAddress.getByName(values[0]), Integer.parseInt(values[1]));
+                    return new TransportAddress(InetAddress.getByName(values[0]), Integer.parseInt(values[1]));
                 }
             } catch (final Exception e) {
                 logger.warn("Failed to parse address: " + h, e);
             }
             return null;
-        }).filter(v -> v != null).toArray(n -> new InetSocketTransportAddress[n]));
+        }).filter(v -> v != null).toArray(n -> new TransportAddress[n]));
         try (PreBuiltTransportClient client = new PreBuiltTransportClient(settings)) {
             client.addTransportAddresses(addresses);
             processData(dataConfig, callback, paramMap, scriptMap, defaultDataMap, readInterval, client);
@@ -163,7 +163,7 @@ public class EsDataStoreImpl extends AbstractDataStoreImpl {
                     resultMap.put("id", hit.getId());
                     resultMap.put("version", Long.valueOf(hit.getVersion()));
                     resultMap.put("hit", hit);
-                    resultMap.put("source", hit.getSource());
+                    resultMap.put("source", hit.getSourceAsMap());
                     resultMap.put("crawlingConfig", dataConfig);
 
                     if (logger.isDebugEnabled()) {
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 45e54e9609e54f1e0370a8293c62d2d05ab797da..53a40f00c18daa2115a183b201247db2c5aaab85 100644
--- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
@@ -97,9 +97,6 @@ import org.elasticsearch.action.explain.ExplainResponse;
 import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest;
 import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequestBuilder;
 import org.elasticsearch.action.fieldcaps.FieldCapabilitiesResponse;
-import org.elasticsearch.action.fieldstats.FieldStatsRequest;
-import org.elasticsearch.action.fieldstats.FieldStatsRequestBuilder;
-import org.elasticsearch.action.fieldstats.FieldStatsResponse;
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.get.GetRequestBuilder;
 import org.elasticsearch.action.get.GetResponse;
@@ -136,9 +133,9 @@ import org.elasticsearch.client.Client;
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.cluster.metadata.MappingMetaData;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
+import org.elasticsearch.common.document.DocumentField;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.Settings.Builder;
-import org.elasticsearch.common.transport.InetSocketTransportAddress;
 import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentFactory;
@@ -146,11 +143,10 @@ import org.elasticsearch.index.query.InnerHitBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHitField;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.aggregations.BucketOrder;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms.Order;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.elasticsearch.search.collapse.CollapseBuilder;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
@@ -217,7 +213,7 @@ public class FessEsClient implements Client {
 
     public void addTransportAddress(final String host, final int port) {
         try {
-            transportAddressList.add(new InetSocketTransportAddress(InetAddress.getByName(host), port));
+            transportAddressList.add(new TransportAddress(InetAddress.getByName(host), port));
         } catch (final UnknownHostException e) {
             throw new FessSystemException("Failed to resolve the hostname: " + host, e);
         }
@@ -285,11 +281,11 @@ public class FessEsClient implements Client {
         if (StringUtil.isBlank(transportAddressesValue)) {
             final StringBuilder buf = new StringBuilder();
             for (final TransportAddress transportAddress : transportAddressList) {
-                if (transportAddress instanceof InetSocketTransportAddress) {
+                if (transportAddress instanceof TransportAddress) {
                     if (buf.length() > 0) {
                         buf.append(',');
                     }
-                    final InetSocketTransportAddress inetTransportAddress = (InetSocketTransportAddress) transportAddress;
+                    final TransportAddress inetTransportAddress = (TransportAddress) transportAddress;
                     buf.append(inetTransportAddress.address().getHostName());
                     buf.append(':');
                     buf.append(inetTransportAddress.address().getPort());
@@ -722,14 +718,14 @@ public class FessEsClient implements Client {
                 condition,
                 (response, hit) -> {
                     final FessConfig fessConfig = ComponentUtil.getFessConfig();
-                    final Map<String, Object> source = hit.getSource();
+                    final Map<String, Object> source = hit.getSourceAsMap();
                     if (source != null) {
                         final Map<String, Object> docMap = new HashMap<>(source);
                         docMap.put(fessConfig.getIndexFieldId(), hit.getId());
                         docMap.put(fessConfig.getIndexFieldVersion(), hit.getVersion());
                         return docMap;
                     }
-                    final Map<String, SearchHitField> fields = hit.getFields();
+                    final Map<String, DocumentField> fields = hit.getFields();
                     if (fields != null) {
                         final Map<String, Object> docMap =
                                 fields.entrySet().stream()
@@ -766,13 +762,13 @@ public class FessEsClient implements Client {
                 condition,
                 (response, hit) -> {
                     final FessConfig fessConfig = ComponentUtil.getFessConfig();
-                    final Map<String, Object> source = hit.getSource();
+                    final Map<String, Object> source = hit.getSourceAsMap();
                     if (source != null) {
                         final Map<String, Object> docMap = new HashMap<>(source);
                         docMap.put(fessConfig.getIndexFieldId(), hit.getId());
                         return docMap;
                     }
-                    final Map<String, SearchHitField> fields = hit.getFields();
+                    final Map<String, DocumentField> fields = hit.getFields();
                     if (fields != null) {
                         final Map<String, Object> docMap =
                                 fields.entrySet().stream()
@@ -997,10 +993,10 @@ public class FessEsClient implements Client {
                                 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));
+                                if ("term".equals(facetInfo.sort) || "key".equals(facetInfo.sort)) {
+                                    termsBuilder.order(BucketOrder.key(true));
                                 } else if ("count".equals(facetInfo.sort)) {
-                                    termsBuilder.order(Order.count(true));
+                                    termsBuilder.order(BucketOrder.count(true));
                                 }
                                 if (facetInfo.size != null) {
                                     termsBuilder.size(facetInfo.size);
@@ -1311,21 +1307,6 @@ public class FessEsClient implements Client {
         client.clearScroll(request, listener);
     }
 
-    @Override
-    public FieldStatsRequestBuilder prepareFieldStats() {
-        return client.prepareFieldStats();
-    }
-
-    @Override
-    public ActionFuture<FieldStatsResponse> fieldStats(final FieldStatsRequest request) {
-        return client.fieldStats(request);
-    }
-
-    @Override
-    public void fieldStats(final FieldStatsRequest request, final ActionListener<FieldStatsResponse> listener) {
-        client.fieldStats(request, listener);
-    }
-
     @Override
     public Settings settings() {
         return client.settings();
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 84a71e3d3ba16f0a76e85010cf295dfb46956ae2..6f30cc39e6939f801fa9e0d349a5ccc81faf7909 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
@@ -145,7 +145,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         final EsPagingResultBean<RESULT> list = new EsPagingResultBean<>(builder);
         final SearchHits searchHits = response.getHits();
         searchHits.forEach(hit -> {
-            final Map<String, Object> source = hit.getSource();
+            final Map<String, Object> source = hit.getSourceAsMap();
             final RESULT entity = createEntity(source, entityType);
             final DocMeta docMeta = ((EsAbstractEntity) entity).asDocMeta();
             docMeta.id(hit.getId());
@@ -157,7 +157,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         list.setAllRecordCount((int) searchHits.getTotalHits());
         list.setCurrentPageNumber(cb.getFetchPageNumber());
 
-        list.setTook(response.getTookInMillis());
+        list.setTook(response.getTook().getMillis());
         list.setTotalShards(response.getTotalShards());
         list.setSuccessfulShards(response.getSuccessfulShards());
         list.setFailedShards(response.getFailedShards());
@@ -183,7 +183,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
                 if (handler.isBreakCursor()) {
                     return;
                 }
-                final Map<String, Object> source = hit.getSource();
+                final Map<String, Object> source = hit.getSourceAsMap();
                 final RESULT entity = createEntity(source, entityType);
                 final DocMeta docMeta = ((EsAbstractEntity) entity).asDocMeta();
                 docMeta.id(hit.getId());
@@ -204,7 +204,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         delegateBulkRequest(cb, searchHits -> {
             List<RESULT> list = new ArrayList<>();
             searchHits.forEach(hit -> {
-                final Map<String, Object> source = hit.getSource();
+                final Map<String, Object> source = hit.getSourceAsMap();
                 final RESULT entity = createEntity(source, entityType);
                 final DocMeta docMeta = ((EsAbstractEntity) entity).asDocMeta();
                 docMeta.id(hit.getId());
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 cc38274c75c957f8ccfe981ca70ca8727a1e2f34..81dabf22ca532445dd80ebeb7ad88bc404dfb837 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
@@ -29,9 +29,9 @@ import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuil
 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.DateRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -126,8 +126,8 @@ public abstract class EsAbstractConditionAggregation {
         return builder;
     }
 
-    protected PercentileRanksAggregationBuilder regPercentileRanksA(String name, String field) {
-        PercentileRanksAggregationBuilder builder = AggregationBuilders.percentileRanks(name).field(field);
+    protected PercentileRanksAggregationBuilder regPercentileRanksA(String name, String field, double[] values) {
+        PercentileRanksAggregationBuilder builder = AggregationBuilders.percentileRanks(name, values).field(field);
         regA(builder);
         return builder;
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
index f51b68241d825878ad5fc06d3cd374c511356c5f..0a01904bf6889d3e731a1964027c105791083318 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
@@ -51,7 +51,7 @@ public abstract class BsAccessTokenBhv extends EsAbstractBehavior<AccessToken, A
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.access_token";
     }
 
     @Override
@@ -73,13 +73,13 @@ public abstract class BsAccessTokenBhv extends EsAbstractBehavior<AccessToken, A
     protected <RESULT extends AccessToken> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
-            result.setName(DfTypeUtil.toString(source.get("name")));
-            result.setToken(DfTypeUtil.toString(source.get("token")));
-            result.setPermissions(toStringArray(source.get("permissions")));
-            result.setParameterName(DfTypeUtil.toString(source.get("parameter_name")));
-            result.setExpiredTime(DfTypeUtil.toLong(source.get("expiredTime")));
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
+            result.setExpiredTime(DfTypeUtil.toLong(source.get("expiredTime")));
+            result.setName(DfTypeUtil.toString(source.get("name")));
+            result.setParameterName(DfTypeUtil.toString(source.get("parameter_name")));
+            result.setPermissions(toStringArray(source.get("permissions")));
+            result.setToken(DfTypeUtil.toString(source.get("token")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
             result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
             return updateEntity(source, result);
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
index ee1eefe2a6a7d1d9c930269790a39aef0ca03b46..b65af8a2c968c291e693c357ff87ce387a72579a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
@@ -51,7 +51,7 @@ public abstract class BsBadWordBhv extends EsAbstractBehavior<BadWord, BadWordCB
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.bad_word";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
index 0ff5c36fda22cba77125391c493502528da6062a..b630d032a92e97b49a1207ac137bef5db8d70840 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
@@ -51,7 +51,7 @@ public abstract class BsBoostDocumentRuleBhv extends EsAbstractBehavior<BoostDoc
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.boost_document_rule";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
index fa718181a419833308525fbc288019250240fd3d..29b16941c0f889da936aa4f77178f7656288d8b6 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
@@ -51,7 +51,7 @@ public abstract class BsCrawlingInfoBhv extends EsAbstractBehavior<CrawlingInfo,
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.crawling_info";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
index d14ee39a07e51961339cfd8accfc91c25cf3de1c..0a3cd5ff714474d90109c30fbd5505bc328152a3 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
@@ -51,7 +51,7 @@ public abstract class BsCrawlingInfoParamBhv extends EsAbstractBehavior<Crawling
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.crawling_info_param";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
index 20db29ceee6c5844c4b848767f90ad68a8983f55..d1089dd269471d290e37619044069600d0e73ee5 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
@@ -51,7 +51,7 @@ public abstract class BsDataConfigBhv extends EsAbstractBehavior<DataConfig, Dat
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.data_config";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToLabelBhv.java
index 71a5ddd18fe276d1fb68213e38244703f5428021..0c134f87f80b3b8f7b3e615e30e94239cbde82c7 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToLabelBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToLabelBhv.java
@@ -51,7 +51,7 @@ public abstract class BsDataConfigToLabelBhv extends EsAbstractBehavior<DataConf
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.data_config_to_label";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToRoleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToRoleBhv.java
index 26667a1526c138223eec3d20045eda6d69d68afd..95f4bf6f576351ea076415f8b17ab19d0b5837df 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToRoleBhv.java
@@ -51,7 +51,7 @@ public abstract class BsDataConfigToRoleBhv extends EsAbstractBehavior<DataConfi
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.data_config_to_role";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
index e932226ad00562cc1b5d8db886235e27f48ec4fa..7966c251bd1f65fd7740f3f633a129e8085007a1 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
@@ -51,7 +51,7 @@ public abstract class BsDuplicateHostBhv extends EsAbstractBehavior<DuplicateHos
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.duplicate_host";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
index 14b1a0d101bee187fc67a7cc88508a58c809c933..48548bd17f1cc3cbecbd62bf9c0873c0aad572a8 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
@@ -51,7 +51,7 @@ public abstract class BsElevateWordBhv extends EsAbstractBehavior<ElevateWord, E
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.elevate_word";
     }
 
     @Override
@@ -76,11 +76,11 @@ public abstract class BsElevateWordBhv extends EsAbstractBehavior<ElevateWord, E
             result.setBoost(DfTypeUtil.toFloat(source.get("boost")));
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
+            result.setPermissions(toStringArray(source.get("permissions")));
             result.setReading(DfTypeUtil.toString(source.get("reading")));
             result.setSuggestWord(DfTypeUtil.toString(source.get("suggestWord")));
             result.setTargetLabel(DfTypeUtil.toString(source.get("targetLabel")));
             result.setTargetRole(DfTypeUtil.toString(source.get("targetRole")));
-            result.setPermissions(toStringArray(source.get("permissions")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
             result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
             return updateEntity(source, result);
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
index 5c5256efd91e267c9a6df988e0cca67e6883bf6e..1e9215867e6471dec1cdb6b7aa6fd7b3ccf399b2 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
@@ -51,7 +51,7 @@ public abstract class BsElevateWordToLabelBhv extends EsAbstractBehavior<Elevate
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.elevate_word_to_label";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
index 01e035ddf64e4571d36856586b4d2deb96bb6b14..de68f55facaecad7aa33c4c82d63029aeb4e5f0f 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
@@ -51,7 +51,7 @@ public abstract class BsFailureUrlBhv extends EsAbstractBehavior<FailureUrl, Fai
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.failure_url";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
index 061807dc1d3cd215bf8c1c98d2197ea9fce4b3a4..72868b673431a38fce3cfa29ce430759fe47174c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
@@ -51,7 +51,7 @@ public abstract class BsFileAuthenticationBhv extends EsAbstractBehavior<FileAut
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.file_authentication";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
index 82ce3eb4651f16e54e96ce87d43cb315088079b5..600f984012c0ef3b596ac84c22733aefc47f43cd 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
@@ -51,7 +51,7 @@ public abstract class BsFileConfigBhv extends EsAbstractBehavior<FileConfig, Fil
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.file_config";
     }
 
     @Override
@@ -85,13 +85,13 @@ public abstract class BsFileConfigBhv extends EsAbstractBehavior<FileConfig, Fil
             result.setIncludedDocPaths(DfTypeUtil.toString(source.get("includedDocPaths")));
             result.setIncludedPaths(DfTypeUtil.toString(source.get("includedPaths")));
             result.setIntervalTime(DfTypeUtil.toInteger(source.get("intervalTime")));
-            result.setTimeToLive(DfTypeUtil.toInteger(source.get("timeToLive")));
             result.setMaxAccessCount(DfTypeUtil.toLong(source.get("maxAccessCount")));
             result.setName(DfTypeUtil.toString(source.get("name")));
             result.setNumOfThread(DfTypeUtil.toInteger(source.get("numOfThread")));
             result.setPaths(DfTypeUtil.toString(source.get("paths")));
             result.setPermissions(toStringArray(source.get("permissions")));
             result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
+            result.setTimeToLive(DfTypeUtil.toInteger(source.get("timeToLive")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
             result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
             result.setVirtualHosts(toStringArray(source.get("virtualHosts")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToLabelBhv.java
index 0c7f032ab5c76986e6a10c412f446041e797f01a..67cda9a7f28ae288e0f03f8cf9e07e51792e5779 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToLabelBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToLabelBhv.java
@@ -51,7 +51,7 @@ public abstract class BsFileConfigToLabelBhv extends EsAbstractBehavior<FileConf
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.file_config_to_label";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToRoleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToRoleBhv.java
index 6a7cb9b68349a3cc9d9ce04b89a447f49492dd9d..1d33195fee8e6327f4ea4059128153d33b4d9607 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToRoleBhv.java
@@ -51,7 +51,7 @@ public abstract class BsFileConfigToRoleBhv extends EsAbstractBehavior<FileConfi
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.file_config_to_role";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
index 8c5f709e52b999ae9e28690fbb49626959b7f916..cc008ff39e29f95254792d8cf8b5f1b341719021 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
@@ -51,7 +51,7 @@ public abstract class BsJobLogBhv extends EsAbstractBehavior<JobLog, JobLogCB> {
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.job_log";
     }
 
     @Override
@@ -76,12 +76,12 @@ public abstract class BsJobLogBhv extends EsAbstractBehavior<JobLog, JobLogCB> {
             result.setEndTime(DfTypeUtil.toLong(source.get("endTime")));
             result.setJobName(DfTypeUtil.toString(source.get("jobName")));
             result.setJobStatus(DfTypeUtil.toString(source.get("jobStatus")));
+            result.setLastUpdated(DfTypeUtil.toLong(source.get("lastUpdated")));
             result.setScriptData(DfTypeUtil.toString(source.get("scriptData")));
             result.setScriptResult(DfTypeUtil.toString(source.get("scriptResult")));
             result.setScriptType(DfTypeUtil.toString(source.get("scriptType")));
             result.setStartTime(DfTypeUtil.toLong(source.get("startTime")));
             result.setTarget(DfTypeUtil.toString(source.get("target")));
-            result.setLastUpdated(DfTypeUtil.toLong(source.get("lastUpdated")));
             return updateEntity(source, result);
         } catch (InstantiationException | IllegalAccessException e) {
             final String msg = "Cannot create a new instance: " + entityType.getName();
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
index 4c27625868087e1b3b5a9558c3b9d4a8ad1d541f..0aaa09e902945a800dd860d47ced700b49e30803 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
@@ -51,7 +51,7 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior<KeyMatch, KeyMatc
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.key_match";
     }
 
     @Override
@@ -79,9 +79,9 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior<KeyMatch, KeyMatc
             result.setMaxSize(DfTypeUtil.toInteger(source.get("maxSize")));
             result.setQuery(DfTypeUtil.toString(source.get("query")));
             result.setTerm(DfTypeUtil.toString(source.get("term")));
-            result.setVirtualHost(DfTypeUtil.toString(source.get("virtualHost")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
             result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
+            result.setVirtualHost(DfTypeUtil.toString(source.get("virtualHost")));
             return updateEntity(source, result);
         } catch (InstantiationException | IllegalAccessException e) {
             final String msg = "Cannot create a new instance: " + entityType.getName();
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelToRoleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelToRoleBhv.java
index 8526ff1abbee1a7416e48072e390dd1e0cbb173e..19a4075b5f574ce0754e83585a7a6f91241c20c3 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelToRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelToRoleBhv.java
@@ -51,7 +51,7 @@ public abstract class BsLabelToRoleBhv extends EsAbstractBehavior<LabelToRole, L
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.label_to_role";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
index 0f124f2cc67841dcefb5030a7b81d317842f92cd..0135f0e72762d1644b0259282acd411e71001251 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
@@ -51,7 +51,7 @@ public abstract class BsLabelTypeBhv extends EsAbstractBehavior<LabelType, Label
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.label_type";
     }
 
     @Override
@@ -79,11 +79,11 @@ public abstract class BsLabelTypeBhv extends EsAbstractBehavior<LabelType, Label
             result.setIncludedPaths(DfTypeUtil.toString(source.get("includedPaths")));
             result.setName(DfTypeUtil.toString(source.get("name")));
             result.setPermissions(toStringArray(source.get("permissions")));
-            result.setVirtualHost(DfTypeUtil.toString(source.get("virtualHost")));
             result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
             result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
             result.setValue(DfTypeUtil.toString(source.get("value")));
+            result.setVirtualHost(DfTypeUtil.toString(source.get("virtualHost")));
             return updateEntity(source, result);
         } catch (InstantiationException | IllegalAccessException e) {
             final String msg = "Cannot create a new instance: " + entityType.getName();
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
index 9ad88cfecf272ff2b91fef24c45e0ce4b9f9b2cc..8699ee32c1182247db0967bbbd8ab9c091915a3b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
@@ -51,7 +51,7 @@ public abstract class BsPathMappingBhv extends EsAbstractBehavior<PathMapping, P
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.path_mapping";
     }
 
     @Override
@@ -79,9 +79,9 @@ public abstract class BsPathMappingBhv extends EsAbstractBehavior<PathMapping, P
             result.setRegex(DfTypeUtil.toString(source.get("regex")));
             result.setReplacement(DfTypeUtil.toString(source.get("replacement")));
             result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
-            result.setUserAgent(DfTypeUtil.toString(source.get("userAgent")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
             result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
+            result.setUserAgent(DfTypeUtil.toString(source.get("userAgent")));
             return updateEntity(source, result);
         } catch (InstantiationException | IllegalAccessException e) {
             final String msg = "Cannot create a new instance: " + entityType.getName();
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
index 8b8bb3a5ab519c46d5cf86286bbd9b81f72bd789..ef3dbfd27eb12714e20513f8d06bf0c60ff625c3 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
@@ -51,7 +51,7 @@ public abstract class BsRelatedContentBhv extends EsAbstractBehavior<RelatedCont
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.related_content";
     }
 
     @Override
@@ -73,13 +73,13 @@ public abstract class BsRelatedContentBhv extends EsAbstractBehavior<RelatedCont
     protected <RESULT extends RelatedContent> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
+            result.setContent(DfTypeUtil.toString(source.get("content")));
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
+            result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
+            result.setTerm(DfTypeUtil.toString(source.get("term")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
             result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
-            result.setTerm(DfTypeUtil.toString(source.get("term")));
-            result.setContent(DfTypeUtil.toString(source.get("content")));
-            result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
             result.setVirtualHost(DfTypeUtil.toString(source.get("virtualHost")));
             return updateEntity(source, result);
         } catch (InstantiationException | IllegalAccessException e) {
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
index 0291cc0435e8058fba8dcbfb18908e8205671fff..e8a2fc4201c8c3e7d36d38da91ead2e9a9b9d920 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
@@ -51,7 +51,7 @@ public abstract class BsRelatedQueryBhv extends EsAbstractBehavior<RelatedQuery,
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.related_query";
     }
 
     @Override
@@ -75,10 +75,10 @@ public abstract class BsRelatedQueryBhv extends EsAbstractBehavior<RelatedQuery,
             final RESULT result = entityType.newInstance();
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
+            result.setQueries(toStringArray(source.get("queries")));
+            result.setTerm(DfTypeUtil.toString(source.get("term")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
             result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
-            result.setTerm(DfTypeUtil.toString(source.get("term")));
-            result.setQueries(toStringArray(source.get("queries")));
             result.setVirtualHost(DfTypeUtil.toString(source.get("virtualHost")));
             return updateEntity(source, result);
         } catch (InstantiationException | IllegalAccessException e) {
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
index e7e80d5d39756467c886d10282c5941010a3530b..304fe8de7fea60ba11f68e0cc3afeebdf1928944 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
@@ -51,7 +51,7 @@ public abstract class BsRequestHeaderBhv extends EsAbstractBehavior<RequestHeade
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.request_header";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
index 4820a4ad464565adde144d8d14c531695323b58e..33c4674fb9711605a1168ecfe33a2311587c4f89 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
@@ -51,7 +51,7 @@ public abstract class BsRoleTypeBhv extends EsAbstractBehavior<RoleType, RoleTyp
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.role_type";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
index 2ff11d6c643b3fd194f8f3047aa0f55c6190c63f..58537a3b49ad47e05347c5d625f1dbabc9d650a7 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
@@ -51,7 +51,7 @@ public abstract class BsScheduledJobBhv extends EsAbstractBehavior<ScheduledJob,
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.scheduled_job";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
index 88714bbe15ff2c8d9cf683c1f039876784b4cde6..53bdb4de6c9330eeb55438ffa8aaff16a04e53bd 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
@@ -51,7 +51,7 @@ public abstract class BsThumbnailQueueBhv extends EsAbstractBehavior<ThumbnailQu
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.thumbnail_queue";
     }
 
     @Override
@@ -75,10 +75,10 @@ public abstract class BsThumbnailQueueBhv extends EsAbstractBehavior<ThumbnailQu
             final RESULT result = entityType.newInstance();
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
-            result.setTarget(DfTypeUtil.toString(source.get("target")));
             result.setGenerator(DfTypeUtil.toString(source.get("generator")));
-            result.setThumbnailId(DfTypeUtil.toString(source.get("thumbnail_id")));
             result.setPath(DfTypeUtil.toString(source.get("path")));
+            result.setTarget(DfTypeUtil.toString(source.get("target")));
+            result.setThumbnailId(DfTypeUtil.toString(source.get("thumbnail_id")));
             return updateEntity(source, result);
         } catch (InstantiationException | IllegalAccessException e) {
             final String msg = "Cannot create a new instance: " + entityType.getName();
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
index 71c4473c068fd73267ef898de8c103de5670f4cc..1e55a7318b9d5c12501ee392c30f730ca17fa410 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
@@ -51,7 +51,7 @@ public abstract class BsWebAuthenticationBhv extends EsAbstractBehavior<WebAuthe
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.web_authentication";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
index 9e22075105fd697b8a521e4fc6c107d07fe4df1c..89801576e3f6c454a0e1aed2afb9dc3e18dbb38d 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
@@ -51,7 +51,7 @@ public abstract class BsWebConfigBhv extends EsAbstractBehavior<WebConfig, WebCo
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.web_config";
     }
 
     @Override
@@ -85,12 +85,12 @@ public abstract class BsWebConfigBhv extends EsAbstractBehavior<WebConfig, WebCo
             result.setIncludedDocUrls(DfTypeUtil.toString(source.get("includedDocUrls")));
             result.setIncludedUrls(DfTypeUtil.toString(source.get("includedUrls")));
             result.setIntervalTime(DfTypeUtil.toInteger(source.get("intervalTime")));
-            result.setTimeToLive(DfTypeUtil.toInteger(source.get("timeToLive")));
             result.setMaxAccessCount(DfTypeUtil.toLong(source.get("maxAccessCount")));
             result.setName(DfTypeUtil.toString(source.get("name")));
             result.setNumOfThread(DfTypeUtil.toInteger(source.get("numOfThread")));
             result.setPermissions(toStringArray(source.get("permissions")));
             result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
+            result.setTimeToLive(DfTypeUtil.toInteger(source.get("timeToLive")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
             result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
             result.setUrls(DfTypeUtil.toString(source.get("urls")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToLabelBhv.java
index 215afb6c70e8cb2889d60aeed83ce0b2d5e74d65..9810c448fe697a9b9f873820b1ffefc75c73530d 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToLabelBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToLabelBhv.java
@@ -51,7 +51,7 @@ public abstract class BsWebConfigToLabelBhv extends EsAbstractBehavior<WebConfig
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.web_config_to_label";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToRoleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToRoleBhv.java
index 7bf567f3aaed6ef963ae17d87d349e9dd9022f3b..dd109b89bffaab814550579adadd698ef51d3de3 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToRoleBhv.java
@@ -51,7 +51,7 @@ public abstract class BsWebConfigToRoleBhv extends EsAbstractBehavior<WebConfigT
 
     @Override
     protected String asEsIndex() {
-        return ".fess_config";
+        return ".fess_config.web_config_to_role";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsAccessToken.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsAccessToken.java
index aaf94a7147289e4dc0b58291271caa5494f5b26c..5a67c4187d744606b39ca30f9993423a187bd614 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsAccessToken.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsAccessToken.java
@@ -37,26 +37,26 @@ public class BsAccessToken extends EsAbstractEntity {
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    /** name */
-    protected String name;
+    /** createdBy */
+    protected String createdBy;
 
-    /** token */
-    protected String token;
+    /** createdTime */
+    protected Long createdTime;
 
-    /** permissions */
-    protected String[] permissions;
+    /** expiredTime */
+    protected Long expiredTime;
+
+    /** name */
+    protected String name;
 
     /** parameter_name */
     protected String parameterName;
 
-    /** expiredTime */
-    protected Long expiredTime;
-
-    /** createdBy */
-    protected String createdBy;
+    /** permissions */
+    protected String[] permissions;
 
-    /** createdTime */
-    protected Long createdTime;
+    /** token */
+    protected String token;
 
     /** updatedBy */
     protected String updatedBy;
@@ -85,26 +85,26 @@ public class BsAccessToken extends EsAbstractEntity {
     @Override
     public Map<String, Object> toSource() {
         Map<String, Object> sourceMap = new HashMap<>();
-        if (name != null) {
-            addFieldToSource(sourceMap, "name", name);
+        if (createdBy != null) {
+            addFieldToSource(sourceMap, "createdBy", createdBy);
         }
-        if (token != null) {
-            addFieldToSource(sourceMap, "token", token);
+        if (createdTime != null) {
+            addFieldToSource(sourceMap, "createdTime", createdTime);
         }
-        if (permissions != null) {
-            addFieldToSource(sourceMap, "permissions", permissions);
+        if (expiredTime != null) {
+            addFieldToSource(sourceMap, "expiredTime", expiredTime);
+        }
+        if (name != null) {
+            addFieldToSource(sourceMap, "name", name);
         }
         if (parameterName != null) {
             addFieldToSource(sourceMap, "parameter_name", parameterName);
         }
-        if (expiredTime != null) {
-            addFieldToSource(sourceMap, "expiredTime", expiredTime);
-        }
-        if (createdBy != null) {
-            addFieldToSource(sourceMap, "createdBy", createdBy);
+        if (permissions != null) {
+            addFieldToSource(sourceMap, "permissions", permissions);
         }
-        if (createdTime != null) {
-            addFieldToSource(sourceMap, "createdTime", createdTime);
+        if (token != null) {
+            addFieldToSource(sourceMap, "token", token);
         }
         if (updatedBy != null) {
             addFieldToSource(sourceMap, "updatedBy", updatedBy);
@@ -125,13 +125,13 @@ public class BsAccessToken extends EsAbstractEntity {
     @Override
     protected String doBuildColumnString(String dm) {
         StringBuilder sb = new StringBuilder();
-        sb.append(dm).append(name);
-        sb.append(dm).append(token);
-        sb.append(dm).append(permissions);
-        sb.append(dm).append(parameterName);
-        sb.append(dm).append(expiredTime);
         sb.append(dm).append(createdBy);
         sb.append(dm).append(createdTime);
+        sb.append(dm).append(expiredTime);
+        sb.append(dm).append(name);
+        sb.append(dm).append(parameterName);
+        sb.append(dm).append(permissions);
+        sb.append(dm).append(token);
         sb.append(dm).append(updatedBy);
         sb.append(dm).append(updatedTime);
         if (sb.length() > dm.length()) {
@@ -144,34 +144,44 @@ public class BsAccessToken extends EsAbstractEntity {
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
-    public String getName() {
-        checkSpecifiedProperty("name");
-        return convertEmptyToNull(name);
+    public String getCreatedBy() {
+        checkSpecifiedProperty("createdBy");
+        return convertEmptyToNull(createdBy);
     }
 
-    public void setName(String value) {
-        registerModifiedProperty("name");
-        this.name = value;
+    public void setCreatedBy(String value) {
+        registerModifiedProperty("createdBy");
+        this.createdBy = value;
     }
 
-    public String getToken() {
-        checkSpecifiedProperty("token");
-        return convertEmptyToNull(token);
+    public Long getCreatedTime() {
+        checkSpecifiedProperty("createdTime");
+        return createdTime;
     }
 
-    public void setToken(String value) {
-        registerModifiedProperty("token");
-        this.token = value;
+    public void setCreatedTime(Long value) {
+        registerModifiedProperty("createdTime");
+        this.createdTime = value;
     }
 
-    public String[] getPermissions() {
-        checkSpecifiedProperty("permissions");
-        return permissions;
+    public Long getExpiredTime() {
+        checkSpecifiedProperty("expiredTime");
+        return expiredTime;
     }
 
-    public void setPermissions(String[] value) {
-        registerModifiedProperty("permissions");
-        this.permissions = value;
+    public void setExpiredTime(Long value) {
+        registerModifiedProperty("expiredTime");
+        this.expiredTime = value;
+    }
+
+    public String getName() {
+        checkSpecifiedProperty("name");
+        return convertEmptyToNull(name);
+    }
+
+    public void setName(String value) {
+        registerModifiedProperty("name");
+        this.name = value;
     }
 
     public String getParameterName() {
@@ -184,34 +194,24 @@ public class BsAccessToken extends EsAbstractEntity {
         this.parameterName = value;
     }
 
-    public Long getExpiredTime() {
-        checkSpecifiedProperty("expiredTime");
-        return expiredTime;
-    }
-
-    public void setExpiredTime(Long value) {
-        registerModifiedProperty("expiredTime");
-        this.expiredTime = value;
-    }
-
-    public String getCreatedBy() {
-        checkSpecifiedProperty("createdBy");
-        return convertEmptyToNull(createdBy);
+    public String[] getPermissions() {
+        checkSpecifiedProperty("permissions");
+        return permissions;
     }
 
-    public void setCreatedBy(String value) {
-        registerModifiedProperty("createdBy");
-        this.createdBy = value;
+    public void setPermissions(String[] value) {
+        registerModifiedProperty("permissions");
+        this.permissions = value;
     }
 
-    public Long getCreatedTime() {
-        checkSpecifiedProperty("createdTime");
-        return createdTime;
+    public String getToken() {
+        checkSpecifiedProperty("token");
+        return convertEmptyToNull(token);
     }
 
-    public void setCreatedTime(Long value) {
-        registerModifiedProperty("createdTime");
-        this.createdTime = value;
+    public void setToken(String value) {
+        registerModifiedProperty("token");
+        this.token = value;
     }
 
     public String getUpdatedBy() {
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java
index 09e8f0506432d7ddb64121535fe8062f241c7f35..78cbe0f5d4bc38f84b9dabb472502531527a1d51 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java
@@ -46,6 +46,9 @@ public class BsElevateWord extends EsAbstractEntity {
     /** createdTime */
     protected Long createdTime;
 
+    /** permissions */
+    protected String[] permissions;
+
     /** reading */
     protected String reading;
 
@@ -58,9 +61,6 @@ public class BsElevateWord extends EsAbstractEntity {
     /** targetRole */
     protected String targetRole;
 
-    /** permissions */
-    protected String[] permissions;
-
     /** updatedBy */
     protected String updatedBy;
 
@@ -97,6 +97,9 @@ public class BsElevateWord extends EsAbstractEntity {
         if (createdTime != null) {
             addFieldToSource(sourceMap, "createdTime", createdTime);
         }
+        if (permissions != null) {
+            addFieldToSource(sourceMap, "permissions", permissions);
+        }
         if (reading != null) {
             addFieldToSource(sourceMap, "reading", reading);
         }
@@ -109,9 +112,6 @@ public class BsElevateWord extends EsAbstractEntity {
         if (targetRole != null) {
             addFieldToSource(sourceMap, "targetRole", targetRole);
         }
-        if (permissions != null) {
-            addFieldToSource(sourceMap, "permissions", permissions);
-        }
         if (updatedBy != null) {
             addFieldToSource(sourceMap, "updatedBy", updatedBy);
         }
@@ -134,11 +134,11 @@ public class BsElevateWord extends EsAbstractEntity {
         sb.append(dm).append(boost);
         sb.append(dm).append(createdBy);
         sb.append(dm).append(createdTime);
+        sb.append(dm).append(permissions);
         sb.append(dm).append(reading);
         sb.append(dm).append(suggestWord);
         sb.append(dm).append(targetLabel);
         sb.append(dm).append(targetRole);
-        sb.append(dm).append(permissions);
         sb.append(dm).append(updatedBy);
         sb.append(dm).append(updatedTime);
         if (sb.length() > dm.length()) {
@@ -181,6 +181,16 @@ public class BsElevateWord extends EsAbstractEntity {
         this.createdTime = value;
     }
 
+    public String[] getPermissions() {
+        checkSpecifiedProperty("permissions");
+        return permissions;
+    }
+
+    public void setPermissions(String[] value) {
+        registerModifiedProperty("permissions");
+        this.permissions = value;
+    }
+
     public String getReading() {
         checkSpecifiedProperty("reading");
         return convertEmptyToNull(reading);
@@ -221,16 +231,6 @@ public class BsElevateWord extends EsAbstractEntity {
         this.targetRole = value;
     }
 
-    public String[] getPermissions() {
-        checkSpecifiedProperty("permissions");
-        return permissions;
-    }
-
-    public void setPermissions(String[] value) {
-        registerModifiedProperty("permissions");
-        this.permissions = value;
-    }
-
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
         return convertEmptyToNull(updatedBy);
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
index 5d3b1bbe19656e00d144e083c22e574cd1f4ab15..90892a017bd30fb14f05981aa30b6793795f29c8 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
@@ -73,9 +73,6 @@ public class BsFileConfig extends EsAbstractEntity {
     /** intervalTime */
     protected Integer intervalTime;
 
-    /** timeToLive */
-    protected Integer timeToLive;
-
     /** maxAccessCount */
     protected Long maxAccessCount;
 
@@ -94,6 +91,9 @@ public class BsFileConfig extends EsAbstractEntity {
     /** sortOrder */
     protected Integer sortOrder;
 
+    /** timeToLive */
+    protected Integer timeToLive;
+
     /** updatedBy */
     protected String updatedBy;
 
@@ -160,9 +160,6 @@ public class BsFileConfig extends EsAbstractEntity {
         if (intervalTime != null) {
             addFieldToSource(sourceMap, "intervalTime", intervalTime);
         }
-        if (timeToLive != null) {
-            addFieldToSource(sourceMap, "timeToLive", timeToLive);
-        }
         if (maxAccessCount != null) {
             addFieldToSource(sourceMap, "maxAccessCount", maxAccessCount);
         }
@@ -181,6 +178,9 @@ public class BsFileConfig extends EsAbstractEntity {
         if (sortOrder != null) {
             addFieldToSource(sourceMap, "sortOrder", sortOrder);
         }
+        if (timeToLive != null) {
+            addFieldToSource(sourceMap, "timeToLive", timeToLive);
+        }
         if (updatedBy != null) {
             addFieldToSource(sourceMap, "updatedBy", updatedBy);
         }
@@ -215,13 +215,13 @@ public class BsFileConfig extends EsAbstractEntity {
         sb.append(dm).append(includedDocPaths);
         sb.append(dm).append(includedPaths);
         sb.append(dm).append(intervalTime);
-        sb.append(dm).append(timeToLive);
         sb.append(dm).append(maxAccessCount);
         sb.append(dm).append(name);
         sb.append(dm).append(numOfThread);
         sb.append(dm).append(paths);
         sb.append(dm).append(permissions);
         sb.append(dm).append(sortOrder);
+        sb.append(dm).append(timeToLive);
         sb.append(dm).append(updatedBy);
         sb.append(dm).append(updatedTime);
         sb.append(dm).append(virtualHosts);
@@ -355,16 +355,6 @@ public class BsFileConfig extends EsAbstractEntity {
         this.intervalTime = value;
     }
 
-    public Integer getTimeToLive() {
-        checkSpecifiedProperty("timeToLive");
-        return timeToLive;
-    }
-
-    public void setTimeToLive(Integer value) {
-        registerModifiedProperty("timeToLive");
-        this.timeToLive = value;
-    }
-
     public Long getMaxAccessCount() {
         checkSpecifiedProperty("maxAccessCount");
         return maxAccessCount;
@@ -425,6 +415,16 @@ public class BsFileConfig extends EsAbstractEntity {
         this.sortOrder = value;
     }
 
+    public Integer getTimeToLive() {
+        checkSpecifiedProperty("timeToLive");
+        return timeToLive;
+    }
+
+    public void setTimeToLive(Integer value) {
+        registerModifiedProperty("timeToLive");
+        this.timeToLive = value;
+    }
+
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
         return convertEmptyToNull(updatedBy);
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java
index c62c67890317780d3d96e2fdd2acb70a5a51b578..0b2a70d49ae14b378d433763c342ecdcb4e1c332 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java
@@ -46,6 +46,9 @@ public class BsJobLog extends EsAbstractEntity {
     /** jobStatus */
     protected String jobStatus;
 
+    /** lastUpdated */
+    protected Long lastUpdated;
+
     /** scriptData */
     protected String scriptData;
 
@@ -61,9 +64,6 @@ public class BsJobLog extends EsAbstractEntity {
     /** target */
     protected String target;
 
-    /** lastUpdated */
-    protected Long lastUpdated;
-
     // [Referrers] *comment only
 
     // ===================================================================================
@@ -94,6 +94,9 @@ public class BsJobLog extends EsAbstractEntity {
         if (jobStatus != null) {
             addFieldToSource(sourceMap, "jobStatus", jobStatus);
         }
+        if (lastUpdated != null) {
+            addFieldToSource(sourceMap, "lastUpdated", lastUpdated);
+        }
         if (scriptData != null) {
             addFieldToSource(sourceMap, "scriptData", scriptData);
         }
@@ -109,9 +112,6 @@ public class BsJobLog extends EsAbstractEntity {
         if (target != null) {
             addFieldToSource(sourceMap, "target", target);
         }
-        if (lastUpdated != null) {
-            addFieldToSource(sourceMap, "lastUpdated", lastUpdated);
-        }
         return sourceMap;
     }
 
@@ -128,12 +128,12 @@ public class BsJobLog extends EsAbstractEntity {
         sb.append(dm).append(endTime);
         sb.append(dm).append(jobName);
         sb.append(dm).append(jobStatus);
+        sb.append(dm).append(lastUpdated);
         sb.append(dm).append(scriptData);
         sb.append(dm).append(scriptResult);
         sb.append(dm).append(scriptType);
         sb.append(dm).append(startTime);
         sb.append(dm).append(target);
-        sb.append(dm).append(lastUpdated);
         if (sb.length() > dm.length()) {
             sb.delete(0, dm.length());
         }
@@ -174,6 +174,16 @@ public class BsJobLog extends EsAbstractEntity {
         this.jobStatus = value;
     }
 
+    public Long getLastUpdated() {
+        checkSpecifiedProperty("lastUpdated");
+        return lastUpdated;
+    }
+
+    public void setLastUpdated(Long value) {
+        registerModifiedProperty("lastUpdated");
+        this.lastUpdated = value;
+    }
+
     public String getScriptData() {
         checkSpecifiedProperty("scriptData");
         return convertEmptyToNull(scriptData);
@@ -223,14 +233,4 @@ public class BsJobLog extends EsAbstractEntity {
         registerModifiedProperty("target");
         this.target = value;
     }
-
-    public Long getLastUpdated() {
-        checkSpecifiedProperty("lastUpdated");
-        return lastUpdated;
-    }
-
-    public void setLastUpdated(Long value) {
-        registerModifiedProperty("lastUpdated");
-        this.lastUpdated = value;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java
index f2cc7ab9122121afe70cb1d1bd25263a64c5b9b4..b039ca096d44456e20fe486d3d4c03d8963b6ff3 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java
@@ -55,15 +55,15 @@ public class BsKeyMatch extends EsAbstractEntity {
     /** term */
     protected String term;
 
-    /** virtualHost */
-    protected String virtualHost;
-
     /** updatedBy */
     protected String updatedBy;
 
     /** updatedTime */
     protected Long updatedTime;
 
+    /** virtualHost */
+    protected String virtualHost;
+
     // [Referrers] *comment only
 
     // ===================================================================================
@@ -103,15 +103,15 @@ public class BsKeyMatch extends EsAbstractEntity {
         if (term != null) {
             addFieldToSource(sourceMap, "term", term);
         }
-        if (virtualHost != null) {
-            addFieldToSource(sourceMap, "virtualHost", virtualHost);
-        }
         if (updatedBy != null) {
             addFieldToSource(sourceMap, "updatedBy", updatedBy);
         }
         if (updatedTime != null) {
             addFieldToSource(sourceMap, "updatedTime", updatedTime);
         }
+        if (virtualHost != null) {
+            addFieldToSource(sourceMap, "virtualHost", virtualHost);
+        }
         return sourceMap;
     }
 
@@ -131,9 +131,9 @@ public class BsKeyMatch extends EsAbstractEntity {
         sb.append(dm).append(maxSize);
         sb.append(dm).append(query);
         sb.append(dm).append(term);
-        sb.append(dm).append(virtualHost);
         sb.append(dm).append(updatedBy);
         sb.append(dm).append(updatedTime);
+        sb.append(dm).append(virtualHost);
         if (sb.length() > dm.length()) {
             sb.delete(0, dm.length());
         }
@@ -204,16 +204,6 @@ public class BsKeyMatch extends EsAbstractEntity {
         this.term = value;
     }
 
-    public String getVirtualHost() {
-        checkSpecifiedProperty("virtualHost");
-        return convertEmptyToNull(virtualHost);
-    }
-
-    public void setVirtualHost(String value) {
-        registerModifiedProperty("virtualHost");
-        this.virtualHost = value;
-    }
-
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
         return convertEmptyToNull(updatedBy);
@@ -233,4 +223,14 @@ public class BsKeyMatch extends EsAbstractEntity {
         registerModifiedProperty("updatedTime");
         this.updatedTime = value;
     }
+
+    public String getVirtualHost() {
+        checkSpecifiedProperty("virtualHost");
+        return convertEmptyToNull(virtualHost);
+    }
+
+    public void setVirtualHost(String value) {
+        registerModifiedProperty("virtualHost");
+        this.virtualHost = value;
+    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java
index 9164126d62ff96cbc2deaec4e09f1d50396b4be4..278d6ff3e5b9cc175ea096fbdce8849f0a9a6cde 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java
@@ -55,9 +55,6 @@ public class BsLabelType extends EsAbstractEntity {
     /** permissions */
     protected String[] permissions;
 
-    /** virtualHost */
-    protected String virtualHost;
-
     /** sortOrder */
     protected Integer sortOrder;
 
@@ -70,6 +67,9 @@ public class BsLabelType extends EsAbstractEntity {
     /** value */
     protected String value;
 
+    /** virtualHost */
+    protected String virtualHost;
+
     // [Referrers] *comment only
 
     // ===================================================================================
@@ -109,9 +109,6 @@ public class BsLabelType extends EsAbstractEntity {
         if (permissions != null) {
             addFieldToSource(sourceMap, "permissions", permissions);
         }
-        if (virtualHost != null) {
-            addFieldToSource(sourceMap, "virtualHost", virtualHost);
-        }
         if (sortOrder != null) {
             addFieldToSource(sourceMap, "sortOrder", sortOrder);
         }
@@ -124,6 +121,9 @@ public class BsLabelType extends EsAbstractEntity {
         if (value != null) {
             addFieldToSource(sourceMap, "value", value);
         }
+        if (virtualHost != null) {
+            addFieldToSource(sourceMap, "virtualHost", virtualHost);
+        }
         return sourceMap;
     }
 
@@ -143,11 +143,11 @@ public class BsLabelType extends EsAbstractEntity {
         sb.append(dm).append(includedPaths);
         sb.append(dm).append(name);
         sb.append(dm).append(permissions);
-        sb.append(dm).append(virtualHost);
         sb.append(dm).append(sortOrder);
         sb.append(dm).append(updatedBy);
         sb.append(dm).append(updatedTime);
         sb.append(dm).append(value);
+        sb.append(dm).append(virtualHost);
         if (sb.length() > dm.length()) {
             sb.delete(0, dm.length());
         }
@@ -218,16 +218,6 @@ public class BsLabelType extends EsAbstractEntity {
         this.permissions = value;
     }
 
-    public String getVirtualHost() {
-        checkSpecifiedProperty("virtualHost");
-        return convertEmptyToNull(virtualHost);
-    }
-
-    public void setVirtualHost(String value) {
-        registerModifiedProperty("virtualHost");
-        this.virtualHost = value;
-    }
-
     public Integer getSortOrder() {
         checkSpecifiedProperty("sortOrder");
         return sortOrder;
@@ -267,4 +257,14 @@ public class BsLabelType extends EsAbstractEntity {
         registerModifiedProperty("value");
         this.value = value;
     }
+
+    public String getVirtualHost() {
+        checkSpecifiedProperty("virtualHost");
+        return convertEmptyToNull(virtualHost);
+    }
+
+    public void setVirtualHost(String value) {
+        registerModifiedProperty("virtualHost");
+        this.virtualHost = value;
+    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java
index 1c91227f1758a1744170b11cf015ee6ca9996374..fd985397f7ba5949a77f20c167c59fc7ade68ac9 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java
@@ -55,15 +55,15 @@ public class BsPathMapping extends EsAbstractEntity {
     /** sortOrder */
     protected Integer sortOrder;
 
-    /** userAgent */
-    protected String userAgent;
-
     /** updatedBy */
     protected String updatedBy;
 
     /** updatedTime */
     protected Long updatedTime;
 
+    /** userAgent */
+    protected String userAgent;
+
     // [Referrers] *comment only
 
     // ===================================================================================
@@ -103,15 +103,15 @@ public class BsPathMapping extends EsAbstractEntity {
         if (sortOrder != null) {
             addFieldToSource(sourceMap, "sortOrder", sortOrder);
         }
-        if (userAgent != null) {
-            addFieldToSource(sourceMap, "userAgent", userAgent);
-        }
         if (updatedBy != null) {
             addFieldToSource(sourceMap, "updatedBy", updatedBy);
         }
         if (updatedTime != null) {
             addFieldToSource(sourceMap, "updatedTime", updatedTime);
         }
+        if (userAgent != null) {
+            addFieldToSource(sourceMap, "userAgent", userAgent);
+        }
         return sourceMap;
     }
 
@@ -131,9 +131,9 @@ public class BsPathMapping extends EsAbstractEntity {
         sb.append(dm).append(regex);
         sb.append(dm).append(replacement);
         sb.append(dm).append(sortOrder);
-        sb.append(dm).append(userAgent);
         sb.append(dm).append(updatedBy);
         sb.append(dm).append(updatedTime);
+        sb.append(dm).append(userAgent);
         if (sb.length() > dm.length()) {
             sb.delete(0, dm.length());
         }
@@ -204,16 +204,6 @@ public class BsPathMapping extends EsAbstractEntity {
         this.sortOrder = value;
     }
 
-    public String getUserAgent() {
-        checkSpecifiedProperty("userAgent");
-        return convertEmptyToNull(userAgent);
-    }
-
-    public void setUserAgent(String value) {
-        registerModifiedProperty("userAgent");
-        this.userAgent = value;
-    }
-
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
         return convertEmptyToNull(updatedBy);
@@ -233,4 +223,14 @@ public class BsPathMapping extends EsAbstractEntity {
         registerModifiedProperty("updatedTime");
         this.updatedTime = value;
     }
+
+    public String getUserAgent() {
+        checkSpecifiedProperty("userAgent");
+        return convertEmptyToNull(userAgent);
+    }
+
+    public void setUserAgent(String value) {
+        registerModifiedProperty("userAgent");
+        this.userAgent = value;
+    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedContent.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedContent.java
index ba3c58dfb0f0cf2a07eb591054c1159f673d0748..6ae51fb2a27266bc2536c4532337e8ed8d53d19b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedContent.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedContent.java
@@ -37,26 +37,26 @@ public class BsRelatedContent extends EsAbstractEntity {
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
+    /** content */
+    protected String content;
+
     /** createdBy */
     protected String createdBy;
 
     /** createdTime */
     protected Long createdTime;
 
-    /** updatedBy */
-    protected String updatedBy;
-
-    /** updatedTime */
-    protected Long updatedTime;
+    /** sortOrder */
+    protected Integer sortOrder;
 
     /** term */
     protected String term;
 
-    /** content */
-    protected String content;
+    /** updatedBy */
+    protected String updatedBy;
 
-    /** sortOrder */
-    protected Integer sortOrder;
+    /** updatedTime */
+    protected Long updatedTime;
 
     /** virtualHost */
     protected String virtualHost;
@@ -82,26 +82,26 @@ public class BsRelatedContent extends EsAbstractEntity {
     @Override
     public Map<String, Object> toSource() {
         Map<String, Object> sourceMap = new HashMap<>();
+        if (content != null) {
+            addFieldToSource(sourceMap, "content", content);
+        }
         if (createdBy != null) {
             addFieldToSource(sourceMap, "createdBy", createdBy);
         }
         if (createdTime != null) {
             addFieldToSource(sourceMap, "createdTime", createdTime);
         }
-        if (updatedBy != null) {
-            addFieldToSource(sourceMap, "updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            addFieldToSource(sourceMap, "updatedTime", updatedTime);
+        if (sortOrder != null) {
+            addFieldToSource(sourceMap, "sortOrder", sortOrder);
         }
         if (term != null) {
             addFieldToSource(sourceMap, "term", term);
         }
-        if (content != null) {
-            addFieldToSource(sourceMap, "content", content);
+        if (updatedBy != null) {
+            addFieldToSource(sourceMap, "updatedBy", updatedBy);
         }
-        if (sortOrder != null) {
-            addFieldToSource(sourceMap, "sortOrder", sortOrder);
+        if (updatedTime != null) {
+            addFieldToSource(sourceMap, "updatedTime", updatedTime);
         }
         if (virtualHost != null) {
             addFieldToSource(sourceMap, "virtualHost", virtualHost);
@@ -119,13 +119,13 @@ public class BsRelatedContent extends EsAbstractEntity {
     @Override
     protected String doBuildColumnString(String dm) {
         StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(content);
         sb.append(dm).append(createdBy);
         sb.append(dm).append(createdTime);
+        sb.append(dm).append(sortOrder);
+        sb.append(dm).append(term);
         sb.append(dm).append(updatedBy);
         sb.append(dm).append(updatedTime);
-        sb.append(dm).append(term);
-        sb.append(dm).append(content);
-        sb.append(dm).append(sortOrder);
         sb.append(dm).append(virtualHost);
         if (sb.length() > dm.length()) {
             sb.delete(0, dm.length());
@@ -137,6 +137,16 @@ public class BsRelatedContent extends EsAbstractEntity {
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
+    public String getContent() {
+        checkSpecifiedProperty("content");
+        return convertEmptyToNull(content);
+    }
+
+    public void setContent(String value) {
+        registerModifiedProperty("content");
+        this.content = value;
+    }
+
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
         return convertEmptyToNull(createdBy);
@@ -157,24 +167,14 @@ public class BsRelatedContent extends EsAbstractEntity {
         this.createdTime = value;
     }
 
-    public String getUpdatedBy() {
-        checkSpecifiedProperty("updatedBy");
-        return convertEmptyToNull(updatedBy);
-    }
-
-    public void setUpdatedBy(String value) {
-        registerModifiedProperty("updatedBy");
-        this.updatedBy = value;
-    }
-
-    public Long getUpdatedTime() {
-        checkSpecifiedProperty("updatedTime");
-        return updatedTime;
+    public Integer getSortOrder() {
+        checkSpecifiedProperty("sortOrder");
+        return sortOrder;
     }
 
-    public void setUpdatedTime(Long value) {
-        registerModifiedProperty("updatedTime");
-        this.updatedTime = value;
+    public void setSortOrder(Integer value) {
+        registerModifiedProperty("sortOrder");
+        this.sortOrder = value;
     }
 
     public String getTerm() {
@@ -187,24 +187,24 @@ public class BsRelatedContent extends EsAbstractEntity {
         this.term = value;
     }
 
-    public String getContent() {
-        checkSpecifiedProperty("content");
-        return convertEmptyToNull(content);
+    public String getUpdatedBy() {
+        checkSpecifiedProperty("updatedBy");
+        return convertEmptyToNull(updatedBy);
     }
 
-    public void setContent(String value) {
-        registerModifiedProperty("content");
-        this.content = value;
+    public void setUpdatedBy(String value) {
+        registerModifiedProperty("updatedBy");
+        this.updatedBy = value;
     }
 
-    public Integer getSortOrder() {
-        checkSpecifiedProperty("sortOrder");
-        return sortOrder;
+    public Long getUpdatedTime() {
+        checkSpecifiedProperty("updatedTime");
+        return updatedTime;
     }
 
-    public void setSortOrder(Integer value) {
-        registerModifiedProperty("sortOrder");
-        this.sortOrder = value;
+    public void setUpdatedTime(Long value) {
+        registerModifiedProperty("updatedTime");
+        this.updatedTime = value;
     }
 
     public String getVirtualHost() {
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedQuery.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedQuery.java
index 20647025a606da35e6080f317fecd57496dc84c2..25ec6c9c8adabf94cea512c97a1cab69f3fdcda0 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedQuery.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedQuery.java
@@ -43,18 +43,18 @@ public class BsRelatedQuery extends EsAbstractEntity {
     /** createdTime */
     protected Long createdTime;
 
+    /** queries */
+    protected String[] queries;
+
+    /** term */
+    protected String term;
+
     /** updatedBy */
     protected String updatedBy;
 
     /** updatedTime */
     protected Long updatedTime;
 
-    /** term */
-    protected String term;
-
-    /** queries */
-    protected String[] queries;
-
     /** virtualHost */
     protected String virtualHost;
 
@@ -85,18 +85,18 @@ public class BsRelatedQuery extends EsAbstractEntity {
         if (createdTime != null) {
             addFieldToSource(sourceMap, "createdTime", createdTime);
         }
+        if (queries != null) {
+            addFieldToSource(sourceMap, "queries", queries);
+        }
+        if (term != null) {
+            addFieldToSource(sourceMap, "term", term);
+        }
         if (updatedBy != null) {
             addFieldToSource(sourceMap, "updatedBy", updatedBy);
         }
         if (updatedTime != null) {
             addFieldToSource(sourceMap, "updatedTime", updatedTime);
         }
-        if (term != null) {
-            addFieldToSource(sourceMap, "term", term);
-        }
-        if (queries != null) {
-            addFieldToSource(sourceMap, "queries", queries);
-        }
         if (virtualHost != null) {
             addFieldToSource(sourceMap, "virtualHost", virtualHost);
         }
@@ -115,10 +115,10 @@ public class BsRelatedQuery extends EsAbstractEntity {
         StringBuilder sb = new StringBuilder();
         sb.append(dm).append(createdBy);
         sb.append(dm).append(createdTime);
+        sb.append(dm).append(queries);
+        sb.append(dm).append(term);
         sb.append(dm).append(updatedBy);
         sb.append(dm).append(updatedTime);
-        sb.append(dm).append(term);
-        sb.append(dm).append(queries);
         sb.append(dm).append(virtualHost);
         if (sb.length() > dm.length()) {
             sb.delete(0, dm.length());
@@ -150,6 +150,26 @@ public class BsRelatedQuery extends EsAbstractEntity {
         this.createdTime = value;
     }
 
+    public String[] getQueries() {
+        checkSpecifiedProperty("queries");
+        return queries;
+    }
+
+    public void setQueries(String[] value) {
+        registerModifiedProperty("queries");
+        this.queries = value;
+    }
+
+    public String getTerm() {
+        checkSpecifiedProperty("term");
+        return convertEmptyToNull(term);
+    }
+
+    public void setTerm(String value) {
+        registerModifiedProperty("term");
+        this.term = value;
+    }
+
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
         return convertEmptyToNull(updatedBy);
@@ -170,26 +190,6 @@ public class BsRelatedQuery extends EsAbstractEntity {
         this.updatedTime = value;
     }
 
-    public String getTerm() {
-        checkSpecifiedProperty("term");
-        return convertEmptyToNull(term);
-    }
-
-    public void setTerm(String value) {
-        registerModifiedProperty("term");
-        this.term = value;
-    }
-
-    public String[] getQueries() {
-        checkSpecifiedProperty("queries");
-        return queries;
-    }
-
-    public void setQueries(String[] value) {
-        registerModifiedProperty("queries");
-        this.queries = value;
-    }
-
     public String getVirtualHost() {
         checkSpecifiedProperty("virtualHost");
         return convertEmptyToNull(virtualHost);
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsThumbnailQueue.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsThumbnailQueue.java
index d1ba635e0e6f23e61690c610794c11a42cb373ff..2ee017a1258444f7aa6fccc7231a85f77d2d6fa5 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsThumbnailQueue.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsThumbnailQueue.java
@@ -43,18 +43,18 @@ public class BsThumbnailQueue extends EsAbstractEntity {
     /** createdTime */
     protected Long createdTime;
 
-    /** target */
-    protected String target;
-
     /** generator */
     protected String generator;
 
-    /** thumbnail_id */
-    protected String thumbnailId;
-
     /** path */
     protected String path;
 
+    /** target */
+    protected String target;
+
+    /** thumbnail_id */
+    protected String thumbnailId;
+
     // [Referrers] *comment only
 
     // ===================================================================================
@@ -82,18 +82,18 @@ public class BsThumbnailQueue extends EsAbstractEntity {
         if (createdTime != null) {
             addFieldToSource(sourceMap, "createdTime", createdTime);
         }
-        if (target != null) {
-            addFieldToSource(sourceMap, "target", target);
-        }
         if (generator != null) {
             addFieldToSource(sourceMap, "generator", generator);
         }
-        if (thumbnailId != null) {
-            addFieldToSource(sourceMap, "thumbnail_id", thumbnailId);
-        }
         if (path != null) {
             addFieldToSource(sourceMap, "path", path);
         }
+        if (target != null) {
+            addFieldToSource(sourceMap, "target", target);
+        }
+        if (thumbnailId != null) {
+            addFieldToSource(sourceMap, "thumbnail_id", thumbnailId);
+        }
         return sourceMap;
     }
 
@@ -109,10 +109,10 @@ public class BsThumbnailQueue extends EsAbstractEntity {
         StringBuilder sb = new StringBuilder();
         sb.append(dm).append(createdBy);
         sb.append(dm).append(createdTime);
-        sb.append(dm).append(target);
         sb.append(dm).append(generator);
-        sb.append(dm).append(thumbnailId);
         sb.append(dm).append(path);
+        sb.append(dm).append(target);
+        sb.append(dm).append(thumbnailId);
         if (sb.length() > dm.length()) {
             sb.delete(0, dm.length());
         }
@@ -143,16 +143,6 @@ public class BsThumbnailQueue extends EsAbstractEntity {
         this.createdTime = value;
     }
 
-    public String getTarget() {
-        checkSpecifiedProperty("target");
-        return convertEmptyToNull(target);
-    }
-
-    public void setTarget(String value) {
-        registerModifiedProperty("target");
-        this.target = value;
-    }
-
     public String getGenerator() {
         checkSpecifiedProperty("generator");
         return convertEmptyToNull(generator);
@@ -163,16 +153,6 @@ public class BsThumbnailQueue extends EsAbstractEntity {
         this.generator = value;
     }
 
-    public String getThumbnailId() {
-        checkSpecifiedProperty("thumbnailId");
-        return convertEmptyToNull(thumbnailId);
-    }
-
-    public void setThumbnailId(String value) {
-        registerModifiedProperty("thumbnailId");
-        this.thumbnailId = value;
-    }
-
     public String getPath() {
         checkSpecifiedProperty("path");
         return convertEmptyToNull(path);
@@ -182,4 +162,24 @@ public class BsThumbnailQueue extends EsAbstractEntity {
         registerModifiedProperty("path");
         this.path = value;
     }
+
+    public String getTarget() {
+        checkSpecifiedProperty("target");
+        return convertEmptyToNull(target);
+    }
+
+    public void setTarget(String value) {
+        registerModifiedProperty("target");
+        this.target = value;
+    }
+
+    public String getThumbnailId() {
+        checkSpecifiedProperty("thumbnailId");
+        return convertEmptyToNull(thumbnailId);
+    }
+
+    public void setThumbnailId(String value) {
+        registerModifiedProperty("thumbnailId");
+        this.thumbnailId = value;
+    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
index e9ae9e539809ae9964c54bb50ed50e0c19069ac8..2b955ab906821835c6ce99e912f57b89e5c6ae5e 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
@@ -73,9 +73,6 @@ public class BsWebConfig extends EsAbstractEntity {
     /** intervalTime */
     protected Integer intervalTime;
 
-    /** timeToLive */
-    protected Integer timeToLive;
-
     /** maxAccessCount */
     protected Long maxAccessCount;
 
@@ -91,6 +88,9 @@ public class BsWebConfig extends EsAbstractEntity {
     /** sortOrder */
     protected Integer sortOrder;
 
+    /** timeToLive */
+    protected Integer timeToLive;
+
     /** updatedBy */
     protected String updatedBy;
 
@@ -163,9 +163,6 @@ public class BsWebConfig extends EsAbstractEntity {
         if (intervalTime != null) {
             addFieldToSource(sourceMap, "intervalTime", intervalTime);
         }
-        if (timeToLive != null) {
-            addFieldToSource(sourceMap, "timeToLive", timeToLive);
-        }
         if (maxAccessCount != null) {
             addFieldToSource(sourceMap, "maxAccessCount", maxAccessCount);
         }
@@ -181,6 +178,9 @@ public class BsWebConfig extends EsAbstractEntity {
         if (sortOrder != null) {
             addFieldToSource(sourceMap, "sortOrder", sortOrder);
         }
+        if (timeToLive != null) {
+            addFieldToSource(sourceMap, "timeToLive", timeToLive);
+        }
         if (updatedBy != null) {
             addFieldToSource(sourceMap, "updatedBy", updatedBy);
         }
@@ -221,12 +221,12 @@ public class BsWebConfig extends EsAbstractEntity {
         sb.append(dm).append(includedDocUrls);
         sb.append(dm).append(includedUrls);
         sb.append(dm).append(intervalTime);
-        sb.append(dm).append(timeToLive);
         sb.append(dm).append(maxAccessCount);
         sb.append(dm).append(name);
         sb.append(dm).append(numOfThread);
         sb.append(dm).append(permissions);
         sb.append(dm).append(sortOrder);
+        sb.append(dm).append(timeToLive);
         sb.append(dm).append(updatedBy);
         sb.append(dm).append(updatedTime);
         sb.append(dm).append(urls);
@@ -362,16 +362,6 @@ public class BsWebConfig extends EsAbstractEntity {
         this.intervalTime = value;
     }
 
-    public Integer getTimeToLive() {
-        checkSpecifiedProperty("timeToLive");
-        return timeToLive;
-    }
-
-    public void setTimeToLive(Integer value) {
-        registerModifiedProperty("timeToLive");
-        this.timeToLive = value;
-    }
-
     public Long getMaxAccessCount() {
         checkSpecifiedProperty("maxAccessCount");
         return maxAccessCount;
@@ -422,6 +412,16 @@ public class BsWebConfig extends EsAbstractEntity {
         this.sortOrder = value;
     }
 
+    public Integer getTimeToLive() {
+        checkSpecifiedProperty("timeToLive");
+        return timeToLive;
+    }
+
+    public void setTimeToLive(Integer value) {
+        registerModifiedProperty("timeToLive");
+        this.timeToLive = value;
+    }
+
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
         return convertEmptyToNull(updatedBy);
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 40ec5f8c36f6253227167a03875f425be19eb352..115963f282a3e8189b0a9417bf224cfe975def13 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
@@ -79,18 +79,18 @@ public class AccessTokenDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((AccessToken) et).getName(), (et, vl) -> ((AccessToken) et).setName(DfTypeUtil.toString(vl)), "name");
-        setupEpg(_epgMap, et -> ((AccessToken) et).getToken(), (et, vl) -> ((AccessToken) et).setToken(DfTypeUtil.toString(vl)), "token");
-        setupEpg(_epgMap, et -> ((AccessToken) et).getPermissions(), (et, vl) -> ((AccessToken) et).setPermissions((String[]) vl),
-                "permissions");
-        setupEpg(_epgMap, et -> ((AccessToken) et).getParameterName(),
-                (et, vl) -> ((AccessToken) et).setParameterName(DfTypeUtil.toString(vl)), "parameterName");
-        setupEpg(_epgMap, et -> ((AccessToken) et).getExpiredTime(), (et, vl) -> ((AccessToken) et).setExpiredTime(DfTypeUtil.toLong(vl)),
-                "expiredTime");
         setupEpg(_epgMap, et -> ((AccessToken) et).getCreatedBy(), (et, vl) -> ((AccessToken) et).setCreatedBy(DfTypeUtil.toString(vl)),
                 "createdBy");
         setupEpg(_epgMap, et -> ((AccessToken) et).getCreatedTime(), (et, vl) -> ((AccessToken) et).setCreatedTime(DfTypeUtil.toLong(vl)),
                 "createdTime");
+        setupEpg(_epgMap, et -> ((AccessToken) et).getExpiredTime(), (et, vl) -> ((AccessToken) et).setExpiredTime(DfTypeUtil.toLong(vl)),
+                "expiredTime");
+        setupEpg(_epgMap, et -> ((AccessToken) et).getName(), (et, vl) -> ((AccessToken) et).setName(DfTypeUtil.toString(vl)), "name");
+        setupEpg(_epgMap, et -> ((AccessToken) et).getParameterName(),
+                (et, vl) -> ((AccessToken) et).setParameterName(DfTypeUtil.toString(vl)), "parameterName");
+        setupEpg(_epgMap, et -> ((AccessToken) et).getPermissions(), (et, vl) -> ((AccessToken) et).setPermissions((String[]) vl),
+                "permissions");
+        setupEpg(_epgMap, et -> ((AccessToken) et).getToken(), (et, vl) -> ((AccessToken) et).setToken(DfTypeUtil.toString(vl)), "token");
         setupEpg(_epgMap, et -> ((AccessToken) et).getUpdatedBy(), (et, vl) -> ((AccessToken) et).setUpdatedBy(DfTypeUtil.toString(vl)),
                 "updatedBy");
         setupEpg(_epgMap, et -> ((AccessToken) et).getUpdatedTime(), (et, vl) -> ((AccessToken) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
@@ -131,51 +131,51 @@ public class AccessTokenDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
-            0, null, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "keyword", 0, 0, null, 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, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
             false, "keyword", 0, 0, null, 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, 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, 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, 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, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
+            false, false, false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
             false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
 
-    public ColumnInfo columnName() {
-        return _columnName;
+    public ColumnInfo columnCreatedBy() {
+        return _columnCreatedBy;
     }
 
-    public ColumnInfo columnToken() {
-        return _columnToken;
+    public ColumnInfo columnCreatedTime() {
+        return _columnCreatedTime;
     }
 
-    public ColumnInfo columnPermissions() {
-        return _columnPermissions;
+    public ColumnInfo columnExpiredTime() {
+        return _columnExpiredTime;
     }
 
-    public ColumnInfo columnParameterName() {
-        return _columnParameterName;
+    public ColumnInfo columnName() {
+        return _columnName;
     }
 
-    public ColumnInfo columnExpiredTime() {
-        return _columnExpiredTime;
+    public ColumnInfo columnParameterName() {
+        return _columnParameterName;
     }
 
-    public ColumnInfo columnCreatedBy() {
-        return _columnCreatedBy;
+    public ColumnInfo columnPermissions() {
+        return _columnPermissions;
     }
 
-    public ColumnInfo columnCreatedTime() {
-        return _columnCreatedTime;
+    public ColumnInfo columnToken() {
+        return _columnToken;
     }
 
     public ColumnInfo columnUpdatedBy() {
@@ -188,13 +188,13 @@ public class AccessTokenDbm extends AbstractDBMeta {
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
-        ls.add(columnName());
-        ls.add(columnToken());
-        ls.add(columnPermissions());
-        ls.add(columnParameterName());
-        ls.add(columnExpiredTime());
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
+        ls.add(columnExpiredTime());
+        ls.add(columnName());
+        ls.add(columnParameterName());
+        ls.add(columnPermissions());
+        ls.add(columnToken());
         ls.add(columnUpdatedBy());
         ls.add(columnUpdatedTime());
         return ls;
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 2437b87b1797b897ba80dd3eb0d99aeaa9502aad..04462ddd193a575f7fcd2479c1fac91bc3cbefd2 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
@@ -84,6 +84,8 @@ public class ElevateWordDbm extends AbstractDBMeta {
                 "createdBy");
         setupEpg(_epgMap, et -> ((ElevateWord) et).getCreatedTime(), (et, vl) -> ((ElevateWord) et).setCreatedTime(DfTypeUtil.toLong(vl)),
                 "createdTime");
+        setupEpg(_epgMap, et -> ((ElevateWord) et).getPermissions(), (et, vl) -> ((ElevateWord) et).setPermissions((String[]) vl),
+                "permissions");
         setupEpg(_epgMap, et -> ((ElevateWord) et).getReading(), (et, vl) -> ((ElevateWord) et).setReading(DfTypeUtil.toString(vl)),
                 "reading");
         setupEpg(_epgMap, et -> ((ElevateWord) et).getSuggestWord(),
@@ -92,8 +94,6 @@ public class ElevateWordDbm extends AbstractDBMeta {
                 (et, vl) -> ((ElevateWord) et).setTargetLabel(DfTypeUtil.toString(vl)), "targetLabel");
         setupEpg(_epgMap, et -> ((ElevateWord) et).getTargetRole(), (et, vl) -> ((ElevateWord) et).setTargetRole(DfTypeUtil.toString(vl)),
                 "targetRole");
-        setupEpg(_epgMap, et -> ((ElevateWord) et).getPermissions(), (et, vl) -> ((ElevateWord) et).setPermissions((String[]) vl),
-                "permissions");
         setupEpg(_epgMap, et -> ((ElevateWord) et).getUpdatedBy(), (et, vl) -> ((ElevateWord) et).setUpdatedBy(DfTypeUtil.toString(vl)),
                 "updatedBy");
         setupEpg(_epgMap, et -> ((ElevateWord) et).getUpdatedTime(), (et, vl) -> ((ElevateWord) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
@@ -140,6 +140,8 @@ public class ElevateWordDbm extends AbstractDBMeta {
             false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
+            false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnReading = cci("reading", "reading", null, null, String.class, "reading", null, false, false, false,
             "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false,
@@ -148,8 +150,6 @@ public class ElevateWordDbm extends AbstractDBMeta {
             false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false,
             false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
             false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
@@ -167,6 +167,10 @@ public class ElevateWordDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
+    public ColumnInfo columnPermissions() {
+        return _columnPermissions;
+    }
+
     public ColumnInfo columnReading() {
         return _columnReading;
     }
@@ -183,10 +187,6 @@ public class ElevateWordDbm extends AbstractDBMeta {
         return _columnTargetRole;
     }
 
-    public ColumnInfo columnPermissions() {
-        return _columnPermissions;
-    }
-
     public ColumnInfo columnUpdatedBy() {
         return _columnUpdatedBy;
     }
@@ -200,11 +200,11 @@ public class ElevateWordDbm extends AbstractDBMeta {
         ls.add(columnBoost());
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
+        ls.add(columnPermissions());
         ls.add(columnReading());
         ls.add(columnSuggestWord());
         ls.add(columnTargetLabel());
         ls.add(columnTargetRole());
-        ls.add(columnPermissions());
         ls.add(columnUpdatedBy());
         ls.add(columnUpdatedTime());
         return ls;
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 fc619e20741ea7d65eb8f83ca4346ccd4caee3f4..a4629032329842855d87e0523692f314cc34ba88 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
@@ -101,8 +101,6 @@ public class FileConfigDbm extends AbstractDBMeta {
                 (et, vl) -> ((FileConfig) et).setIncludedPaths(DfTypeUtil.toString(vl)), "includedPaths");
         setupEpg(_epgMap, et -> ((FileConfig) et).getIntervalTime(),
                 (et, vl) -> ((FileConfig) et).setIntervalTime(DfTypeUtil.toInteger(vl)), "intervalTime");
-        setupEpg(_epgMap, et -> ((FileConfig) et).getTimeToLive(), (et, vl) -> ((FileConfig) et).setTimeToLive(DfTypeUtil.toInteger(vl)),
-                "timeToLive");
         setupEpg(_epgMap, et -> ((FileConfig) et).getMaxAccessCount(),
                 (et, vl) -> ((FileConfig) et).setMaxAccessCount(DfTypeUtil.toLong(vl)), "maxAccessCount");
         setupEpg(_epgMap, et -> ((FileConfig) et).getName(), (et, vl) -> ((FileConfig) et).setName(DfTypeUtil.toString(vl)), "name");
@@ -113,6 +111,8 @@ public class FileConfigDbm extends AbstractDBMeta {
                 "permissions");
         setupEpg(_epgMap, et -> ((FileConfig) et).getSortOrder(), (et, vl) -> ((FileConfig) et).setSortOrder(DfTypeUtil.toInteger(vl)),
                 "sortOrder");
+        setupEpg(_epgMap, et -> ((FileConfig) et).getTimeToLive(), (et, vl) -> ((FileConfig) et).setTimeToLive(DfTypeUtil.toInteger(vl)),
+                "timeToLive");
         setupEpg(_epgMap, et -> ((FileConfig) et).getUpdatedBy(), (et, vl) -> ((FileConfig) et).setUpdatedBy(DfTypeUtil.toString(vl)),
                 "updatedBy");
         setupEpg(_epgMap, et -> ((FileConfig) et).getUpdatedTime(), (et, vl) -> ((FileConfig) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
@@ -179,8 +179,6 @@ public class FileConfigDbm extends AbstractDBMeta {
             null, false, false, false, "keyword", 0, 0, null, 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, 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, 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, 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,
@@ -193,6 +191,8 @@ public class FileConfigDbm extends AbstractDBMeta {
             false, false, false, "keyword", 0, 0, null, 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, 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, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
             false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
@@ -248,10 +248,6 @@ public class FileConfigDbm extends AbstractDBMeta {
         return _columnIntervalTime;
     }
 
-    public ColumnInfo columnTimeToLive() {
-        return _columnTimeToLive;
-    }
-
     public ColumnInfo columnMaxAccessCount() {
         return _columnMaxAccessCount;
     }
@@ -276,6 +272,10 @@ public class FileConfigDbm extends AbstractDBMeta {
         return _columnSortOrder;
     }
 
+    public ColumnInfo columnTimeToLive() {
+        return _columnTimeToLive;
+    }
+
     public ColumnInfo columnUpdatedBy() {
         return _columnUpdatedBy;
     }
@@ -302,13 +302,13 @@ public class FileConfigDbm extends AbstractDBMeta {
         ls.add(columnIncludedDocPaths());
         ls.add(columnIncludedPaths());
         ls.add(columnIntervalTime());
-        ls.add(columnTimeToLive());
         ls.add(columnMaxAccessCount());
         ls.add(columnName());
         ls.add(columnNumOfThread());
         ls.add(columnPaths());
         ls.add(columnPermissions());
         ls.add(columnSortOrder());
+        ls.add(columnTimeToLive());
         ls.add(columnUpdatedBy());
         ls.add(columnUpdatedTime());
         ls.add(columnVirtualHosts());
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 5b2b198af324221213af7350c7e9d8fbb5635b71..93ff4f54115f53df3dd17f693b863013f9b123c1 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
@@ -82,6 +82,8 @@ public class JobLogDbm extends AbstractDBMeta {
         setupEpg(_epgMap, et -> ((JobLog) et).getEndTime(), (et, vl) -> ((JobLog) et).setEndTime(DfTypeUtil.toLong(vl)), "endTime");
         setupEpg(_epgMap, et -> ((JobLog) et).getJobName(), (et, vl) -> ((JobLog) et).setJobName(DfTypeUtil.toString(vl)), "jobName");
         setupEpg(_epgMap, et -> ((JobLog) et).getJobStatus(), (et, vl) -> ((JobLog) et).setJobStatus(DfTypeUtil.toString(vl)), "jobStatus");
+        setupEpg(_epgMap, et -> ((JobLog) et).getLastUpdated(), (et, vl) -> ((JobLog) et).setLastUpdated(DfTypeUtil.toLong(vl)),
+                "lastUpdated");
         setupEpg(_epgMap, et -> ((JobLog) et).getScriptData(), (et, vl) -> ((JobLog) et).setScriptData(DfTypeUtil.toString(vl)),
                 "scriptData");
         setupEpg(_epgMap, et -> ((JobLog) et).getScriptResult(), (et, vl) -> ((JobLog) et).setScriptResult(DfTypeUtil.toString(vl)),
@@ -90,8 +92,6 @@ public class JobLogDbm extends AbstractDBMeta {
                 "scriptType");
         setupEpg(_epgMap, et -> ((JobLog) et).getStartTime(), (et, vl) -> ((JobLog) et).setStartTime(DfTypeUtil.toLong(vl)), "startTime");
         setupEpg(_epgMap, et -> ((JobLog) et).getTarget(), (et, vl) -> ((JobLog) et).setTarget(DfTypeUtil.toString(vl)), "target");
-        setupEpg(_epgMap, et -> ((JobLog) et).getLastUpdated(), (et, vl) -> ((JobLog) et).setLastUpdated(DfTypeUtil.toLong(vl)),
-                "lastUpdated");
     }
 
     @Override
@@ -134,6 +134,8 @@ public class JobLogDbm extends AbstractDBMeta {
             "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnJobStatus = cci("jobStatus", "jobStatus", null, null, String.class, "jobStatus", null, false, false,
             false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false,
             false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnScriptResult = cci("scriptResult", "scriptResult", null, null, String.class, "scriptResult", null,
@@ -144,8 +146,6 @@ public class JobLogDbm extends AbstractDBMeta {
             false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false,
             "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnEndTime() {
         return _columnEndTime;
@@ -159,6 +159,10 @@ public class JobLogDbm extends AbstractDBMeta {
         return _columnJobStatus;
     }
 
+    public ColumnInfo columnLastUpdated() {
+        return _columnLastUpdated;
+    }
+
     public ColumnInfo columnScriptData() {
         return _columnScriptData;
     }
@@ -179,21 +183,17 @@ public class JobLogDbm extends AbstractDBMeta {
         return _columnTarget;
     }
 
-    public ColumnInfo columnLastUpdated() {
-        return _columnLastUpdated;
-    }
-
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnEndTime());
         ls.add(columnJobName());
         ls.add(columnJobStatus());
+        ls.add(columnLastUpdated());
         ls.add(columnScriptData());
         ls.add(columnScriptResult());
         ls.add(columnScriptType());
         ls.add(columnStartTime());
         ls.add(columnTarget());
-        ls.add(columnLastUpdated());
         return ls;
     }
 
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 23f906a7aaad08ba9d908060065e967e2d529e6a..b9c2cfb088ab53229477a8c4630e6b30f9add008 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
@@ -87,12 +87,12 @@ public class KeyMatchDbm extends AbstractDBMeta {
         setupEpg(_epgMap, et -> ((KeyMatch) et).getMaxSize(), (et, vl) -> ((KeyMatch) et).setMaxSize(DfTypeUtil.toInteger(vl)), "maxSize");
         setupEpg(_epgMap, et -> ((KeyMatch) et).getQuery(), (et, vl) -> ((KeyMatch) et).setQuery(DfTypeUtil.toString(vl)), "query");
         setupEpg(_epgMap, et -> ((KeyMatch) et).getTerm(), (et, vl) -> ((KeyMatch) et).setTerm(DfTypeUtil.toString(vl)), "term");
-        setupEpg(_epgMap, et -> ((KeyMatch) et).getVirtualHost(), (et, vl) -> ((KeyMatch) et).setVirtualHost(DfTypeUtil.toString(vl)),
-                "virtualHost");
         setupEpg(_epgMap, et -> ((KeyMatch) et).getUpdatedBy(), (et, vl) -> ((KeyMatch) et).setUpdatedBy(DfTypeUtil.toString(vl)),
                 "updatedBy");
         setupEpg(_epgMap, et -> ((KeyMatch) et).getUpdatedTime(), (et, vl) -> ((KeyMatch) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
                 "updatedTime");
+        setupEpg(_epgMap, et -> ((KeyMatch) et).getVirtualHost(), (et, vl) -> ((KeyMatch) et).setVirtualHost(DfTypeUtil.toString(vl)),
+                "virtualHost");
     }
 
     @Override
@@ -141,12 +141,12 @@ public class KeyMatchDbm extends AbstractDBMeta {
             "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnVirtualHost = cci("virtualHost", "virtualHost", null, null, String.class, "virtualHost", null, false,
-            false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
             false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnVirtualHost = cci("virtualHost", "virtualHost", null, null, String.class, "virtualHost", null, false,
+            false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnBoost() {
         return _columnBoost;
@@ -172,10 +172,6 @@ public class KeyMatchDbm extends AbstractDBMeta {
         return _columnTerm;
     }
 
-    public ColumnInfo columnVirtualHost() {
-        return _columnVirtualHost;
-    }
-
     public ColumnInfo columnUpdatedBy() {
         return _columnUpdatedBy;
     }
@@ -184,6 +180,10 @@ public class KeyMatchDbm extends AbstractDBMeta {
         return _columnUpdatedTime;
     }
 
+    public ColumnInfo columnVirtualHost() {
+        return _columnVirtualHost;
+    }
+
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnBoost());
@@ -192,9 +192,9 @@ public class KeyMatchDbm extends AbstractDBMeta {
         ls.add(columnMaxSize());
         ls.add(columnQuery());
         ls.add(columnTerm());
-        ls.add(columnVirtualHost());
         ls.add(columnUpdatedBy());
         ls.add(columnUpdatedTime());
+        ls.add(columnVirtualHost());
         return ls;
     }
 
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 809f0ed3705485afe16fd1fd19d030ab2732f33e..b0d6333a5cdffec9132b25cf43b489878e3241cf 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
@@ -90,8 +90,6 @@ public class LabelTypeDbm extends AbstractDBMeta {
         setupEpg(_epgMap, et -> ((LabelType) et).getName(), (et, vl) -> ((LabelType) et).setName(DfTypeUtil.toString(vl)), "name");
         setupEpg(_epgMap, et -> ((LabelType) et).getPermissions(), (et, vl) -> ((LabelType) et).setPermissions((String[]) vl),
                 "permissions");
-        setupEpg(_epgMap, et -> ((LabelType) et).getVirtualHost(), (et, vl) -> ((LabelType) et).setVirtualHost(DfTypeUtil.toString(vl)),
-                "virtualHost");
         setupEpg(_epgMap, et -> ((LabelType) et).getSortOrder(), (et, vl) -> ((LabelType) et).setSortOrder(DfTypeUtil.toInteger(vl)),
                 "sortOrder");
         setupEpg(_epgMap, et -> ((LabelType) et).getUpdatedBy(), (et, vl) -> ((LabelType) et).setUpdatedBy(DfTypeUtil.toString(vl)),
@@ -99,6 +97,8 @@ public class LabelTypeDbm extends AbstractDBMeta {
         setupEpg(_epgMap, et -> ((LabelType) et).getUpdatedTime(), (et, vl) -> ((LabelType) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
                 "updatedTime");
         setupEpg(_epgMap, et -> ((LabelType) et).getValue(), (et, vl) -> ((LabelType) et).setValue(DfTypeUtil.toString(vl)), "value");
+        setupEpg(_epgMap, et -> ((LabelType) et).getVirtualHost(), (et, vl) -> ((LabelType) et).setVirtualHost(DfTypeUtil.toString(vl)),
+                "virtualHost");
     }
 
     @Override
@@ -147,8 +147,6 @@ public class LabelTypeDbm extends AbstractDBMeta {
             0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
             false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnVirtualHost = cci("virtualHost", "virtualHost", null, null, String.class, "virtualHost", null, false,
-            false, false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
@@ -157,6 +155,8 @@ public class LabelTypeDbm extends AbstractDBMeta {
             false, false, "Long", 0, 0, null, 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, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnVirtualHost = cci("virtualHost", "virtualHost", null, null, String.class, "virtualHost", null, false,
+            false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedBy() {
         return _columnCreatedBy;
@@ -182,10 +182,6 @@ public class LabelTypeDbm extends AbstractDBMeta {
         return _columnPermissions;
     }
 
-    public ColumnInfo columnVirtualHost() {
-        return _columnVirtualHost;
-    }
-
     public ColumnInfo columnSortOrder() {
         return _columnSortOrder;
     }
@@ -202,6 +198,10 @@ public class LabelTypeDbm extends AbstractDBMeta {
         return _columnValue;
     }
 
+    public ColumnInfo columnVirtualHost() {
+        return _columnVirtualHost;
+    }
+
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCreatedBy());
@@ -210,11 +210,11 @@ public class LabelTypeDbm extends AbstractDBMeta {
         ls.add(columnIncludedPaths());
         ls.add(columnName());
         ls.add(columnPermissions());
-        ls.add(columnVirtualHost());
         ls.add(columnSortOrder());
         ls.add(columnUpdatedBy());
         ls.add(columnUpdatedTime());
         ls.add(columnValue());
+        ls.add(columnVirtualHost());
         return ls;
     }
 
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 97386c021a9aff2bb22ddd958d5cbc34347a966f..99deefa14465becdd3bc1791598e231c2bf03cb7 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
@@ -90,12 +90,12 @@ public class PathMappingDbm extends AbstractDBMeta {
                 (et, vl) -> ((PathMapping) et).setReplacement(DfTypeUtil.toString(vl)), "replacement");
         setupEpg(_epgMap, et -> ((PathMapping) et).getSortOrder(), (et, vl) -> ((PathMapping) et).setSortOrder(DfTypeUtil.toInteger(vl)),
                 "sortOrder");
-        setupEpg(_epgMap, et -> ((PathMapping) et).getUserAgent(), (et, vl) -> ((PathMapping) et).setUserAgent(DfTypeUtil.toString(vl)),
-                "userAgent");
         setupEpg(_epgMap, et -> ((PathMapping) et).getUpdatedBy(), (et, vl) -> ((PathMapping) et).setUpdatedBy(DfTypeUtil.toString(vl)),
                 "updatedBy");
         setupEpg(_epgMap, et -> ((PathMapping) et).getUpdatedTime(), (et, vl) -> ((PathMapping) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
                 "updatedTime");
+        setupEpg(_epgMap, et -> ((PathMapping) et).getUserAgent(), (et, vl) -> ((PathMapping) et).setUserAgent(DfTypeUtil.toString(vl)),
+                "userAgent");
     }
 
     @Override
@@ -144,12 +144,12 @@ public class PathMappingDbm extends AbstractDBMeta {
             false, false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false,
-            false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
             false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false,
+            false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedBy() {
         return _columnCreatedBy;
@@ -175,10 +175,6 @@ public class PathMappingDbm extends AbstractDBMeta {
         return _columnSortOrder;
     }
 
-    public ColumnInfo columnUserAgent() {
-        return _columnUserAgent;
-    }
-
     public ColumnInfo columnUpdatedBy() {
         return _columnUpdatedBy;
     }
@@ -187,6 +183,10 @@ public class PathMappingDbm extends AbstractDBMeta {
         return _columnUpdatedTime;
     }
 
+    public ColumnInfo columnUserAgent() {
+        return _columnUserAgent;
+    }
+
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCreatedBy());
@@ -195,9 +195,9 @@ public class PathMappingDbm extends AbstractDBMeta {
         ls.add(columnRegex());
         ls.add(columnReplacement());
         ls.add(columnSortOrder());
-        ls.add(columnUserAgent());
         ls.add(columnUpdatedBy());
         ls.add(columnUpdatedTime());
+        ls.add(columnUserAgent());
         return ls;
     }
 
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java
index 5080eb3a6e824d494d7352471eeea3df8a21dd9f..77aed43af5d7954f88a652ea8a9c28aaad3bafdb 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java
@@ -79,19 +79,19 @@ public class RelatedContentDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
+        setupEpg(_epgMap, et -> ((RelatedContent) et).getContent(), (et, vl) -> ((RelatedContent) et).setContent(DfTypeUtil.toString(vl)),
+                "content");
         setupEpg(_epgMap, et -> ((RelatedContent) et).getCreatedBy(),
                 (et, vl) -> ((RelatedContent) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
         setupEpg(_epgMap, et -> ((RelatedContent) et).getCreatedTime(),
                 (et, vl) -> ((RelatedContent) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+        setupEpg(_epgMap, et -> ((RelatedContent) et).getSortOrder(),
+                (et, vl) -> ((RelatedContent) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder");
+        setupEpg(_epgMap, et -> ((RelatedContent) et).getTerm(), (et, vl) -> ((RelatedContent) et).setTerm(DfTypeUtil.toString(vl)), "term");
         setupEpg(_epgMap, et -> ((RelatedContent) et).getUpdatedBy(),
                 (et, vl) -> ((RelatedContent) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
         setupEpg(_epgMap, et -> ((RelatedContent) et).getUpdatedTime(),
                 (et, vl) -> ((RelatedContent) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
-        setupEpg(_epgMap, et -> ((RelatedContent) et).getTerm(), (et, vl) -> ((RelatedContent) et).setTerm(DfTypeUtil.toString(vl)), "term");
-        setupEpg(_epgMap, et -> ((RelatedContent) et).getContent(), (et, vl) -> ((RelatedContent) et).setContent(DfTypeUtil.toString(vl)),
-                "content");
-        setupEpg(_epgMap, et -> ((RelatedContent) et).getSortOrder(),
-                (et, vl) -> ((RelatedContent) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder");
         setupEpg(_epgMap, et -> ((RelatedContent) et).getVirtualHost(),
                 (et, vl) -> ((RelatedContent) et).setVirtualHost(DfTypeUtil.toString(vl)), "virtualHost");
     }
@@ -130,23 +130,27 @@ public class RelatedContentDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
+    protected final ColumnInfo _columnContent = cci("content", "content", null, null, String.class, "content", null, false, false, false,
+            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
             false, "keyword", 0, 0, null, 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, 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, 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, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
             false, "keyword", 0, 0, null, 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, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnContent = cci("content", "content", null, null, String.class, "content", null, false, false, false,
-            "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnVirtualHost = cci("virtualHost", "virtualHost", null, null, String.class, "virtualHost", null, false,
             false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
 
+    public ColumnInfo columnContent() {
+        return _columnContent;
+    }
+
     public ColumnInfo columnCreatedBy() {
         return _columnCreatedBy;
     }
@@ -155,24 +159,20 @@ public class RelatedContentDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnUpdatedBy() {
-        return _columnUpdatedBy;
-    }
-
-    public ColumnInfo columnUpdatedTime() {
-        return _columnUpdatedTime;
+    public ColumnInfo columnSortOrder() {
+        return _columnSortOrder;
     }
 
     public ColumnInfo columnTerm() {
         return _columnTerm;
     }
 
-    public ColumnInfo columnContent() {
-        return _columnContent;
+    public ColumnInfo columnUpdatedBy() {
+        return _columnUpdatedBy;
     }
 
-    public ColumnInfo columnSortOrder() {
-        return _columnSortOrder;
+    public ColumnInfo columnUpdatedTime() {
+        return _columnUpdatedTime;
     }
 
     public ColumnInfo columnVirtualHost() {
@@ -181,13 +181,13 @@ public class RelatedContentDbm extends AbstractDBMeta {
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
+        ls.add(columnContent());
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
+        ls.add(columnSortOrder());
+        ls.add(columnTerm());
         ls.add(columnUpdatedBy());
         ls.add(columnUpdatedTime());
-        ls.add(columnTerm());
-        ls.add(columnContent());
-        ls.add(columnSortOrder());
         ls.add(columnVirtualHost());
         return ls;
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java
index fd0be01de1c143056e920b1c100502dd6cafb76d..01c79022ec305e9829040bb94fa7ffeb0015093c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java
@@ -83,12 +83,12 @@ public class RelatedQueryDbm extends AbstractDBMeta {
                 "createdBy");
         setupEpg(_epgMap, et -> ((RelatedQuery) et).getCreatedTime(),
                 (et, vl) -> ((RelatedQuery) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+        setupEpg(_epgMap, et -> ((RelatedQuery) et).getQueries(), (et, vl) -> ((RelatedQuery) et).setQueries((String[]) vl), "queries");
+        setupEpg(_epgMap, et -> ((RelatedQuery) et).getTerm(), (et, vl) -> ((RelatedQuery) et).setTerm(DfTypeUtil.toString(vl)), "term");
         setupEpg(_epgMap, et -> ((RelatedQuery) et).getUpdatedBy(), (et, vl) -> ((RelatedQuery) et).setUpdatedBy(DfTypeUtil.toString(vl)),
                 "updatedBy");
         setupEpg(_epgMap, et -> ((RelatedQuery) et).getUpdatedTime(),
                 (et, vl) -> ((RelatedQuery) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
-        setupEpg(_epgMap, et -> ((RelatedQuery) et).getTerm(), (et, vl) -> ((RelatedQuery) et).setTerm(DfTypeUtil.toString(vl)), "term");
-        setupEpg(_epgMap, et -> ((RelatedQuery) et).getQueries(), (et, vl) -> ((RelatedQuery) et).setQueries((String[]) vl), "queries");
         setupEpg(_epgMap, et -> ((RelatedQuery) et).getVirtualHost(),
                 (et, vl) -> ((RelatedQuery) et).setVirtualHost(DfTypeUtil.toString(vl)), "virtualHost");
     }
@@ -131,14 +131,14 @@ public class RelatedQueryDbm extends AbstractDBMeta {
             false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnQueries = cci("queries", "queries", null, null, String[].class, "queries", null, false, false, false,
+            "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
             false, "keyword", 0, 0, null, 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, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnQueries = cci("queries", "queries", null, null, String[].class, "queries", null, false, false, false,
-            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnVirtualHost = cci("virtualHost", "virtualHost", null, null, String.class, "virtualHost", null, false,
             false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
 
@@ -150,20 +150,20 @@ public class RelatedQueryDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnUpdatedBy() {
-        return _columnUpdatedBy;
-    }
-
-    public ColumnInfo columnUpdatedTime() {
-        return _columnUpdatedTime;
+    public ColumnInfo columnQueries() {
+        return _columnQueries;
     }
 
     public ColumnInfo columnTerm() {
         return _columnTerm;
     }
 
-    public ColumnInfo columnQueries() {
-        return _columnQueries;
+    public ColumnInfo columnUpdatedBy() {
+        return _columnUpdatedBy;
+    }
+
+    public ColumnInfo columnUpdatedTime() {
+        return _columnUpdatedTime;
     }
 
     public ColumnInfo columnVirtualHost() {
@@ -174,10 +174,10 @@ public class RelatedQueryDbm extends AbstractDBMeta {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
+        ls.add(columnQueries());
+        ls.add(columnTerm());
         ls.add(columnUpdatedBy());
         ls.add(columnUpdatedTime());
-        ls.add(columnTerm());
-        ls.add(columnQueries());
         ls.add(columnVirtualHost());
         return ls;
     }
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 556dccba506551a813e7bbd519e84b15b2c2bb84..9299d87e4c7f40d1b2e72f5f50c053aa19807ad8 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
@@ -83,13 +83,13 @@ public class ThumbnailQueueDbm extends AbstractDBMeta {
                 (et, vl) -> ((ThumbnailQueue) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
         setupEpg(_epgMap, et -> ((ThumbnailQueue) et).getCreatedTime(),
                 (et, vl) -> ((ThumbnailQueue) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
-        setupEpg(_epgMap, et -> ((ThumbnailQueue) et).getTarget(), (et, vl) -> ((ThumbnailQueue) et).setTarget(DfTypeUtil.toString(vl)),
-                "target");
         setupEpg(_epgMap, et -> ((ThumbnailQueue) et).getGenerator(),
                 (et, vl) -> ((ThumbnailQueue) et).setGenerator(DfTypeUtil.toString(vl)), "generator");
+        setupEpg(_epgMap, et -> ((ThumbnailQueue) et).getPath(), (et, vl) -> ((ThumbnailQueue) et).setPath(DfTypeUtil.toString(vl)), "path");
+        setupEpg(_epgMap, et -> ((ThumbnailQueue) et).getTarget(), (et, vl) -> ((ThumbnailQueue) et).setTarget(DfTypeUtil.toString(vl)),
+                "target");
         setupEpg(_epgMap, et -> ((ThumbnailQueue) et).getThumbnailId(),
                 (et, vl) -> ((ThumbnailQueue) et).setThumbnailId(DfTypeUtil.toString(vl)), "thumbnailId");
-        setupEpg(_epgMap, et -> ((ThumbnailQueue) et).getPath(), (et, vl) -> ((ThumbnailQueue) et).setPath(DfTypeUtil.toString(vl)), "path");
     }
 
     @Override
@@ -130,14 +130,14 @@ public class ThumbnailQueueDbm extends AbstractDBMeta {
             false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false,
-            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnGenerator = cci("generator", "generator", null, null, String.class, "generator", null, false, false,
             false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnThumbnailId = cci("thumbnail_id", "thumbnail_id", null, null, String.class, "thumbnailId", null,
-            false, false, false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false,
+            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnThumbnailId = cci("thumbnail_id", "thumbnail_id", null, null, String.class, "thumbnailId", null,
+            false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedBy() {
         return _columnCreatedBy;
@@ -147,30 +147,30 @@ public class ThumbnailQueueDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnTarget() {
-        return _columnTarget;
-    }
-
     public ColumnInfo columnGenerator() {
         return _columnGenerator;
     }
 
-    public ColumnInfo columnThumbnailId() {
-        return _columnThumbnailId;
-    }
-
     public ColumnInfo columnPath() {
         return _columnPath;
     }
 
+    public ColumnInfo columnTarget() {
+        return _columnTarget;
+    }
+
+    public ColumnInfo columnThumbnailId() {
+        return _columnThumbnailId;
+    }
+
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
-        ls.add(columnTarget());
         ls.add(columnGenerator());
-        ls.add(columnThumbnailId());
         ls.add(columnPath());
+        ls.add(columnTarget());
+        ls.add(columnThumbnailId());
         return ls;
     }
 
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 9525302aa77ec1a49f19decc9c5c6fc4c5796b78..05dffa0229568182347c2e5809cdad61b8c3c559 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
@@ -101,8 +101,6 @@ public class WebConfigDbm extends AbstractDBMeta {
                 "includedUrls");
         setupEpg(_epgMap, et -> ((WebConfig) et).getIntervalTime(), (et, vl) -> ((WebConfig) et).setIntervalTime(DfTypeUtil.toInteger(vl)),
                 "intervalTime");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getTimeToLive(), (et, vl) -> ((WebConfig) et).setTimeToLive(DfTypeUtil.toInteger(vl)),
-                "timeToLive");
         setupEpg(_epgMap, et -> ((WebConfig) et).getMaxAccessCount(),
                 (et, vl) -> ((WebConfig) et).setMaxAccessCount(DfTypeUtil.toLong(vl)), "maxAccessCount");
         setupEpg(_epgMap, et -> ((WebConfig) et).getName(), (et, vl) -> ((WebConfig) et).setName(DfTypeUtil.toString(vl)), "name");
@@ -112,6 +110,8 @@ public class WebConfigDbm extends AbstractDBMeta {
                 "permissions");
         setupEpg(_epgMap, et -> ((WebConfig) et).getSortOrder(), (et, vl) -> ((WebConfig) et).setSortOrder(DfTypeUtil.toInteger(vl)),
                 "sortOrder");
+        setupEpg(_epgMap, et -> ((WebConfig) et).getTimeToLive(), (et, vl) -> ((WebConfig) et).setTimeToLive(DfTypeUtil.toInteger(vl)),
+                "timeToLive");
         setupEpg(_epgMap, et -> ((WebConfig) et).getUpdatedBy(), (et, vl) -> ((WebConfig) et).setUpdatedBy(DfTypeUtil.toString(vl)),
                 "updatedBy");
         setupEpg(_epgMap, et -> ((WebConfig) et).getUpdatedTime(), (et, vl) -> ((WebConfig) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
@@ -181,8 +181,6 @@ public class WebConfigDbm extends AbstractDBMeta {
             false, false, false, "keyword", 0, 0, null, 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, 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, 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, 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,
@@ -193,6 +191,8 @@ public class WebConfigDbm extends AbstractDBMeta {
             false, false, false, "keyword", 0, 0, null, 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, 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, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
             false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
@@ -252,10 +252,6 @@ public class WebConfigDbm extends AbstractDBMeta {
         return _columnIntervalTime;
     }
 
-    public ColumnInfo columnTimeToLive() {
-        return _columnTimeToLive;
-    }
-
     public ColumnInfo columnMaxAccessCount() {
         return _columnMaxAccessCount;
     }
@@ -276,6 +272,10 @@ public class WebConfigDbm extends AbstractDBMeta {
         return _columnSortOrder;
     }
 
+    public ColumnInfo columnTimeToLive() {
+        return _columnTimeToLive;
+    }
+
     public ColumnInfo columnUpdatedBy() {
         return _columnUpdatedBy;
     }
@@ -310,12 +310,12 @@ public class WebConfigDbm extends AbstractDBMeta {
         ls.add(columnIncludedDocUrls());
         ls.add(columnIncludedUrls());
         ls.add(columnIntervalTime());
-        ls.add(columnTimeToLive());
         ls.add(columnMaxAccessCount());
         ls.add(columnName());
         ls.add(columnNumOfThread());
         ls.add(columnPermissions());
         ls.add(columnSortOrder());
+        ls.add(columnTimeToLive());
         ls.add(columnUpdatedBy());
         ls.add(columnUpdatedTime());
         ls.add(columnUrls());
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
index a9effe172a951742c2f2b63eefaa2e895296438a..46e742e537fa036c7360b6cf473a8807b3faec91 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
@@ -176,32 +176,32 @@ public class BsAccessTokenCB extends EsAbstractConditionBean {
             doColumn("_id");
         }
 
-        public void columnName() {
-            doColumn("name");
+        public void columnCreatedBy() {
+            doColumn("createdBy");
         }
 
-        public void columnToken() {
-            doColumn("token");
+        public void columnCreatedTime() {
+            doColumn("createdTime");
         }
 
-        public void columnPermissions() {
-            doColumn("permissions");
+        public void columnExpiredTime() {
+            doColumn("expiredTime");
         }
 
-        public void columnParameterName() {
-            doColumn("parameter_name");
+        public void columnName() {
+            doColumn("name");
         }
 
-        public void columnExpiredTime() {
-            doColumn("expiredTime");
+        public void columnParameterName() {
+            doColumn("parameter_name");
         }
 
-        public void columnCreatedBy() {
-            doColumn("createdBy");
+        public void columnPermissions() {
+            doColumn("permissions");
         }
 
-        public void columnCreatedTime() {
-            doColumn("createdTime");
+        public void columnToken() {
+            doColumn("token");
         }
 
         public void columnUpdatedBy() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
index f27d1d6c7b7434db467b3770bf1a1a157d8dcaf3..edfe2d911c656d0ca6864bfed96d7ca3f84ba462 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
@@ -188,6 +188,10 @@ public class BsElevateWordCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
+        public void columnPermissions() {
+            doColumn("permissions");
+        }
+
         public void columnReading() {
             doColumn("reading");
         }
@@ -204,10 +208,6 @@ public class BsElevateWordCB extends EsAbstractConditionBean {
             doColumn("targetRole");
         }
 
-        public void columnPermissions() {
-            doColumn("permissions");
-        }
-
         public void columnUpdatedBy() {
             doColumn("updatedBy");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
index d0caa67c3c6c9acf33b8e16463c0fa29d4509975..2e0e3878fe3da1cbc4b23d9527d7d8fd94f760fa 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
@@ -224,10 +224,6 @@ public class BsFileConfigCB extends EsAbstractConditionBean {
             doColumn("intervalTime");
         }
 
-        public void columnTimeToLive() {
-            doColumn("timeToLive");
-        }
-
         public void columnMaxAccessCount() {
             doColumn("maxAccessCount");
         }
@@ -252,6 +248,10 @@ public class BsFileConfigCB extends EsAbstractConditionBean {
             doColumn("sortOrder");
         }
 
+        public void columnTimeToLive() {
+            doColumn("timeToLive");
+        }
+
         public void columnUpdatedBy() {
             doColumn("updatedBy");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
index 70b43a5eec83f60bcd47f3711b538ce800a50260..a0ab225cb0edba2fb095de83dced89cad20ee203 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
@@ -188,6 +188,10 @@ public class BsJobLogCB extends EsAbstractConditionBean {
             doColumn("jobStatus");
         }
 
+        public void columnLastUpdated() {
+            doColumn("lastUpdated");
+        }
+
         public void columnScriptData() {
             doColumn("scriptData");
         }
@@ -207,9 +211,5 @@ public class BsJobLogCB extends EsAbstractConditionBean {
         public void columnTarget() {
             doColumn("target");
         }
-
-        public void columnLastUpdated() {
-            doColumn("lastUpdated");
-        }
     }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
index 70fb02d9baaee08c92c77445140c4d8628068a3d..b4897f742b450610523dd57c256f53e471608e15 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
@@ -200,10 +200,6 @@ public class BsKeyMatchCB extends EsAbstractConditionBean {
             doColumn("term");
         }
 
-        public void columnVirtualHost() {
-            doColumn("virtualHost");
-        }
-
         public void columnUpdatedBy() {
             doColumn("updatedBy");
         }
@@ -211,5 +207,9 @@ public class BsKeyMatchCB extends EsAbstractConditionBean {
         public void columnUpdatedTime() {
             doColumn("updatedTime");
         }
+
+        public void columnVirtualHost() {
+            doColumn("virtualHost");
+        }
     }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
index d2a1cdae978bae5fa066e0ecd080314cbfef8ccc..0f424146eb35b242fe1079281de844086202106b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
@@ -200,10 +200,6 @@ public class BsLabelTypeCB extends EsAbstractConditionBean {
             doColumn("permissions");
         }
 
-        public void columnVirtualHost() {
-            doColumn("virtualHost");
-        }
-
         public void columnSortOrder() {
             doColumn("sortOrder");
         }
@@ -219,5 +215,9 @@ public class BsLabelTypeCB extends EsAbstractConditionBean {
         public void columnValue() {
             doColumn("value");
         }
+
+        public void columnVirtualHost() {
+            doColumn("virtualHost");
+        }
     }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
index 3ead2821513facc87fef4f6525137227da48be77..0dd4b0fb11c5468cb9b23e288415bab4aa0bd5cc 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
@@ -200,10 +200,6 @@ public class BsPathMappingCB extends EsAbstractConditionBean {
             doColumn("sortOrder");
         }
 
-        public void columnUserAgent() {
-            doColumn("userAgent");
-        }
-
         public void columnUpdatedBy() {
             doColumn("updatedBy");
         }
@@ -211,5 +207,9 @@ public class BsPathMappingCB extends EsAbstractConditionBean {
         public void columnUpdatedTime() {
             doColumn("updatedTime");
         }
+
+        public void columnUserAgent() {
+            doColumn("userAgent");
+        }
     }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
index 53a1ed11d071c106ebc7874cd2de319a9e145e41..a3be2e3b0e913e78ed6233889dc84a6dfaa070b4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
@@ -176,6 +176,10 @@ public class BsRelatedContentCB extends EsAbstractConditionBean {
             doColumn("_id");
         }
 
+        public void columnContent() {
+            doColumn("content");
+        }
+
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
@@ -184,24 +188,20 @@ public class BsRelatedContentCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
-        public void columnUpdatedBy() {
-            doColumn("updatedBy");
-        }
-
-        public void columnUpdatedTime() {
-            doColumn("updatedTime");
+        public void columnSortOrder() {
+            doColumn("sortOrder");
         }
 
         public void columnTerm() {
             doColumn("term");
         }
 
-        public void columnContent() {
-            doColumn("content");
+        public void columnUpdatedBy() {
+            doColumn("updatedBy");
         }
 
-        public void columnSortOrder() {
-            doColumn("sortOrder");
+        public void columnUpdatedTime() {
+            doColumn("updatedTime");
         }
 
         public void columnVirtualHost() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
index 081224155ae0c3bc19d1c521a05e8e9327a7c8db..1d0a9f254cfaee4b0625605944e79b1bb2fccf79 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
@@ -184,20 +184,20 @@ public class BsRelatedQueryCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
-        public void columnUpdatedBy() {
-            doColumn("updatedBy");
-        }
-
-        public void columnUpdatedTime() {
-            doColumn("updatedTime");
+        public void columnQueries() {
+            doColumn("queries");
         }
 
         public void columnTerm() {
             doColumn("term");
         }
 
-        public void columnQueries() {
-            doColumn("queries");
+        public void columnUpdatedBy() {
+            doColumn("updatedBy");
+        }
+
+        public void columnUpdatedTime() {
+            doColumn("updatedTime");
         }
 
         public void columnVirtualHost() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
index 3b2c3875cb9d2bddbfbc65da42b48c439af4506e..7f9fe8e79bea2aedb84df6e5e72f75e92215542a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
@@ -184,20 +184,20 @@ public class BsThumbnailQueueCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
-        public void columnTarget() {
-            doColumn("target");
-        }
-
         public void columnGenerator() {
             doColumn("generator");
         }
 
-        public void columnThumbnailId() {
-            doColumn("thumbnail_id");
-        }
-
         public void columnPath() {
             doColumn("path");
         }
+
+        public void columnTarget() {
+            doColumn("target");
+        }
+
+        public void columnThumbnailId() {
+            doColumn("thumbnail_id");
+        }
     }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
index 119d1fac891a83d0b78c6b8369069d901e3c39a3..d03cdab4eb52cdc94f403b936527851a3f43adeb 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
@@ -224,10 +224,6 @@ public class BsWebConfigCB extends EsAbstractConditionBean {
             doColumn("intervalTime");
         }
 
-        public void columnTimeToLive() {
-            doColumn("timeToLive");
-        }
-
         public void columnMaxAccessCount() {
             doColumn("maxAccessCount");
         }
@@ -248,6 +244,10 @@ public class BsWebConfigCB extends EsAbstractConditionBean {
             doColumn("sortOrder");
         }
 
+        public void columnTimeToLive() {
+            doColumn("timeToLive");
+        }
+
         public void columnUpdatedBy() {
             doColumn("updatedBy");
         }
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 4be8c4312645500983fecad776941a44b5882a93..d5daeaabd8532dc9d7596821097e1496372cad28 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -106,20 +106,21 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setName_Terms() {
-        setName_Terms(null);
+    public void setCreatedBy_Terms() {
+        setCreatedBy_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setName_Terms("name", opLambda, null);
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setName_Terms("name", opLambda, aggsLambda);
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "name");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -130,22 +131,22 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setName_SignificantTerms() {
-        setName_SignificantTerms(null);
+    public void setCreatedBy_SignificantTerms() {
+        setCreatedBy_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setName_SignificantTerms("name", opLambda, null);
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setName_SignificantTerms("name", opLambda, aggsLambda);
+        setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -156,21 +157,21 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setName_IpRange() {
-        setName_IpRange(null);
+    public void setCreatedBy_IpRange() {
+        setCreatedBy_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setName_IpRange("name", opLambda, null);
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setName_IpRange("name", opLambda, aggsLambda);
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -181,51 +182,51 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setName_Count() {
-        setName_Count(null);
+    public void setCreatedBy_Count() {
+        setCreatedBy_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setName_Count("name", opLambda);
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "name");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Cardinality() {
-        setName_Cardinality(null);
+    public void setCreatedBy_Cardinality() {
+        setCreatedBy_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setName_Cardinality("name", opLambda);
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Missing() {
-        setName_Missing(null);
+    public void setCreatedBy_Missing() {
+        setCreatedBy_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setName_Missing("name", opLambda, null);
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setName_Missing("name", opLambda, aggsLambda);
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "name");
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -236,151 +237,141 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setToken_Terms() {
-        setToken_Terms(null);
-    }
-
-    public void setToken_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setToken_Terms("token", opLambda, null);
+    public void setCreatedTime_Avg() {
+        setCreatedTime_Avg(null);
     }
 
-    public void setToken_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setToken_Terms("token", opLambda, aggsLambda);
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setToken_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "token");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            AccessTokenCA ca = new AccessTokenCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setToken_SignificantTerms() {
-        setToken_SignificantTerms(null);
     }
 
-    public void setToken_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setToken_SignificantTerms("token", opLambda, null);
+    public void setCreatedTime_Max() {
+        setCreatedTime_Max(null);
     }
 
-    public void setToken_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setToken_SignificantTerms("token", opLambda, aggsLambda);
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setToken_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsAccessTokenCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "token");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            AccessTokenCA ca = new AccessTokenCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setToken_IpRange() {
-        setToken_IpRange(null);
+    public void setCreatedTime_Min() {
+        setCreatedTime_Min(null);
     }
 
-    public void setToken_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setToken_IpRange("token", opLambda, null);
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setToken_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setToken_IpRange("token", opLambda, aggsLambda);
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setToken_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsAccessTokenCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "token");
+    public void setCreatedTime_Sum() {
+        setCreatedTime_Sum(null);
+    }
+
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        setCreatedTime_Sum("createdTime", opLambda);
+    }
+
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            AccessTokenCA ca = new AccessTokenCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setToken_Count() {
-        setToken_Count(null);
+    public void setCreatedTime_ExtendedStats() {
+        setCreatedTime_ExtendedStats(null);
     }
 
-    public void setToken_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setToken_Count("token", opLambda);
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setToken_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "token");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setToken_Cardinality() {
-        setToken_Cardinality(null);
+    public void setCreatedTime_Stats() {
+        setCreatedTime_Stats(null);
     }
 
-    public void setToken_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setToken_Cardinality("token", opLambda);
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setToken_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "token");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setToken_Missing() {
-        setToken_Missing(null);
+    public void setCreatedTime_Percentiles() {
+        setCreatedTime_Percentiles(null);
     }
 
-    public void setToken_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setToken_Missing("token", opLambda, null);
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setToken_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setToken_Missing("token", opLambda, aggsLambda);
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setToken_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "token");
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
+    }
+
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
+    }
+
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            AccessTokenCA ca = new AccessTokenCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setPermissions_Terms() {
-        setPermissions_Terms(null);
+    public void setCreatedTime_Histogram() {
+        setCreatedTime_Histogram(null);
     }
 
-    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setPermissions_Terms("permissions", opLambda, null);
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
+        setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setPermissions_Terms("permissions", opLambda, aggsLambda);
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setPermissions_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "permissions");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -391,22 +382,21 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPermissions_SignificantTerms() {
-        setPermissions_SignificantTerms(null);
+    public void setCreatedTime_Range() {
+        setCreatedTime_Range(null);
     }
 
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setPermissions_SignificantTerms("permissions", opLambda, null);
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
+        setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setPermissions_SignificantTerms("permissions", opLambda, aggsLambda);
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "permissions");
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -417,207 +407,51 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPermissions_IpRange() {
-        setPermissions_IpRange(null);
+    public void setCreatedTime_Count() {
+        setCreatedTime_Count(null);
     }
 
-    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setPermissions_IpRange("permissions", opLambda, null);
-    }
-
-    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setPermissions_IpRange("permissions", opLambda, aggsLambda);
-    }
-
-    public void setPermissions_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsAccessTokenCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "permissions");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            AccessTokenCA ca = new AccessTokenCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setPermissions_Count() {
-        setPermissions_Count(null);
-    }
-
-    public void setPermissions_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setPermissions_Count("permissions", opLambda);
-    }
-
-    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "permissions");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_Cardinality() {
-        setPermissions_Cardinality(null);
-    }
-
-    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setPermissions_Cardinality("permissions", opLambda);
-    }
-
-    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "permissions");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_Missing() {
-        setPermissions_Missing(null);
-    }
-
-    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setPermissions_Missing("permissions", opLambda, null);
-    }
-
-    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setPermissions_Missing("permissions", opLambda, aggsLambda);
-    }
-
-    public void setPermissions_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "permissions");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            AccessTokenCA ca = new AccessTokenCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setParameterName_Terms() {
-        setParameterName_Terms(null);
-    }
-
-    public void setParameterName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setParameterName_Terms("parameter_name", opLambda, null);
-    }
-
-    public void setParameterName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setParameterName_Terms("parameter_name", opLambda, aggsLambda);
-    }
-
-    public void setParameterName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsAccessTokenCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "parameter_name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            AccessTokenCA ca = new AccessTokenCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setParameterName_SignificantTerms() {
-        setParameterName_SignificantTerms(null);
-    }
-
-    public void setParameterName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setParameterName_SignificantTerms("parameter_name", opLambda, null);
-    }
-
-    public void setParameterName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setParameterName_SignificantTerms("parameter_name", opLambda, aggsLambda);
-    }
-
-    public void setParameterName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsAccessTokenCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "parameter_name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            AccessTokenCA ca = new AccessTokenCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setParameterName_IpRange() {
-        setParameterName_IpRange(null);
-    }
-
-    public void setParameterName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setParameterName_IpRange("parameter_name", opLambda, null);
-    }
-
-    public void setParameterName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setParameterName_IpRange("parameter_name", opLambda, aggsLambda);
-    }
-
-    public void setParameterName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsAccessTokenCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "parameter_name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            AccessTokenCA ca = new AccessTokenCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setParameterName_Count() {
-        setParameterName_Count(null);
-    }
-
-    public void setParameterName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setParameterName_Count("parameter_name", opLambda);
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setParameterName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "parameter_name");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_Cardinality() {
-        setParameterName_Cardinality(null);
+    public void setCreatedTime_Cardinality() {
+        setCreatedTime_Cardinality(null);
     }
 
-    public void setParameterName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setParameterName_Cardinality("parameter_name", opLambda);
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setParameterName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "parameter_name");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_Missing() {
-        setParameterName_Missing(null);
+    public void setCreatedTime_Missing() {
+        setCreatedTime_Missing(null);
     }
 
-    public void setParameterName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setParameterName_Missing("parameter_name", opLambda, null);
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setParameterName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setParameterName_Missing("parameter_name", opLambda, aggsLambda);
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setParameterName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "parameter_name");
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -733,16 +567,16 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setExpiredTime_PercentileRanks() {
-        setExpiredTime_PercentileRanks(null);
+    public void setExpiredTime_PercentileRanks(double[] values) {
+        setExpiredTime_PercentileRanks(values, null);
     }
 
-    public void setExpiredTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setExpiredTime_PercentileRanks("expiredTime", opLambda);
+    public void setExpiredTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setExpiredTime_PercentileRanks("expiredTime", values, opLambda);
     }
 
-    public void setExpiredTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "expiredTime");
+    public void setExpiredTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "expiredTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -853,21 +687,20 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedBy_Terms() {
-        setCreatedBy_Terms(null);
+    public void setName_Terms() {
+        setName_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setCreatedBy_Terms("createdBy", opLambda, null);
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setName_Terms("name", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsAccessTokenCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -878,22 +711,22 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedBy_SignificantTerms() {
-        setCreatedBy_SignificantTerms(null);
+    public void setName_SignificantTerms() {
+        setName_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setCreatedBy_SignificantTerms("createdBy", opLambda, null);
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
+        setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -904,21 +737,21 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedBy_IpRange() {
-        setCreatedBy_IpRange(null);
+    public void setName_IpRange() {
+        setName_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setCreatedBy_IpRange("createdBy", opLambda, null);
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setName_IpRange("name", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -929,51 +762,51 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedBy_Count() {
-        setCreatedBy_Count(null);
+    public void setName_Count() {
+        setName_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setCreatedBy_Count("createdBy", opLambda);
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setName_Count("name", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_Cardinality() {
-        setCreatedBy_Cardinality(null);
+    public void setName_Cardinality() {
+        setName_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setCreatedBy_Cardinality("createdBy", opLambda);
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setName_Cardinality("name", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
+    public void setName_Missing() {
+        setName_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setCreatedBy_Missing("createdBy", opLambda, null);
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setName_Missing("name", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -984,141 +817,203 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_Avg() {
-        setCreatedTime_Avg(null);
+    public void setParameterName_Terms() {
+        setParameterName_Terms(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        setCreatedTime_Avg("createdTime", opLambda);
+    public void setParameterName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setParameterName_Terms("parameter_name", opLambda, null);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
+    public void setParameterName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setParameterName_Terms("parameter_name", opLambda, aggsLambda);
+    }
+
+    public void setParameterName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "parameter_name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            AccessTokenCA ca = new AccessTokenCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setCreatedTime_Max() {
-        setCreatedTime_Max(null);
+    public void setParameterName_SignificantTerms() {
+        setParameterName_SignificantTerms(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        setCreatedTime_Max("createdTime", opLambda);
+    public void setParameterName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setParameterName_SignificantTerms("parameter_name", opLambda, null);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
+    public void setParameterName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setParameterName_SignificantTerms("parameter_name", opLambda, aggsLambda);
+    }
+
+    public void setParameterName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "parameter_name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            AccessTokenCA ca = new AccessTokenCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setCreatedTime_Min() {
-        setCreatedTime_Min(null);
+    public void setParameterName_IpRange() {
+        setParameterName_IpRange(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        setCreatedTime_Min("createdTime", opLambda);
+    public void setParameterName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setParameterName_IpRange("parameter_name", opLambda, null);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        MinAggregationBuilder builder = regMinA(name, "createdTime");
+    public void setParameterName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setParameterName_IpRange("parameter_name", opLambda, aggsLambda);
+    }
+
+    public void setParameterName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "parameter_name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            AccessTokenCA ca = new AccessTokenCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setCreatedTime_Sum() {
-        setCreatedTime_Sum(null);
+    public void setParameterName_Count() {
+        setParameterName_Count(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        setCreatedTime_Sum("createdTime", opLambda);
+    public void setParameterName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setParameterName_Count("parameter_name", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        SumAggregationBuilder builder = regSumA(name, "createdTime");
+    public void setParameterName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "parameter_name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedTime_ExtendedStats() {
-        setCreatedTime_ExtendedStats(null);
+    public void setParameterName_Cardinality() {
+        setParameterName_Cardinality(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        setCreatedTime_ExtendedStats("createdTime", opLambda);
+    public void setParameterName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setParameterName_Cardinality("parameter_name", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setParameterName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "parameter_name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedTime_Stats() {
-        setCreatedTime_Stats(null);
+    public void setParameterName_Missing() {
+        setParameterName_Missing(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        setCreatedTime_Stats("createdTime", opLambda);
+    public void setParameterName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setParameterName_Missing("parameter_name", opLambda, null);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
+    public void setParameterName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setParameterName_Missing("parameter_name", opLambda, aggsLambda);
+    }
+
+    public void setParameterName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "parameter_name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            AccessTokenCA ca = new AccessTokenCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setCreatedTime_Percentiles() {
-        setCreatedTime_Percentiles(null);
+    public void setPermissions_Terms() {
+        setPermissions_Terms(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        setCreatedTime_Percentiles("createdTime", opLambda);
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setPermissions_Terms("permissions", opLambda, null);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setPermissions_Terms("permissions", opLambda, aggsLambda);
+    }
+
+    public void setPermissions_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            AccessTokenCA ca = new AccessTokenCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setPermissions_SignificantTerms() {
+        setPermissions_SignificantTerms(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setPermissions_SignificantTerms("permissions", opLambda, null);
+    }
+
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setPermissions_SignificantTerms("permissions", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            AccessTokenCA ca = new AccessTokenCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setCreatedTime_Histogram() {
-        setCreatedTime_Histogram(null);
+    public void setPermissions_IpRange() {
+        setPermissions_IpRange(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
-        setCreatedTime_Histogram("createdTime", opLambda, null);
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setPermissions_IpRange("permissions", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setPermissions_IpRange("permissions", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+    public void setPermissions_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1129,21 +1024,51 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_Range() {
-        setCreatedTime_Range(null);
+    public void setPermissions_Count() {
+        setPermissions_Count(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
-        setCreatedTime_Range("createdTime", opLambda, null);
+    public void setPermissions_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setPermissions_Count("permissions", opLambda);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setCreatedTime_Range("createdTime", opLambda, aggsLambda);
+    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "permissions");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+    public void setPermissions_Cardinality() {
+        setPermissions_Cardinality(null);
+    }
+
+    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setPermissions_Cardinality("permissions", opLambda);
+    }
+
+    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "permissions");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_Missing() {
+        setPermissions_Missing(null);
+    }
+
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setPermissions_Missing("permissions", opLambda, null);
+    }
+
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setPermissions_Missing("permissions", opLambda, aggsLambda);
+    }
+
+    public void setPermissions_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
+        MissingAggregationBuilder builder = regMissingA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1154,51 +1079,126 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_Count() {
-        setCreatedTime_Count(null);
+    public void setToken_Terms() {
+        setToken_Terms(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setCreatedTime_Count("createdTime", opLambda);
+    public void setToken_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setToken_Terms("token", opLambda, null);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
+    public void setToken_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setToken_Terms("token", opLambda, aggsLambda);
+    }
+
+    public void setToken_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "token");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            AccessTokenCA ca = new AccessTokenCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setCreatedTime_Cardinality() {
-        setCreatedTime_Cardinality(null);
+    public void setToken_SignificantTerms() {
+        setToken_SignificantTerms(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setCreatedTime_Cardinality("createdTime", opLambda);
+    public void setToken_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setToken_SignificantTerms("token", opLambda, null);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
+    public void setToken_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setToken_SignificantTerms("token", opLambda, aggsLambda);
+    }
+
+    public void setToken_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "token");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            AccessTokenCA ca = new AccessTokenCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
+    public void setToken_IpRange() {
+        setToken_IpRange(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setCreatedTime_Missing("createdTime", opLambda, null);
+    public void setToken_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setToken_IpRange("token", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
+    public void setToken_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setToken_IpRange("token", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setToken_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "token");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            AccessTokenCA ca = new AccessTokenCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setToken_Count() {
+        setToken_Count(null);
+    }
+
+    public void setToken_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setToken_Count("token", opLambda);
+    }
+
+    public void setToken_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "token");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setToken_Cardinality() {
+        setToken_Cardinality(null);
+    }
+
+    public void setToken_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setToken_Cardinality("token", opLambda);
+    }
+
+    public void setToken_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "token");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setToken_Missing() {
+        setToken_Missing(null);
+    }
+
+    public void setToken_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setToken_Missing("token", opLambda, null);
+    }
+
+    public void setToken_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        setToken_Missing("token", opLambda, aggsLambda);
+    }
+
+    public void setToken_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "token");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1445,16 +1445,16 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         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 0183742e7f98af6400274c5724ebfbaaa2c48361..b97657e6d51c8e13b38d2a8b04368578cb276d08 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -341,16 +341,16 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1088,16 +1088,16 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         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 f14ab0a345e7d1720a8e9e3d5e7e3aa634a99006..03684c1cd10ef81701158f51888bb7e61373d9ac 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -473,16 +473,16 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -700,16 +700,16 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void setSortOrder_PercentileRanks() {
-        setSortOrder_PercentileRanks(null);
+    public void setSortOrder_PercentileRanks(double[] values) {
+        setSortOrder_PercentileRanks(values, null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setSortOrder_PercentileRanks("sortOrder", opLambda);
+    public void setSortOrder_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setSortOrder_PercentileRanks("sortOrder", values, opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1057,16 +1057,16 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         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 3e0d5160ec037579c528313413aa0df9cea15fbe..32a3636b8afd703d1a90155958a2d9b1f65ab111 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -211,16 +211,16 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -437,16 +437,16 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setExpiredTime_PercentileRanks() {
-        setExpiredTime_PercentileRanks(null);
+    public void setExpiredTime_PercentileRanks(double[] values) {
+        setExpiredTime_PercentileRanks(values, null);
     }
 
-    public void setExpiredTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setExpiredTime_PercentileRanks("expiredTime", opLambda);
+    public void setExpiredTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setExpiredTime_PercentileRanks("expiredTime", values, opLambda);
     }
 
-    public void setExpiredTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "expiredTime");
+    public void setExpiredTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "expiredTime", values);
         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 7d14ed8390c2c430dde40d0519ac0bdeaa6e6e10..a0bab2cf140fd46b90cd78a2684e32f477442c52 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -345,16 +345,16 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         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 78930a3e45fcb14cbe09b43738ca79585ef3e589..6f8695ff23c781b251f250a8554915a9da400af1 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -211,16 +211,16 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setAvailable_PercentileRanks() {
-        setAvailable_PercentileRanks(null);
+    public void setAvailable_PercentileRanks(double[] values) {
+        setAvailable_PercentileRanks(values, null);
     }
 
-    public void setAvailable_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setAvailable_PercentileRanks("available", opLambda);
+    public void setAvailable_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setAvailable_PercentileRanks("available", values, opLambda);
     }
 
-    public void setAvailable_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available");
+    public void setAvailable_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -436,16 +436,16 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setBoost_PercentileRanks() {
-        setBoost_PercentileRanks(null);
+    public void setBoost_PercentileRanks(double[] values) {
+        setBoost_PercentileRanks(values, null);
     }
 
-    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setBoost_PercentileRanks("boost", opLambda);
+    public void setBoost_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setBoost_PercentileRanks("boost", values, opLambda);
     }
 
-    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost");
+    public void setBoost_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -791,16 +791,16 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1725,16 +1725,16 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSortOrder_PercentileRanks() {
-        setSortOrder_PercentileRanks(null);
+    public void setSortOrder_PercentileRanks(double[] values) {
+        setSortOrder_PercentileRanks(values, null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setSortOrder_PercentileRanks("sortOrder", opLambda);
+    public void setSortOrder_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setSortOrder_PercentileRanks("sortOrder", values, opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2081,16 +2081,16 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         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 8143c34f5edc59fcf1d783202f83e90e4cbc146c..ef374ceb6cdc6a7792212db99fd3bb5ac008c4c7 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
@@ -23,7 +23,7 @@ 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.GlobalAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
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 5446f5503b9744456056336974957c2aeaf59df0..f347eb7f740b334bb2653be0019fb8610f8d2a21 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
@@ -23,7 +23,7 @@ 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.GlobalAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
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 ec3ac142fc42c8d18d37e15488b9946dbffffe9c..de4f45fb2af72615f290b189ef9b3053b5a3dc88 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -342,16 +342,16 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -832,16 +832,16 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSortOrder_PercentileRanks() {
-        setSortOrder_PercentileRanks(null);
+    public void setSortOrder_PercentileRanks(double[] values) {
+        setSortOrder_PercentileRanks(values, null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setSortOrder_PercentileRanks("sortOrder", opLambda);
+    public void setSortOrder_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setSortOrder_PercentileRanks("sortOrder", values, opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1188,16 +1188,16 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         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 1fd247a9fe5d00fd711f03e2151c083b1e76150f..1da0ba59514ef78f3e2ac5898b991a0ed7efe2e6 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -211,16 +211,16 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setBoost_PercentileRanks() {
-        setBoost_PercentileRanks(null);
+    public void setBoost_PercentileRanks(double[] values) {
+        setBoost_PercentileRanks(values, null);
     }
 
-    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setBoost_PercentileRanks("boost", opLambda);
+    public void setBoost_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setBoost_PercentileRanks("boost", values, opLambda);
     }
 
-    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost");
+    public void setBoost_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -566,16 +566,16 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -686,6 +686,137 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
+    public void setPermissions_Terms() {
+        setPermissions_Terms(null);
+    }
+
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setPermissions_Terms("permissions", opLambda, null);
+    }
+
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+        setPermissions_Terms("permissions", opLambda, aggsLambda);
+    }
+
+    public void setPermissions_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "permissions");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            ElevateWordCA ca = new ElevateWordCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setPermissions_SignificantTerms() {
+        setPermissions_SignificantTerms(null);
+    }
+
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setPermissions_SignificantTerms("permissions", opLambda, null);
+    }
+
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        setPermissions_SignificantTerms("permissions", opLambda, aggsLambda);
+    }
+
+    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "permissions");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            ElevateWordCA ca = new ElevateWordCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setPermissions_IpRange() {
+        setPermissions_IpRange(null);
+    }
+
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setPermissions_IpRange("permissions", opLambda, null);
+    }
+
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+        setPermissions_IpRange("permissions", opLambda, aggsLambda);
+    }
+
+    public void setPermissions_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "permissions");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            ElevateWordCA ca = new ElevateWordCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setPermissions_Count() {
+        setPermissions_Count(null);
+    }
+
+    public void setPermissions_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setPermissions_Count("permissions", opLambda);
+    }
+
+    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "permissions");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_Cardinality() {
+        setPermissions_Cardinality(null);
+    }
+
+    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setPermissions_Cardinality("permissions", opLambda);
+    }
+
+    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "permissions");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_Missing() {
+        setPermissions_Missing(null);
+    }
+
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setPermissions_Missing("permissions", opLambda, null);
+    }
+
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+        setPermissions_Missing("permissions", opLambda, aggsLambda);
+    }
+
+    public void setPermissions_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "permissions");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            ElevateWordCA ca = new ElevateWordCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
     public void setReading_Terms() {
         setReading_Terms(null);
     }
@@ -1210,137 +1341,6 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPermissions_Terms() {
-        setPermissions_Terms(null);
-    }
-
-    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setPermissions_Terms("permissions", opLambda, null);
-    }
-
-    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        setPermissions_Terms("permissions", opLambda, aggsLambda);
-    }
-
-    public void setPermissions_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsElevateWordCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "permissions");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            ElevateWordCA ca = new ElevateWordCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setPermissions_SignificantTerms() {
-        setPermissions_SignificantTerms(null);
-    }
-
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setPermissions_SignificantTerms("permissions", opLambda, null);
-    }
-
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsElevateWordCA> aggsLambda) {
-        setPermissions_SignificantTerms("permissions", opLambda, aggsLambda);
-    }
-
-    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsElevateWordCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "permissions");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            ElevateWordCA ca = new ElevateWordCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setPermissions_IpRange() {
-        setPermissions_IpRange(null);
-    }
-
-    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setPermissions_IpRange("permissions", opLambda, null);
-    }
-
-    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        setPermissions_IpRange("permissions", opLambda, aggsLambda);
-    }
-
-    public void setPermissions_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsElevateWordCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "permissions");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            ElevateWordCA ca = new ElevateWordCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setPermissions_Count() {
-        setPermissions_Count(null);
-    }
-
-    public void setPermissions_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setPermissions_Count("permissions", opLambda);
-    }
-
-    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "permissions");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_Cardinality() {
-        setPermissions_Cardinality(null);
-    }
-
-    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setPermissions_Cardinality("permissions", opLambda);
-    }
-
-    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "permissions");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_Missing() {
-        setPermissions_Missing(null);
-    }
-
-    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setPermissions_Missing("permissions", opLambda, null);
-    }
-
-    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        setPermissions_Missing("permissions", opLambda, aggsLambda);
-    }
-
-    public void setPermissions_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsElevateWordCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "permissions");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            ElevateWordCA ca = new ElevateWordCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
@@ -1577,16 +1577,16 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         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 4d89064e9cc1cc19c4f1aec36bcb1ff2183c1a7d..54aa0c23f649c47e55c8779915fc3abf505f6c44 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
@@ -23,7 +23,7 @@ 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.GlobalAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
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 722abb6c46932a5958e51e052359b5f5eb1c78fa..f8ae7b1c1e4510597e4a6b0fed002e694df7893b 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -342,16 +342,16 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setErrorCount_PercentileRanks() {
-        setErrorCount_PercentileRanks(null);
+    public void setErrorCount_PercentileRanks(double[] values) {
+        setErrorCount_PercentileRanks(values, null);
     }
 
-    public void setErrorCount_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setErrorCount_PercentileRanks("errorCount", opLambda);
+    public void setErrorCount_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setErrorCount_PercentileRanks("errorCount", values, opLambda);
     }
 
-    public void setErrorCount_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "errorCount");
+    public void setErrorCount_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "errorCount", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -829,16 +829,17 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setLastAccessTime_PercentileRanks() {
-        setLastAccessTime_PercentileRanks(null);
+    public void setLastAccessTime_PercentileRanks(double[] values) {
+        setLastAccessTime_PercentileRanks(values, null);
     }
 
-    public void setLastAccessTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setLastAccessTime_PercentileRanks("lastAccessTime", opLambda);
+    public void setLastAccessTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setLastAccessTime_PercentileRanks("lastAccessTime", values, opLambda);
     }
 
-    public void setLastAccessTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "lastAccessTime");
+    public void setLastAccessTime_PercentileRanks(String name, double[] values,
+            ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "lastAccessTime", values);
         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 fbb8c49f7cd046e5ca6959a0c352f7f35443acf6..4622774683066d7560c7dc145ba9b57883d2d213 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -345,16 +345,16 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1100,16 +1100,16 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    public void setPort_PercentileRanks() {
-        setPort_PercentileRanks(null);
+    public void setPort_PercentileRanks(double[] values) {
+        setPort_PercentileRanks(values, null);
     }
 
-    public void setPort_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setPort_PercentileRanks("port", opLambda);
+    public void setPort_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setPort_PercentileRanks("port", values, opLambda);
     }
 
-    public void setPort_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "port");
+    public void setPort_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "port", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1592,16 +1592,16 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         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 d200bc13727c5a287ac2dee7b764fa3ab4a83784..252c33a8d91a1bede0a1fce782c754e1d1d5d490 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -211,16 +211,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setAvailable_PercentileRanks() {
-        setAvailable_PercentileRanks(null);
+    public void setAvailable_PercentileRanks(double[] values) {
+        setAvailable_PercentileRanks(values, null);
     }
 
-    public void setAvailable_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setAvailable_PercentileRanks("available", opLambda);
+    public void setAvailable_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setAvailable_PercentileRanks("available", values, opLambda);
     }
 
-    public void setAvailable_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available");
+    public void setAvailable_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -436,16 +436,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setBoost_PercentileRanks() {
-        setBoost_PercentileRanks(null);
+    public void setBoost_PercentileRanks(double[] values) {
+        setBoost_PercentileRanks(values, null);
     }
 
-    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setBoost_PercentileRanks("boost", opLambda);
+    public void setBoost_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setBoost_PercentileRanks("boost", values, opLambda);
     }
 
-    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost");
+    public void setBoost_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -922,16 +922,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1147,16 +1147,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDepth_PercentileRanks() {
-        setDepth_PercentileRanks(null);
+    public void setDepth_PercentileRanks(double[] values) {
+        setDepth_PercentileRanks(values, null);
     }
 
-    public void setDepth_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setDepth_PercentileRanks("depth", opLambda);
+    public void setDepth_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setDepth_PercentileRanks("depth", values, opLambda);
     }
 
-    public void setDepth_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "depth");
+    public void setDepth_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "depth", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1950,16 +1950,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setIntervalTime_PercentileRanks() {
-        setIntervalTime_PercentileRanks(null);
+    public void setIntervalTime_PercentileRanks(double[] values) {
+        setIntervalTime_PercentileRanks(values, null);
     }
 
-    public void setIntervalTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setIntervalTime_PercentileRanks("intervalTime", opLambda);
+    public void setIntervalTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setIntervalTime_PercentileRanks("intervalTime", values, opLambda);
     }
 
-    public void setIntervalTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "intervalTime");
+    public void setIntervalTime_PercentileRanks(String name, double[] values,
+            ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "intervalTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2070,231 +2071,6 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTimeToLive_Avg() {
-        setTimeToLive_Avg(null);
-    }
-
-    public void setTimeToLive_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        setTimeToLive_Avg("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        AvgAggregationBuilder builder = regAvgA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Max() {
-        setTimeToLive_Max(null);
-    }
-
-    public void setTimeToLive_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        setTimeToLive_Max("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        MaxAggregationBuilder builder = regMaxA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Min() {
-        setTimeToLive_Min(null);
-    }
-
-    public void setTimeToLive_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        setTimeToLive_Min("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        MinAggregationBuilder builder = regMinA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Sum() {
-        setTimeToLive_Sum(null);
-    }
-
-    public void setTimeToLive_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        setTimeToLive_Sum("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        SumAggregationBuilder builder = regSumA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_ExtendedStats() {
-        setTimeToLive_ExtendedStats(null);
-    }
-
-    public void setTimeToLive_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        setTimeToLive_ExtendedStats("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Stats() {
-        setTimeToLive_Stats(null);
-    }
-
-    public void setTimeToLive_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        setTimeToLive_Stats("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        StatsAggregationBuilder builder = regStatsA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Percentiles() {
-        setTimeToLive_Percentiles(null);
-    }
-
-    public void setTimeToLive_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        setTimeToLive_Percentiles("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        PercentilesAggregationBuilder builder = regPercentilesA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_PercentileRanks() {
-        setTimeToLive_PercentileRanks(null);
-    }
-
-    public void setTimeToLive_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setTimeToLive_PercentileRanks("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Histogram() {
-        setTimeToLive_Histogram(null);
-    }
-
-    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
-        setTimeToLive_Histogram("timeToLive", opLambda, null);
-    }
-
-    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        setTimeToLive_Histogram("timeToLive", opLambda, aggsLambda);
-    }
-
-    public void setTimeToLive_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
-            OperatorCall<BsFileConfigCA> aggsLambda) {
-        HistogramAggregationBuilder builder = regHistogramA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            FileConfigCA ca = new FileConfigCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setTimeToLive_Range() {
-        setTimeToLive_Range(null);
-    }
-
-    public void setTimeToLive_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
-        setTimeToLive_Range("timeToLive", opLambda, null);
-    }
-
-    public void setTimeToLive_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        setTimeToLive_Range("timeToLive", opLambda, aggsLambda);
-    }
-
-    public void setTimeToLive_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
-            OperatorCall<BsFileConfigCA> aggsLambda) {
-        RangeAggregationBuilder builder = regRangeA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            FileConfigCA ca = new FileConfigCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setTimeToLive_Count() {
-        setTimeToLive_Count(null);
-    }
-
-    public void setTimeToLive_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setTimeToLive_Count("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Cardinality() {
-        setTimeToLive_Cardinality(null);
-    }
-
-    public void setTimeToLive_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setTimeToLive_Cardinality("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Missing() {
-        setTimeToLive_Missing(null);
-    }
-
-    public void setTimeToLive_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setTimeToLive_Missing("timeToLive", opLambda, null);
-    }
-
-    public void setTimeToLive_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        setTimeToLive_Missing("timeToLive", opLambda, aggsLambda);
-    }
-
-    public void setTimeToLive_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            FileConfigCA ca = new FileConfigCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
     public void setMaxAccessCount_Avg() {
         setMaxAccessCount_Avg(null);
     }
@@ -2400,16 +2176,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setMaxAccessCount_PercentileRanks() {
-        setMaxAccessCount_PercentileRanks(null);
+    public void setMaxAccessCount_PercentileRanks(double[] values) {
+        setMaxAccessCount_PercentileRanks(values, null);
     }
 
-    public void setMaxAccessCount_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setMaxAccessCount_PercentileRanks("maxAccessCount", opLambda);
+    public void setMaxAccessCount_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setMaxAccessCount_PercentileRanks("maxAccessCount", values, opLambda);
     }
 
-    public void setMaxAccessCount_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "maxAccessCount");
+    public void setMaxAccessCount_PercentileRanks(String name, double[] values,
+            ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "maxAccessCount", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2756,16 +2533,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setNumOfThread_PercentileRanks() {
-        setNumOfThread_PercentileRanks(null);
+    public void setNumOfThread_PercentileRanks(double[] values) {
+        setNumOfThread_PercentileRanks(values, null);
     }
 
-    public void setNumOfThread_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setNumOfThread_PercentileRanks("numOfThread", opLambda);
+    public void setNumOfThread_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setNumOfThread_PercentileRanks("numOfThread", values, opLambda);
     }
 
-    public void setNumOfThread_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "numOfThread");
+    public void setNumOfThread_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "numOfThread", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3242,16 +3019,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSortOrder_PercentileRanks() {
-        setSortOrder_PercentileRanks(null);
+    public void setSortOrder_PercentileRanks(double[] values) {
+        setSortOrder_PercentileRanks(values, null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setSortOrder_PercentileRanks("sortOrder", opLambda);
+    public void setSortOrder_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setSortOrder_PercentileRanks("sortOrder", values, opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3362,6 +3139,231 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
+    public void setTimeToLive_Avg() {
+        setTimeToLive_Avg(null);
+    }
+
+    public void setTimeToLive_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        setTimeToLive_Avg("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Max() {
+        setTimeToLive_Max(null);
+    }
+
+    public void setTimeToLive_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        setTimeToLive_Max("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Min() {
+        setTimeToLive_Min(null);
+    }
+
+    public void setTimeToLive_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        setTimeToLive_Min("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Sum() {
+        setTimeToLive_Sum(null);
+    }
+
+    public void setTimeToLive_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        setTimeToLive_Sum("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_ExtendedStats() {
+        setTimeToLive_ExtendedStats(null);
+    }
+
+    public void setTimeToLive_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        setTimeToLive_ExtendedStats("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Stats() {
+        setTimeToLive_Stats(null);
+    }
+
+    public void setTimeToLive_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        setTimeToLive_Stats("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Percentiles() {
+        setTimeToLive_Percentiles(null);
+    }
+
+    public void setTimeToLive_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        setTimeToLive_Percentiles("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_PercentileRanks(double[] values) {
+        setTimeToLive_PercentileRanks(values, null);
+    }
+
+    public void setTimeToLive_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setTimeToLive_PercentileRanks("timeToLive", values, opLambda);
+    }
+
+    public void setTimeToLive_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "timeToLive", values);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Histogram() {
+        setTimeToLive_Histogram(null);
+    }
+
+    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
+        setTimeToLive_Histogram("timeToLive", opLambda, null);
+    }
+
+    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+        setTimeToLive_Histogram("timeToLive", opLambda, aggsLambda);
+    }
+
+    public void setTimeToLive_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            FileConfigCA ca = new FileConfigCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setTimeToLive_Range() {
+        setTimeToLive_Range(null);
+    }
+
+    public void setTimeToLive_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
+        setTimeToLive_Range("timeToLive", opLambda, null);
+    }
+
+    public void setTimeToLive_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+        setTimeToLive_Range("timeToLive", opLambda, aggsLambda);
+    }
+
+    public void setTimeToLive_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            FileConfigCA ca = new FileConfigCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setTimeToLive_Count() {
+        setTimeToLive_Count(null);
+    }
+
+    public void setTimeToLive_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setTimeToLive_Count("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Cardinality() {
+        setTimeToLive_Cardinality(null);
+    }
+
+    public void setTimeToLive_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setTimeToLive_Cardinality("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Missing() {
+        setTimeToLive_Missing(null);
+    }
+
+    public void setTimeToLive_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setTimeToLive_Missing("timeToLive", opLambda, null);
+    }
+
+    public void setTimeToLive_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+        setTimeToLive_Missing("timeToLive", opLambda, aggsLambda);
+    }
+
+    public void setTimeToLive_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            FileConfigCA ca = new FileConfigCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
@@ -3598,16 +3600,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         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 4e6cbfbb6d59e2f8c50eaffe1f43dd3d68b1a6c9..36a3907b717244f385bfb36f2c59761e3023a3f7 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
@@ -23,7 +23,7 @@ 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.GlobalAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
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 55135708c2a86f11a2a937a6a7aa4aadeef6535a..c6a7dfc09df186f70c799b7ba930973f09402ea8 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
@@ -23,7 +23,7 @@ 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.GlobalAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
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 947bff5100cb79b7e4859ae693d5c1d4fb00cc6e..3bb02de44c3922ede6fe7d68038ef56108b00ce9 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -211,16 +211,16 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setEndTime_PercentileRanks() {
-        setEndTime_PercentileRanks(null);
+    public void setEndTime_PercentileRanks(double[] values) {
+        setEndTime_PercentileRanks(values, null);
     }
 
-    public void setEndTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setEndTime_PercentileRanks("endTime", opLambda);
+    public void setEndTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setEndTime_PercentileRanks("endTime", values, opLambda);
     }
 
-    public void setEndTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "endTime");
+    public void setEndTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "endTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -587,6 +587,230 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         }
     }
 
+    public void setLastUpdated_Avg() {
+        setLastUpdated_Avg(null);
+    }
+
+    public void setLastUpdated_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        setLastUpdated_Avg("lastUpdated", opLambda);
+    }
+
+    public void setLastUpdated_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "lastUpdated");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_Max() {
+        setLastUpdated_Max(null);
+    }
+
+    public void setLastUpdated_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        setLastUpdated_Max("lastUpdated", opLambda);
+    }
+
+    public void setLastUpdated_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "lastUpdated");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_Min() {
+        setLastUpdated_Min(null);
+    }
+
+    public void setLastUpdated_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        setLastUpdated_Min("lastUpdated", opLambda);
+    }
+
+    public void setLastUpdated_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "lastUpdated");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_Sum() {
+        setLastUpdated_Sum(null);
+    }
+
+    public void setLastUpdated_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        setLastUpdated_Sum("lastUpdated", opLambda);
+    }
+
+    public void setLastUpdated_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "lastUpdated");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_ExtendedStats() {
+        setLastUpdated_ExtendedStats(null);
+    }
+
+    public void setLastUpdated_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        setLastUpdated_ExtendedStats("lastUpdated", opLambda);
+    }
+
+    public void setLastUpdated_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "lastUpdated");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_Stats() {
+        setLastUpdated_Stats(null);
+    }
+
+    public void setLastUpdated_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        setLastUpdated_Stats("lastUpdated", opLambda);
+    }
+
+    public void setLastUpdated_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "lastUpdated");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_Percentiles() {
+        setLastUpdated_Percentiles(null);
+    }
+
+    public void setLastUpdated_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        setLastUpdated_Percentiles("lastUpdated", opLambda);
+    }
+
+    public void setLastUpdated_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "lastUpdated");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_PercentileRanks(double[] values) {
+        setLastUpdated_PercentileRanks(values, null);
+    }
+
+    public void setLastUpdated_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setLastUpdated_PercentileRanks("lastUpdated", values, opLambda);
+    }
+
+    public void setLastUpdated_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "lastUpdated", values);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_Histogram() {
+        setLastUpdated_Histogram(null);
+    }
+
+    public void setLastUpdated_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
+        setLastUpdated_Histogram("lastUpdated", opLambda, null);
+    }
+
+    public void setLastUpdated_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        setLastUpdated_Histogram("lastUpdated", opLambda, aggsLambda);
+    }
+
+    public void setLastUpdated_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "lastUpdated");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            JobLogCA ca = new JobLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setLastUpdated_Range() {
+        setLastUpdated_Range(null);
+    }
+
+    public void setLastUpdated_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
+        setLastUpdated_Range("lastUpdated", opLambda, null);
+    }
+
+    public void setLastUpdated_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        setLastUpdated_Range("lastUpdated", opLambda, aggsLambda);
+    }
+
+    public void setLastUpdated_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "lastUpdated");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            JobLogCA ca = new JobLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setLastUpdated_Count() {
+        setLastUpdated_Count(null);
+    }
+
+    public void setLastUpdated_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setLastUpdated_Count("lastUpdated", opLambda);
+    }
+
+    public void setLastUpdated_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "lastUpdated");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_Cardinality() {
+        setLastUpdated_Cardinality(null);
+    }
+
+    public void setLastUpdated_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setLastUpdated_Cardinality("lastUpdated", opLambda);
+    }
+
+    public void setLastUpdated_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "lastUpdated");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_Missing() {
+        setLastUpdated_Missing(null);
+    }
+
+    public void setLastUpdated_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setLastUpdated_Missing("lastUpdated", opLambda, null);
+    }
+
+    public void setLastUpdated_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        setLastUpdated_Missing("lastUpdated", opLambda, aggsLambda);
+    }
+
+    public void setLastUpdated_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "lastUpdated");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            JobLogCA ca = new JobLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
     public void setScriptData_Terms() {
         setScriptData_Terms(null);
     }
@@ -1083,16 +1307,16 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setStartTime_PercentileRanks() {
-        setStartTime_PercentileRanks(null);
+    public void setStartTime_PercentileRanks(double[] values) {
+        setStartTime_PercentileRanks(values, null);
     }
 
-    public void setStartTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setStartTime_PercentileRanks("startTime", opLambda);
+    public void setStartTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setStartTime_PercentileRanks("startTime", values, opLambda);
     }
 
-    public void setStartTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "startTime");
+    public void setStartTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "startTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1330,228 +1554,4 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setLastUpdated_Avg() {
-        setLastUpdated_Avg(null);
-    }
-
-    public void setLastUpdated_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        setLastUpdated_Avg("lastUpdated", opLambda);
-    }
-
-    public void setLastUpdated_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        AvgAggregationBuilder builder = regAvgA(name, "lastUpdated");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_Max() {
-        setLastUpdated_Max(null);
-    }
-
-    public void setLastUpdated_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        setLastUpdated_Max("lastUpdated", opLambda);
-    }
-
-    public void setLastUpdated_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        MaxAggregationBuilder builder = regMaxA(name, "lastUpdated");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_Min() {
-        setLastUpdated_Min(null);
-    }
-
-    public void setLastUpdated_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        setLastUpdated_Min("lastUpdated", opLambda);
-    }
-
-    public void setLastUpdated_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        MinAggregationBuilder builder = regMinA(name, "lastUpdated");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_Sum() {
-        setLastUpdated_Sum(null);
-    }
-
-    public void setLastUpdated_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        setLastUpdated_Sum("lastUpdated", opLambda);
-    }
-
-    public void setLastUpdated_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        SumAggregationBuilder builder = regSumA(name, "lastUpdated");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_ExtendedStats() {
-        setLastUpdated_ExtendedStats(null);
-    }
-
-    public void setLastUpdated_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        setLastUpdated_ExtendedStats("lastUpdated", opLambda);
-    }
-
-    public void setLastUpdated_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "lastUpdated");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_Stats() {
-        setLastUpdated_Stats(null);
-    }
-
-    public void setLastUpdated_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        setLastUpdated_Stats("lastUpdated", opLambda);
-    }
-
-    public void setLastUpdated_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        StatsAggregationBuilder builder = regStatsA(name, "lastUpdated");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_Percentiles() {
-        setLastUpdated_Percentiles(null);
-    }
-
-    public void setLastUpdated_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        setLastUpdated_Percentiles("lastUpdated", opLambda);
-    }
-
-    public void setLastUpdated_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        PercentilesAggregationBuilder builder = regPercentilesA(name, "lastUpdated");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_PercentileRanks() {
-        setLastUpdated_PercentileRanks(null);
-    }
-
-    public void setLastUpdated_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setLastUpdated_PercentileRanks("lastUpdated", opLambda);
-    }
-
-    public void setLastUpdated_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "lastUpdated");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_Histogram() {
-        setLastUpdated_Histogram(null);
-    }
-
-    public void setLastUpdated_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
-        setLastUpdated_Histogram("lastUpdated", opLambda, null);
-    }
-
-    public void setLastUpdated_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        setLastUpdated_Histogram("lastUpdated", opLambda, aggsLambda);
-    }
-
-    public void setLastUpdated_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
-            OperatorCall<BsJobLogCA> aggsLambda) {
-        HistogramAggregationBuilder builder = regHistogramA(name, "lastUpdated");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            JobLogCA ca = new JobLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setLastUpdated_Range() {
-        setLastUpdated_Range(null);
-    }
-
-    public void setLastUpdated_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
-        setLastUpdated_Range("lastUpdated", opLambda, null);
-    }
-
-    public void setLastUpdated_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        setLastUpdated_Range("lastUpdated", opLambda, aggsLambda);
-    }
-
-    public void setLastUpdated_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        RangeAggregationBuilder builder = regRangeA(name, "lastUpdated");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            JobLogCA ca = new JobLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setLastUpdated_Count() {
-        setLastUpdated_Count(null);
-    }
-
-    public void setLastUpdated_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setLastUpdated_Count("lastUpdated", opLambda);
-    }
-
-    public void setLastUpdated_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "lastUpdated");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_Cardinality() {
-        setLastUpdated_Cardinality(null);
-    }
-
-    public void setLastUpdated_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setLastUpdated_Cardinality("lastUpdated", opLambda);
-    }
-
-    public void setLastUpdated_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "lastUpdated");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_Missing() {
-        setLastUpdated_Missing(null);
-    }
-
-    public void setLastUpdated_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setLastUpdated_Missing("lastUpdated", opLambda, null);
-    }
-
-    public void setLastUpdated_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        setLastUpdated_Missing("lastUpdated", opLambda, aggsLambda);
-    }
-
-    public void setLastUpdated_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsJobLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "lastUpdated");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            JobLogCA ca = new JobLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
 }
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 9235eb1127b067491bf06fbdde3c116ccdba0108..97cea872a69e6a0d2725bfd8b4628646d4d74080 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -211,16 +211,16 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setBoost_PercentileRanks() {
-        setBoost_PercentileRanks(null);
+    public void setBoost_PercentileRanks(double[] values) {
+        setBoost_PercentileRanks(values, null);
     }
 
-    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setBoost_PercentileRanks("boost", opLambda);
+    public void setBoost_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setBoost_PercentileRanks("boost", values, opLambda);
     }
 
-    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost");
+    public void setBoost_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -564,16 +564,16 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -789,16 +789,16 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setMaxSize_PercentileRanks() {
-        setMaxSize_PercentileRanks(null);
+    public void setMaxSize_PercentileRanks(double[] values) {
+        setMaxSize_PercentileRanks(values, null);
     }
 
-    public void setMaxSize_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setMaxSize_PercentileRanks("maxSize", opLambda);
+    public void setMaxSize_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setMaxSize_PercentileRanks("maxSize", values, opLambda);
     }
 
-    public void setMaxSize_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "maxSize");
+    public void setMaxSize_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "maxSize", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1164,137 +1164,6 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setVirtualHost_Terms() {
-        setVirtualHost_Terms(null);
-    }
-
-    public void setVirtualHost_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setVirtualHost_Terms("virtualHost", opLambda, null);
-    }
-
-    public void setVirtualHost_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        setVirtualHost_Terms("virtualHost", opLambda, aggsLambda);
-    }
-
-    public void setVirtualHost_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsKeyMatchCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "virtualHost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            KeyMatchCA ca = new KeyMatchCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setVirtualHost_SignificantTerms() {
-        setVirtualHost_SignificantTerms(null);
-    }
-
-    public void setVirtualHost_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setVirtualHost_SignificantTerms("virtualHost", opLambda, null);
-    }
-
-    public void setVirtualHost_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsKeyMatchCA> aggsLambda) {
-        setVirtualHost_SignificantTerms("virtualHost", opLambda, aggsLambda);
-    }
-
-    public void setVirtualHost_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsKeyMatchCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "virtualHost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            KeyMatchCA ca = new KeyMatchCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setVirtualHost_IpRange() {
-        setVirtualHost_IpRange(null);
-    }
-
-    public void setVirtualHost_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setVirtualHost_IpRange("virtualHost", opLambda, null);
-    }
-
-    public void setVirtualHost_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        setVirtualHost_IpRange("virtualHost", opLambda, aggsLambda);
-    }
-
-    public void setVirtualHost_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsKeyMatchCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "virtualHost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            KeyMatchCA ca = new KeyMatchCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setVirtualHost_Count() {
-        setVirtualHost_Count(null);
-    }
-
-    public void setVirtualHost_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setVirtualHost_Count("virtualHost", opLambda);
-    }
-
-    public void setVirtualHost_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "virtualHost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_Cardinality() {
-        setVirtualHost_Cardinality(null);
-    }
-
-    public void setVirtualHost_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setVirtualHost_Cardinality("virtualHost", opLambda);
-    }
-
-    public void setVirtualHost_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "virtualHost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_Missing() {
-        setVirtualHost_Missing(null);
-    }
-
-    public void setVirtualHost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setVirtualHost_Missing("virtualHost", opLambda, null);
-    }
-
-    public void setVirtualHost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        setVirtualHost_Missing("virtualHost", opLambda, aggsLambda);
-    }
-
-    public void setVirtualHost_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsKeyMatchCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "virtualHost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            KeyMatchCA ca = new KeyMatchCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
@@ -1530,16 +1399,16 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1650,4 +1519,135 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
+    public void setVirtualHost_Terms() {
+        setVirtualHost_Terms(null);
+    }
+
+    public void setVirtualHost_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setVirtualHost_Terms("virtualHost", opLambda, null);
+    }
+
+    public void setVirtualHost_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        setVirtualHost_Terms("virtualHost", opLambda, aggsLambda);
+    }
+
+    public void setVirtualHost_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "virtualHost");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            KeyMatchCA ca = new KeyMatchCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setVirtualHost_SignificantTerms() {
+        setVirtualHost_SignificantTerms(null);
+    }
+
+    public void setVirtualHost_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setVirtualHost_SignificantTerms("virtualHost", opLambda, null);
+    }
+
+    public void setVirtualHost_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        setVirtualHost_SignificantTerms("virtualHost", opLambda, aggsLambda);
+    }
+
+    public void setVirtualHost_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "virtualHost");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            KeyMatchCA ca = new KeyMatchCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setVirtualHost_IpRange() {
+        setVirtualHost_IpRange(null);
+    }
+
+    public void setVirtualHost_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setVirtualHost_IpRange("virtualHost", opLambda, null);
+    }
+
+    public void setVirtualHost_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        setVirtualHost_IpRange("virtualHost", opLambda, aggsLambda);
+    }
+
+    public void setVirtualHost_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "virtualHost");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            KeyMatchCA ca = new KeyMatchCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setVirtualHost_Count() {
+        setVirtualHost_Count(null);
+    }
+
+    public void setVirtualHost_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setVirtualHost_Count("virtualHost", opLambda);
+    }
+
+    public void setVirtualHost_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "virtualHost");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_Cardinality() {
+        setVirtualHost_Cardinality(null);
+    }
+
+    public void setVirtualHost_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setVirtualHost_Cardinality("virtualHost", opLambda);
+    }
+
+    public void setVirtualHost_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "virtualHost");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_Missing() {
+        setVirtualHost_Missing(null);
+    }
+
+    public void setVirtualHost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setVirtualHost_Missing("virtualHost", opLambda, null);
+    }
+
+    public void setVirtualHost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        setVirtualHost_Missing("virtualHost", opLambda, aggsLambda);
+    }
+
+    public void setVirtualHost_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "virtualHost");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            KeyMatchCA ca = new KeyMatchCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
 }
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 bf4aa04c3d9164a3538a97a580e4bea278e89700..0ab41912b35aac3924b8e373cedfbd8ab138d315 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
@@ -23,7 +23,7 @@ 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.GlobalAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
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 df37a8226a025968aa79a5672fd068ec515d6cbc..affbca64745832e649eb701da59cf50d69415446 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -342,16 +342,16 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -983,137 +983,6 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setVirtualHost_Terms() {
-        setVirtualHost_Terms(null);
-    }
-
-    public void setVirtualHost_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setVirtualHost_Terms("virtualHost", opLambda, null);
-    }
-
-    public void setVirtualHost_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        setVirtualHost_Terms("virtualHost", opLambda, aggsLambda);
-    }
-
-    public void setVirtualHost_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsLabelTypeCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "virtualHost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            LabelTypeCA ca = new LabelTypeCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setVirtualHost_SignificantTerms() {
-        setVirtualHost_SignificantTerms(null);
-    }
-
-    public void setVirtualHost_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setVirtualHost_SignificantTerms("virtualHost", opLambda, null);
-    }
-
-    public void setVirtualHost_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsLabelTypeCA> aggsLambda) {
-        setVirtualHost_SignificantTerms("virtualHost", opLambda, aggsLambda);
-    }
-
-    public void setVirtualHost_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsLabelTypeCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "virtualHost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            LabelTypeCA ca = new LabelTypeCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setVirtualHost_IpRange() {
-        setVirtualHost_IpRange(null);
-    }
-
-    public void setVirtualHost_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setVirtualHost_IpRange("virtualHost", opLambda, null);
-    }
-
-    public void setVirtualHost_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        setVirtualHost_IpRange("virtualHost", opLambda, aggsLambda);
-    }
-
-    public void setVirtualHost_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsLabelTypeCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "virtualHost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            LabelTypeCA ca = new LabelTypeCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setVirtualHost_Count() {
-        setVirtualHost_Count(null);
-    }
-
-    public void setVirtualHost_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setVirtualHost_Count("virtualHost", opLambda);
-    }
-
-    public void setVirtualHost_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "virtualHost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_Cardinality() {
-        setVirtualHost_Cardinality(null);
-    }
-
-    public void setVirtualHost_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setVirtualHost_Cardinality("virtualHost", opLambda);
-    }
-
-    public void setVirtualHost_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "virtualHost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_Missing() {
-        setVirtualHost_Missing(null);
-    }
-
-    public void setVirtualHost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setVirtualHost_Missing("virtualHost", opLambda, null);
-    }
-
-    public void setVirtualHost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        setVirtualHost_Missing("virtualHost", opLambda, aggsLambda);
-    }
-
-    public void setVirtualHost_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsLabelTypeCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "virtualHost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            LabelTypeCA ca = new LabelTypeCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
     public void setSortOrder_Avg() {
         setSortOrder_Avg(null);
     }
@@ -1219,16 +1088,16 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSortOrder_PercentileRanks() {
-        setSortOrder_PercentileRanks(null);
+    public void setSortOrder_PercentileRanks(double[] values) {
+        setSortOrder_PercentileRanks(values, null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setSortOrder_PercentileRanks("sortOrder", opLambda);
+    public void setSortOrder_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setSortOrder_PercentileRanks("sortOrder", values, opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1575,16 +1444,16 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1825,4 +1694,135 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
+    public void setVirtualHost_Terms() {
+        setVirtualHost_Terms(null);
+    }
+
+    public void setVirtualHost_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setVirtualHost_Terms("virtualHost", opLambda, null);
+    }
+
+    public void setVirtualHost_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+        setVirtualHost_Terms("virtualHost", opLambda, aggsLambda);
+    }
+
+    public void setVirtualHost_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "virtualHost");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            LabelTypeCA ca = new LabelTypeCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setVirtualHost_SignificantTerms() {
+        setVirtualHost_SignificantTerms(null);
+    }
+
+    public void setVirtualHost_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setVirtualHost_SignificantTerms("virtualHost", opLambda, null);
+    }
+
+    public void setVirtualHost_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        setVirtualHost_SignificantTerms("virtualHost", opLambda, aggsLambda);
+    }
+
+    public void setVirtualHost_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "virtualHost");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            LabelTypeCA ca = new LabelTypeCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setVirtualHost_IpRange() {
+        setVirtualHost_IpRange(null);
+    }
+
+    public void setVirtualHost_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setVirtualHost_IpRange("virtualHost", opLambda, null);
+    }
+
+    public void setVirtualHost_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+        setVirtualHost_IpRange("virtualHost", opLambda, aggsLambda);
+    }
+
+    public void setVirtualHost_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "virtualHost");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            LabelTypeCA ca = new LabelTypeCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setVirtualHost_Count() {
+        setVirtualHost_Count(null);
+    }
+
+    public void setVirtualHost_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setVirtualHost_Count("virtualHost", opLambda);
+    }
+
+    public void setVirtualHost_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "virtualHost");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_Cardinality() {
+        setVirtualHost_Cardinality(null);
+    }
+
+    public void setVirtualHost_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setVirtualHost_Cardinality("virtualHost", opLambda);
+    }
+
+    public void setVirtualHost_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "virtualHost");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_Missing() {
+        setVirtualHost_Missing(null);
+    }
+
+    public void setVirtualHost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setVirtualHost_Missing("virtualHost", opLambda, null);
+    }
+
+    public void setVirtualHost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+        setVirtualHost_Missing("virtualHost", opLambda, aggsLambda);
+    }
+
+    public void setVirtualHost_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "virtualHost");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            LabelTypeCA ca = new LabelTypeCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
 }
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 e773e6c8d9c9850cf03c4f3f2e252c97fa4af2ef..99dbc1397b33657d719f3bc36bbc6293fc22b48f 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -342,16 +342,16 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -959,16 +959,16 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSortOrder_PercentileRanks() {
-        setSortOrder_PercentileRanks(null);
+    public void setSortOrder_PercentileRanks(double[] values) {
+        setSortOrder_PercentileRanks(values, null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setSortOrder_PercentileRanks("sortOrder", opLambda);
+    public void setSortOrder_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setSortOrder_PercentileRanks("sortOrder", values, opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1079,137 +1079,6 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUserAgent_Terms() {
-        setUserAgent_Terms(null);
-    }
-
-    public void setUserAgent_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setUserAgent_Terms("userAgent", opLambda, null);
-    }
-
-    public void setUserAgent_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        setUserAgent_Terms("userAgent", opLambda, aggsLambda);
-    }
-
-    public void setUserAgent_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsPathMappingCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "userAgent");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            PathMappingCA ca = new PathMappingCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setUserAgent_SignificantTerms() {
-        setUserAgent_SignificantTerms(null);
-    }
-
-    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setUserAgent_SignificantTerms("userAgent", opLambda, null);
-    }
-
-    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsPathMappingCA> aggsLambda) {
-        setUserAgent_SignificantTerms("userAgent", opLambda, aggsLambda);
-    }
-
-    public void setUserAgent_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsPathMappingCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "userAgent");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            PathMappingCA ca = new PathMappingCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setUserAgent_IpRange() {
-        setUserAgent_IpRange(null);
-    }
-
-    public void setUserAgent_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setUserAgent_IpRange("userAgent", opLambda, null);
-    }
-
-    public void setUserAgent_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        setUserAgent_IpRange("userAgent", opLambda, aggsLambda);
-    }
-
-    public void setUserAgent_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsPathMappingCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "userAgent");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            PathMappingCA ca = new PathMappingCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setUserAgent_Count() {
-        setUserAgent_Count(null);
-    }
-
-    public void setUserAgent_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setUserAgent_Count("userAgent", opLambda);
-    }
-
-    public void setUserAgent_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "userAgent");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_Cardinality() {
-        setUserAgent_Cardinality(null);
-    }
-
-    public void setUserAgent_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setUserAgent_Cardinality("userAgent", opLambda);
-    }
-
-    public void setUserAgent_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "userAgent");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_Missing() {
-        setUserAgent_Missing(null);
-    }
-
-    public void setUserAgent_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setUserAgent_Missing("userAgent", opLambda, null);
-    }
-
-    public void setUserAgent_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        setUserAgent_Missing("userAgent", opLambda, aggsLambda);
-    }
-
-    public void setUserAgent_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsPathMappingCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "userAgent");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            PathMappingCA ca = new PathMappingCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
@@ -1446,16 +1315,16 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1566,4 +1435,135 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
+    public void setUserAgent_Terms() {
+        setUserAgent_Terms(null);
+    }
+
+    public void setUserAgent_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setUserAgent_Terms("userAgent", opLambda, null);
+    }
+
+    public void setUserAgent_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+        setUserAgent_Terms("userAgent", opLambda, aggsLambda);
+    }
+
+    public void setUserAgent_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "userAgent");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            PathMappingCA ca = new PathMappingCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setUserAgent_SignificantTerms() {
+        setUserAgent_SignificantTerms(null);
+    }
+
+    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setUserAgent_SignificantTerms("userAgent", opLambda, null);
+    }
+
+    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        setUserAgent_SignificantTerms("userAgent", opLambda, aggsLambda);
+    }
+
+    public void setUserAgent_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "userAgent");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            PathMappingCA ca = new PathMappingCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setUserAgent_IpRange() {
+        setUserAgent_IpRange(null);
+    }
+
+    public void setUserAgent_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setUserAgent_IpRange("userAgent", opLambda, null);
+    }
+
+    public void setUserAgent_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+        setUserAgent_IpRange("userAgent", opLambda, aggsLambda);
+    }
+
+    public void setUserAgent_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "userAgent");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            PathMappingCA ca = new PathMappingCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setUserAgent_Count() {
+        setUserAgent_Count(null);
+    }
+
+    public void setUserAgent_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setUserAgent_Count("userAgent", opLambda);
+    }
+
+    public void setUserAgent_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "userAgent");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_Cardinality() {
+        setUserAgent_Cardinality(null);
+    }
+
+    public void setUserAgent_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setUserAgent_Cardinality("userAgent", opLambda);
+    }
+
+    public void setUserAgent_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "userAgent");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_Missing() {
+        setUserAgent_Missing(null);
+    }
+
+    public void setUserAgent_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setUserAgent_Missing("userAgent", opLambda, null);
+    }
+
+    public void setUserAgent_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+        setUserAgent_Missing("userAgent", opLambda, aggsLambda);
+    }
+
+    public void setUserAgent_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "userAgent");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            PathMappingCA ca = new PathMappingCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
index ef571e065e6663e28d980fdc1f8b053a7c7ad19d..932677ba2a5ff30cb2b47fdbcee1381926b61223 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -106,6 +106,137 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
         }
     }
 
+    public void setContent_Terms() {
+        setContent_Terms(null);
+    }
+
+    public void setContent_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setContent_Terms("content", opLambda, null);
+    }
+
+    public void setContent_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
+        setContent_Terms("content", opLambda, aggsLambda);
+    }
+
+    public void setContent_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsRelatedContentCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "content");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            RelatedContentCA ca = new RelatedContentCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setContent_SignificantTerms() {
+        setContent_SignificantTerms(null);
+    }
+
+    public void setContent_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setContent_SignificantTerms("content", opLambda, null);
+    }
+
+    public void setContent_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsRelatedContentCA> aggsLambda) {
+        setContent_SignificantTerms("content", opLambda, aggsLambda);
+    }
+
+    public void setContent_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsRelatedContentCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "content");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            RelatedContentCA ca = new RelatedContentCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setContent_IpRange() {
+        setContent_IpRange(null);
+    }
+
+    public void setContent_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setContent_IpRange("content", opLambda, null);
+    }
+
+    public void setContent_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
+        setContent_IpRange("content", opLambda, aggsLambda);
+    }
+
+    public void setContent_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsRelatedContentCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "content");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            RelatedContentCA ca = new RelatedContentCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setContent_Count() {
+        setContent_Count(null);
+    }
+
+    public void setContent_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setContent_Count("content", opLambda);
+    }
+
+    public void setContent_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "content");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_Cardinality() {
+        setContent_Cardinality(null);
+    }
+
+    public void setContent_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setContent_Cardinality("content", opLambda);
+    }
+
+    public void setContent_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "content");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_Missing() {
+        setContent_Missing(null);
+    }
+
+    public void setContent_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setContent_Missing("content", opLambda, null);
+    }
+
+    public void setContent_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
+        setContent_Missing("content", opLambda, aggsLambda);
+    }
+
+    public void setContent_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsRelatedContentCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "content");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            RelatedContentCA ca = new RelatedContentCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
@@ -342,16 +473,16 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -463,273 +594,142 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setUpdatedBy_Terms() {
-        setUpdatedBy_Terms(null);
-    }
-
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setUpdatedBy_Terms("updatedBy", opLambda, null);
+    public void setSortOrder_Avg() {
+        setSortOrder_Avg(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
-        setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
+    public void setSortOrder_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        setSortOrder_Avg("sortOrder", opLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsRelatedContentCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
+    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            RelatedContentCA ca = new RelatedContentCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setUpdatedBy_SignificantTerms() {
-        setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
+    public void setSortOrder_Max() {
+        setSortOrder_Max(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsRelatedContentCA> aggsLambda) {
-        setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
+    public void setSortOrder_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        setSortOrder_Max("sortOrder", opLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsRelatedContentCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
+    public void setSortOrder_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            RelatedContentCA ca = new RelatedContentCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setUpdatedBy_IpRange() {
-        setUpdatedBy_IpRange(null);
-    }
-
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setUpdatedBy_IpRange("updatedBy", opLambda, null);
+    public void setSortOrder_Min() {
+        setSortOrder_Min(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
-        setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
+    public void setSortOrder_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        setSortOrder_Min("sortOrder", opLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsRelatedContentCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
+    public void setSortOrder_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            RelatedContentCA ca = new RelatedContentCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setUpdatedBy_Count() {
-        setUpdatedBy_Count(null);
+    public void setSortOrder_Sum() {
+        setSortOrder_Sum(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setUpdatedBy_Count("updatedBy", opLambda);
+    public void setSortOrder_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        setSortOrder_Sum("sortOrder", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
+    public void setSortOrder_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_Cardinality() {
-        setUpdatedBy_Cardinality(null);
+    public void setSortOrder_ExtendedStats() {
+        setSortOrder_ExtendedStats(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setUpdatedBy_Cardinality("updatedBy", opLambda);
+    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        setSortOrder_ExtendedStats("sortOrder", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setUpdatedBy_Missing("updatedBy", opLambda, null);
+    public void setSortOrder_Stats() {
+        setSortOrder_Stats(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
-        setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
+    public void setSortOrder_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        setSortOrder_Stats("sortOrder", opLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsRelatedContentCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
+    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            RelatedContentCA ca = new RelatedContentCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setUpdatedTime_Avg() {
-        setUpdatedTime_Avg(null);
+    public void setSortOrder_Percentiles() {
+        setSortOrder_Percentiles(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        setUpdatedTime_Avg("updatedTime", opLambda);
+    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        setSortOrder_Percentiles("sortOrder", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
+    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_Max() {
-        setUpdatedTime_Max(null);
-    }
-
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        setUpdatedTime_Max("updatedTime", opLambda);
-    }
-
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Min() {
-        setUpdatedTime_Min(null);
-    }
-
-    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        setUpdatedTime_Min("updatedTime", opLambda);
-    }
-
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        MinAggregationBuilder builder = regMinA(name, "updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Sum() {
-        setUpdatedTime_Sum(null);
-    }
-
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        setUpdatedTime_Sum("updatedTime", opLambda);
-    }
-
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        SumAggregationBuilder builder = regSumA(name, "updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_ExtendedStats() {
-        setUpdatedTime_ExtendedStats(null);
-    }
-
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        setUpdatedTime_ExtendedStats("updatedTime", opLambda);
+    public void setSortOrder_PercentileRanks(double[] values) {
+        setSortOrder_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Stats() {
-        setUpdatedTime_Stats(null);
-    }
-
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        setUpdatedTime_Stats("updatedTime", opLambda);
+    public void setSortOrder_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setSortOrder_PercentileRanks("sortOrder", values, opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
+    public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_Percentiles() {
-        setUpdatedTime_Percentiles(null);
-    }
-
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        setUpdatedTime_Percentiles("updatedTime", opLambda);
-    }
-
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
-    }
-
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
-    }
-
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Histogram() {
-        setUpdatedTime_Histogram(null);
+    public void setSortOrder_Histogram() {
+        setSortOrder_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
-        setUpdatedTime_Histogram("updatedTime", opLambda, null);
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
+        setSortOrder_Histogram("sortOrder", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsRelatedContentCA> aggsLambda) {
-        setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
+        setSortOrder_Histogram("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsRelatedContentCA> aggsLambda) {
-        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -740,21 +740,21 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setUpdatedTime_Range() {
-        setUpdatedTime_Range(null);
+    public void setSortOrder_Range() {
+        setSortOrder_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
-        setUpdatedTime_Range("updatedTime", opLambda, null);
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
+        setSortOrder_Range("sortOrder", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
-        setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
+        setSortOrder_Range("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+    public void setSortOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
             OperatorCall<BsRelatedContentCA> aggsLambda) {
-        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
+        RangeAggregationBuilder builder = regRangeA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -765,51 +765,51 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setUpdatedTime_Count() {
-        setUpdatedTime_Count(null);
+    public void setSortOrder_Count() {
+        setSortOrder_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setUpdatedTime_Count("updatedTime", opLambda);
+    public void setSortOrder_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setSortOrder_Count("sortOrder", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
+    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_Cardinality() {
-        setUpdatedTime_Cardinality(null);
+    public void setSortOrder_Cardinality() {
+        setSortOrder_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setUpdatedTime_Cardinality("updatedTime", opLambda);
+    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setSortOrder_Cardinality("sortOrder", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
+    public void setSortOrder_Missing() {
+        setSortOrder_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setUpdatedTime_Missing("updatedTime", opLambda, null);
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setSortOrder_Missing("sortOrder", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
-        setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
+        setSortOrder_Missing("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsRelatedContentCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
+        MissingAggregationBuilder builder = regMissingA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -951,21 +951,21 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setContent_Terms() {
-        setContent_Terms(null);
+    public void setUpdatedBy_Terms() {
+        setUpdatedBy_Terms(null);
     }
 
-    public void setContent_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setContent_Terms("content", opLambda, null);
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setContent_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
-        setContent_Terms("content", opLambda, aggsLambda);
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
+        setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setContent_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsRelatedContentCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "content");
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -976,22 +976,22 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setContent_SignificantTerms() {
-        setContent_SignificantTerms(null);
+    public void setUpdatedBy_SignificantTerms() {
+        setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setContent_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setContent_SignificantTerms("content", opLambda, null);
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setContent_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRelatedContentCA> aggsLambda) {
-        setContent_SignificantTerms("content", opLambda, aggsLambda);
+        setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setContent_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRelatedContentCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "content");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1002,21 +1002,21 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setContent_IpRange() {
-        setContent_IpRange(null);
+    public void setUpdatedBy_IpRange() {
+        setUpdatedBy_IpRange(null);
     }
 
-    public void setContent_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setContent_IpRange("content", opLambda, null);
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setContent_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
-        setContent_IpRange("content", opLambda, aggsLambda);
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
+        setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setContent_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsRelatedContentCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "content");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1027,51 +1027,51 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setContent_Count() {
-        setContent_Count(null);
+    public void setUpdatedBy_Count() {
+        setUpdatedBy_Count(null);
     }
 
-    public void setContent_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setContent_Count("content", opLambda);
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setContent_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "content");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_Cardinality() {
-        setContent_Cardinality(null);
+    public void setUpdatedBy_Cardinality() {
+        setUpdatedBy_Cardinality(null);
     }
 
-    public void setContent_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setContent_Cardinality("content", opLambda);
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setContent_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "content");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_Missing() {
-        setContent_Missing(null);
+    public void setUpdatedBy_Missing() {
+        setUpdatedBy_Missing(null);
     }
 
-    public void setContent_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setContent_Missing("content", opLambda, null);
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setContent_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
-        setContent_Missing("content", opLambda, aggsLambda);
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
+        setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setContent_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsRelatedContentCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "content");
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1082,142 +1082,142 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setSortOrder_Avg() {
-        setSortOrder_Avg(null);
+    public void setUpdatedTime_Avg() {
+        setUpdatedTime_Avg(null);
     }
 
-    public void setSortOrder_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        setSortOrder_Avg("sortOrder", opLambda);
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        AvgAggregationBuilder builder = regAvgA(name, "sortOrder");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_Max() {
-        setSortOrder_Max(null);
+    public void setUpdatedTime_Max() {
+        setUpdatedTime_Max(null);
     }
 
-    public void setSortOrder_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        setSortOrder_Max("sortOrder", opLambda);
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setSortOrder_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        MaxAggregationBuilder builder = regMaxA(name, "sortOrder");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_Min() {
-        setSortOrder_Min(null);
+    public void setUpdatedTime_Min() {
+        setUpdatedTime_Min(null);
     }
 
-    public void setSortOrder_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        setSortOrder_Min("sortOrder", opLambda);
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setSortOrder_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        MinAggregationBuilder builder = regMinA(name, "sortOrder");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_Sum() {
-        setSortOrder_Sum(null);
+    public void setUpdatedTime_Sum() {
+        setUpdatedTime_Sum(null);
     }
 
-    public void setSortOrder_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        setSortOrder_Sum("sortOrder", opLambda);
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setSortOrder_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        SumAggregationBuilder builder = regSumA(name, "sortOrder");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_ExtendedStats() {
-        setSortOrder_ExtendedStats(null);
+    public void setUpdatedTime_ExtendedStats() {
+        setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        setSortOrder_ExtendedStats("sortOrder", opLambda);
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "sortOrder");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_Stats() {
-        setSortOrder_Stats(null);
+    public void setUpdatedTime_Stats() {
+        setUpdatedTime_Stats(null);
     }
 
-    public void setSortOrder_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        setSortOrder_Stats("sortOrder", opLambda);
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        StatsAggregationBuilder builder = regStatsA(name, "sortOrder");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_Percentiles() {
-        setSortOrder_Percentiles(null);
+    public void setUpdatedTime_Percentiles() {
+        setUpdatedTime_Percentiles(null);
     }
 
-    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        setSortOrder_Percentiles("sortOrder", opLambda);
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        PercentilesAggregationBuilder builder = regPercentilesA(name, "sortOrder");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_PercentileRanks() {
-        setSortOrder_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setSortOrder_PercentileRanks("sortOrder", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_Histogram() {
-        setSortOrder_Histogram(null);
+    public void setUpdatedTime_Histogram() {
+        setUpdatedTime_Histogram(null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
-        setSortOrder_Histogram("sortOrder", opLambda, null);
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
+        setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsRelatedContentCA> aggsLambda) {
-        setSortOrder_Histogram("sortOrder", opLambda, aggsLambda);
+        setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsRelatedContentCA> aggsLambda) {
-        HistogramAggregationBuilder builder = regHistogramA(name, "sortOrder");
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1228,21 +1228,21 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setSortOrder_Range() {
-        setSortOrder_Range(null);
+    public void setUpdatedTime_Range() {
+        setUpdatedTime_Range(null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
-        setSortOrder_Range("sortOrder", opLambda, null);
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
+        setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
-        setSortOrder_Range("sortOrder", opLambda, aggsLambda);
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
+        setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
             OperatorCall<BsRelatedContentCA> aggsLambda) {
-        RangeAggregationBuilder builder = regRangeA(name, "sortOrder");
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1253,51 +1253,51 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setSortOrder_Count() {
-        setSortOrder_Count(null);
+    public void setUpdatedTime_Count() {
+        setUpdatedTime_Count(null);
     }
 
-    public void setSortOrder_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setSortOrder_Count("sortOrder", opLambda);
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "sortOrder");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_Cardinality() {
-        setSortOrder_Cardinality(null);
+    public void setUpdatedTime_Cardinality() {
+        setUpdatedTime_Cardinality(null);
     }
 
-    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setSortOrder_Cardinality("sortOrder", opLambda);
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "sortOrder");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_Missing() {
-        setSortOrder_Missing(null);
+    public void setUpdatedTime_Missing() {
+        setUpdatedTime_Missing(null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setSortOrder_Missing("sortOrder", opLambda, null);
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
-        setSortOrder_Missing("sortOrder", opLambda, aggsLambda);
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
+        setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsRelatedContentCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "sortOrder");
+        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/BsRelatedQueryCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
index 471ac2a7e395387d666334fff5d76af79bfde144..40b2ca74a11f70dbc787d43704eb91cbc447cfd3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -342,16 +342,16 @@ public abstract class BsRelatedQueryCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -463,21 +463,21 @@ public abstract class BsRelatedQueryCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedBy_Terms() {
-        setUpdatedBy_Terms(null);
+    public void setQueries_Terms() {
+        setQueries_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setUpdatedBy_Terms("updatedBy", opLambda, null);
+    public void setQueries_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setQueries_Terms("queries", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
+    public void setQueries_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        setQueries_Terms("queries", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+    public void setQueries_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
+        TermsAggregationBuilder builder = regTermsA(name, "queries");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -488,22 +488,22 @@ public abstract class BsRelatedQueryCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedBy_SignificantTerms() {
-        setUpdatedBy_SignificantTerms(null);
+    public void setQueries_SignificantTerms() {
+        setQueries_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
+    public void setQueries_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setQueries_SignificantTerms("queries", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setQueries_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
+        setQueries_SignificantTerms("queries", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setQueries_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "queries");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -514,21 +514,21 @@ public abstract class BsRelatedQueryCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedBy_IpRange() {
-        setUpdatedBy_IpRange(null);
+    public void setQueries_IpRange() {
+        setQueries_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setUpdatedBy_IpRange("updatedBy", opLambda, null);
+    public void setQueries_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setQueries_IpRange("queries", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
+    public void setQueries_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        setQueries_IpRange("queries", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setQueries_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "queries");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -539,51 +539,51 @@ public abstract class BsRelatedQueryCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedBy_Count() {
-        setUpdatedBy_Count(null);
+    public void setQueries_Count() {
+        setQueries_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setUpdatedBy_Count("updatedBy", opLambda);
+    public void setQueries_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setQueries_Count("queries", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
+    public void setQueries_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "queries");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_Cardinality() {
-        setUpdatedBy_Cardinality(null);
+    public void setQueries_Cardinality() {
+        setQueries_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setUpdatedBy_Cardinality("updatedBy", opLambda);
+    public void setQueries_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setQueries_Cardinality("queries", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setQueries_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "queries");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
+    public void setQueries_Missing() {
+        setQueries_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setUpdatedBy_Missing("updatedBy", opLambda, null);
+    public void setQueries_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setQueries_Missing("queries", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
+    public void setQueries_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        setQueries_Missing("queries", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setQueries_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
+        MissingAggregationBuilder builder = regMissingA(name, "queries");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -594,142 +594,177 @@ public abstract class BsRelatedQueryCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_Avg() {
-        setUpdatedTime_Avg(null);
-    }
-
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        setUpdatedTime_Avg("updatedTime", opLambda);
-    }
-
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setTerm_Terms() {
+        setTerm_Terms(null);
     }
 
-    public void setUpdatedTime_Max() {
-        setUpdatedTime_Max(null);
+    public void setTerm_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setTerm_Terms("term", opLambda, null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        setUpdatedTime_Max("updatedTime", opLambda);
+    public void setTerm_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        setTerm_Terms("term", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
+    public void setTerm_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "term");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            RelatedQueryCA ca = new RelatedQueryCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setUpdatedTime_Min() {
-        setUpdatedTime_Min(null);
+    public void setTerm_SignificantTerms() {
+        setTerm_SignificantTerms(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        setUpdatedTime_Min("updatedTime", opLambda);
+    public void setTerm_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setTerm_SignificantTerms("term", opLambda, null);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        MinAggregationBuilder builder = regMinA(name, "updatedTime");
+    public void setTerm_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        setTerm_SignificantTerms("term", opLambda, aggsLambda);
+    }
+
+    public void setTerm_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "term");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            RelatedQueryCA ca = new RelatedQueryCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setUpdatedTime_Sum() {
-        setUpdatedTime_Sum(null);
+    public void setTerm_IpRange() {
+        setTerm_IpRange(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        setUpdatedTime_Sum("updatedTime", opLambda);
+    public void setTerm_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setTerm_IpRange("term", opLambda, null);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        SumAggregationBuilder builder = regSumA(name, "updatedTime");
+    public void setTerm_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        setTerm_IpRange("term", opLambda, aggsLambda);
+    }
+
+    public void setTerm_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "term");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            RelatedQueryCA ca = new RelatedQueryCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setUpdatedTime_ExtendedStats() {
-        setUpdatedTime_ExtendedStats(null);
+    public void setTerm_Count() {
+        setTerm_Count(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        setUpdatedTime_ExtendedStats("updatedTime", opLambda);
+    public void setTerm_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setTerm_Count("term", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setTerm_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "term");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_Stats() {
-        setUpdatedTime_Stats(null);
+    public void setTerm_Cardinality() {
+        setTerm_Cardinality(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        setUpdatedTime_Stats("updatedTime", opLambda);
+    public void setTerm_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setTerm_Cardinality("term", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
+    public void setTerm_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "term");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_Percentiles() {
-        setUpdatedTime_Percentiles(null);
+    public void setTerm_Missing() {
+        setTerm_Missing(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        setUpdatedTime_Percentiles("updatedTime", opLambda);
+    public void setTerm_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setTerm_Missing("term", opLambda, null);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setTerm_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        setTerm_Missing("term", opLambda, aggsLambda);
+    }
+
+    public void setTerm_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "term");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            RelatedQueryCA ca = new RelatedQueryCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setUpdatedBy_Terms() {
+        setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            RelatedQueryCA ca = new RelatedQueryCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setUpdatedTime_Histogram() {
-        setUpdatedTime_Histogram(null);
+    public void setUpdatedBy_SignificantTerms() {
+        setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
-        setUpdatedTime_Histogram("updatedTime", opLambda, null);
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
+        setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -740,21 +775,21 @@ public abstract class BsRelatedQueryCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_Range() {
-        setUpdatedTime_Range(null);
+    public void setUpdatedBy_IpRange() {
+        setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
-        setUpdatedTime_Range("updatedTime", opLambda, null);
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -765,51 +800,51 @@ public abstract class BsRelatedQueryCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_Count() {
-        setUpdatedTime_Count(null);
+    public void setUpdatedBy_Count() {
+        setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setUpdatedTime_Count("updatedTime", opLambda);
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_Cardinality() {
-        setUpdatedTime_Cardinality(null);
+    public void setUpdatedBy_Cardinality() {
+        setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setUpdatedTime_Cardinality("updatedTime", opLambda);
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
+    public void setUpdatedBy_Missing() {
+        setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setUpdatedTime_Missing("updatedTime", opLambda, null);
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -820,177 +855,142 @@ public abstract class BsRelatedQueryCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTerm_Terms() {
-        setTerm_Terms(null);
-    }
-
-    public void setTerm_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setTerm_Terms("term", opLambda, null);
+    public void setUpdatedTime_Avg() {
+        setUpdatedTime_Avg(null);
     }
 
-    public void setTerm_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setTerm_Terms("term", opLambda, aggsLambda);
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setTerm_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "term");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            RelatedQueryCA ca = new RelatedQueryCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setTerm_SignificantTerms() {
-        setTerm_SignificantTerms(null);
     }
 
-    public void setTerm_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setTerm_SignificantTerms("term", opLambda, null);
+    public void setUpdatedTime_Max() {
+        setUpdatedTime_Max(null);
     }
 
-    public void setTerm_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setTerm_SignificantTerms("term", opLambda, aggsLambda);
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setTerm_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "term");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            RelatedQueryCA ca = new RelatedQueryCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setTerm_IpRange() {
-        setTerm_IpRange(null);
-    }
-
-    public void setTerm_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setTerm_IpRange("term", opLambda, null);
+    public void setUpdatedTime_Min() {
+        setUpdatedTime_Min(null);
     }
 
-    public void setTerm_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setTerm_IpRange("term", opLambda, aggsLambda);
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setTerm_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "term");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            RelatedQueryCA ca = new RelatedQueryCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setTerm_Count() {
-        setTerm_Count(null);
+    public void setUpdatedTime_Sum() {
+        setUpdatedTime_Sum(null);
     }
 
-    public void setTerm_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setTerm_Count("term", opLambda);
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setTerm_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "term");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_Cardinality() {
-        setTerm_Cardinality(null);
+    public void setUpdatedTime_ExtendedStats() {
+        setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setTerm_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setTerm_Cardinality("term", opLambda);
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setTerm_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "term");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_Missing() {
-        setTerm_Missing(null);
-    }
-
-    public void setTerm_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setTerm_Missing("term", opLambda, null);
+    public void setUpdatedTime_Stats() {
+        setUpdatedTime_Stats(null);
     }
 
-    public void setTerm_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setTerm_Missing("term", opLambda, aggsLambda);
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setTerm_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "term");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            RelatedQueryCA ca = new RelatedQueryCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setQueries_Terms() {
-        setQueries_Terms(null);
+    public void setUpdatedTime_Percentiles() {
+        setUpdatedTime_Percentiles(null);
     }
 
-    public void setQueries_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setQueries_Terms("queries", opLambda, null);
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setQueries_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setQueries_Terms("queries", opLambda, aggsLambda);
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setQueries_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "queries");
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
+    }
+
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
+    }
+
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            RelatedQueryCA ca = new RelatedQueryCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setQueries_SignificantTerms() {
-        setQueries_SignificantTerms(null);
+    public void setUpdatedTime_Histogram() {
+        setUpdatedTime_Histogram(null);
     }
 
-    public void setQueries_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setQueries_SignificantTerms("queries", opLambda, null);
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
+        setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setQueries_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setQueries_SignificantTerms("queries", opLambda, aggsLambda);
+        setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setQueries_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "queries");
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1001,21 +1001,21 @@ public abstract class BsRelatedQueryCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setQueries_IpRange() {
-        setQueries_IpRange(null);
+    public void setUpdatedTime_Range() {
+        setUpdatedTime_Range(null);
     }
 
-    public void setQueries_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setQueries_IpRange("queries", opLambda, null);
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
+        setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setQueries_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setQueries_IpRange("queries", opLambda, aggsLambda);
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setQueries_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
             OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "queries");
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1026,51 +1026,51 @@ public abstract class BsRelatedQueryCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setQueries_Count() {
-        setQueries_Count(null);
+    public void setUpdatedTime_Count() {
+        setUpdatedTime_Count(null);
     }
 
-    public void setQueries_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setQueries_Count("queries", opLambda);
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setQueries_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "queries");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueries_Cardinality() {
-        setQueries_Cardinality(null);
+    public void setUpdatedTime_Cardinality() {
+        setUpdatedTime_Cardinality(null);
     }
 
-    public void setQueries_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setQueries_Cardinality("queries", opLambda);
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setQueries_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "queries");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueries_Missing() {
-        setQueries_Missing(null);
+    public void setUpdatedTime_Missing() {
+        setUpdatedTime_Missing(null);
     }
 
-    public void setQueries_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setQueries_Missing("queries", opLambda, null);
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setQueries_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        setQueries_Missing("queries", opLambda, aggsLambda);
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
+        setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setQueries_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsRelatedQueryCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "queries");
+        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 1971f5b8452462c9fa846e4a2a741159e88a8c18..05ab6c120d10c601dcfb0b12118901b3418e208f 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -342,16 +342,16 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -829,16 +829,16 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         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 21476605c4e0d94d69bee60290fe6f1912f259a6..400c0f585c5109b0492eca94aaa08ff5643b9929 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -341,16 +341,16 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -694,16 +694,16 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSortOrder_PercentileRanks() {
-        setSortOrder_PercentileRanks(null);
+    public void setSortOrder_PercentileRanks(double[] values) {
+        setSortOrder_PercentileRanks(values, null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setSortOrder_PercentileRanks("sortOrder", opLambda);
+    public void setSortOrder_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setSortOrder_PercentileRanks("sortOrder", values, opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1048,16 +1048,16 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         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 c171770c254f260f25a583ece6db12409c69ec4d..f961012f9cb0cf747a785858ee3d53c7c301f721 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -211,16 +211,16 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setAvailable_PercentileRanks() {
-        setAvailable_PercentileRanks(null);
+    public void setAvailable_PercentileRanks(double[] values) {
+        setAvailable_PercentileRanks(values, null);
     }
 
-    public void setAvailable_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setAvailable_PercentileRanks("available", opLambda);
+    public void setAvailable_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setAvailable_PercentileRanks("available", values, opLambda);
     }
 
-    public void setAvailable_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available");
+    public void setAvailable_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -436,16 +436,16 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCrawler_PercentileRanks() {
-        setCrawler_PercentileRanks(null);
+    public void setCrawler_PercentileRanks(double[] values) {
+        setCrawler_PercentileRanks(values, null);
     }
 
-    public void setCrawler_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCrawler_PercentileRanks("crawler", opLambda);
+    public void setCrawler_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCrawler_PercentileRanks("crawler", values, opLambda);
     }
 
-    public void setCrawler_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "crawler");
+    public void setCrawler_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "crawler", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -792,16 +792,16 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1149,16 +1149,16 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setJobLogging_PercentileRanks() {
-        setJobLogging_PercentileRanks(null);
+    public void setJobLogging_PercentileRanks(double[] values) {
+        setJobLogging_PercentileRanks(values, null);
     }
 
-    public void setJobLogging_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setJobLogging_PercentileRanks("jobLogging", opLambda);
+    public void setJobLogging_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setJobLogging_PercentileRanks("jobLogging", values, opLambda);
     }
 
-    public void setJobLogging_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "jobLogging");
+    public void setJobLogging_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "jobLogging", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1766,16 +1766,16 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSortOrder_PercentileRanks() {
-        setSortOrder_PercentileRanks(null);
+    public void setSortOrder_PercentileRanks(double[] values) {
+        setSortOrder_PercentileRanks(values, null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setSortOrder_PercentileRanks("sortOrder", opLambda);
+    public void setSortOrder_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setSortOrder_PercentileRanks("sortOrder", values, opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2253,16 +2253,16 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         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 feb8796240475b91c00f307a9b6982360f01eb22..978fc47f47a7a5403dda57835809d851e7dbc9bb 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -342,16 +342,16 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -463,21 +463,21 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setTarget_Terms() {
-        setTarget_Terms(null);
+    public void setGenerator_Terms() {
+        setGenerator_Terms(null);
     }
 
-    public void setTarget_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setTarget_Terms("target", opLambda, null);
+    public void setGenerator_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setGenerator_Terms("generator", opLambda, null);
     }
 
-    public void setTarget_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setTarget_Terms("target", opLambda, aggsLambda);
+    public void setGenerator_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        setGenerator_Terms("generator", opLambda, aggsLambda);
     }
 
-    public void setTarget_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+    public void setGenerator_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "target");
+        TermsAggregationBuilder builder = regTermsA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -488,22 +488,22 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setTarget_SignificantTerms() {
-        setTarget_SignificantTerms(null);
+    public void setGenerator_SignificantTerms() {
+        setGenerator_SignificantTerms(null);
     }
 
-    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setTarget_SignificantTerms("target", opLambda, null);
+    public void setGenerator_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setGenerator_SignificantTerms("generator", opLambda, null);
     }
 
-    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setGenerator_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setTarget_SignificantTerms("target", opLambda, aggsLambda);
+        setGenerator_SignificantTerms("generator", opLambda, aggsLambda);
     }
 
-    public void setTarget_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setGenerator_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "target");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -514,21 +514,21 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setTarget_IpRange() {
-        setTarget_IpRange(null);
+    public void setGenerator_IpRange() {
+        setGenerator_IpRange(null);
     }
 
-    public void setTarget_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setTarget_IpRange("target", opLambda, null);
+    public void setGenerator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setGenerator_IpRange("generator", opLambda, null);
     }
 
-    public void setTarget_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setTarget_IpRange("target", opLambda, aggsLambda);
+    public void setGenerator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        setGenerator_IpRange("generator", opLambda, aggsLambda);
     }
 
-    public void setTarget_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setGenerator_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "target");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -539,51 +539,51 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setTarget_Count() {
-        setTarget_Count(null);
+    public void setGenerator_Count() {
+        setGenerator_Count(null);
     }
 
-    public void setTarget_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setTarget_Count("target", opLambda);
+    public void setGenerator_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setGenerator_Count("generator", opLambda);
     }
 
-    public void setTarget_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "target");
+    public void setGenerator_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_Cardinality() {
-        setTarget_Cardinality(null);
+    public void setGenerator_Cardinality() {
+        setGenerator_Cardinality(null);
     }
 
-    public void setTarget_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setTarget_Cardinality("target", opLambda);
+    public void setGenerator_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setGenerator_Cardinality("generator", opLambda);
     }
 
-    public void setTarget_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "target");
+    public void setGenerator_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_Missing() {
-        setTarget_Missing(null);
+    public void setGenerator_Missing() {
+        setGenerator_Missing(null);
     }
 
-    public void setTarget_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setTarget_Missing("target", opLambda, null);
+    public void setGenerator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setGenerator_Missing("generator", opLambda, null);
     }
 
-    public void setTarget_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setTarget_Missing("target", opLambda, aggsLambda);
+    public void setGenerator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        setGenerator_Missing("generator", opLambda, aggsLambda);
     }
 
-    public void setTarget_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setGenerator_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "target");
+        MissingAggregationBuilder builder = regMissingA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -594,21 +594,21 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setGenerator_Terms() {
-        setGenerator_Terms(null);
+    public void setPath_Terms() {
+        setPath_Terms(null);
     }
 
-    public void setGenerator_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setGenerator_Terms("generator", opLambda, null);
+    public void setPath_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setPath_Terms("path", opLambda, null);
     }
 
-    public void setGenerator_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setGenerator_Terms("generator", opLambda, aggsLambda);
+    public void setPath_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        setPath_Terms("path", opLambda, aggsLambda);
     }
 
-    public void setGenerator_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+    public void setPath_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "generator");
+        TermsAggregationBuilder builder = regTermsA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -619,22 +619,22 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setGenerator_SignificantTerms() {
-        setGenerator_SignificantTerms(null);
+    public void setPath_SignificantTerms() {
+        setPath_SignificantTerms(null);
     }
 
-    public void setGenerator_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setGenerator_SignificantTerms("generator", opLambda, null);
+    public void setPath_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setPath_SignificantTerms("path", opLambda, null);
     }
 
-    public void setGenerator_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setPath_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setGenerator_SignificantTerms("generator", opLambda, aggsLambda);
+        setPath_SignificantTerms("path", opLambda, aggsLambda);
     }
 
-    public void setGenerator_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setPath_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "generator");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -645,21 +645,21 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setGenerator_IpRange() {
-        setGenerator_IpRange(null);
+    public void setPath_IpRange() {
+        setPath_IpRange(null);
     }
 
-    public void setGenerator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setGenerator_IpRange("generator", opLambda, null);
+    public void setPath_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setPath_IpRange("path", opLambda, null);
     }
 
-    public void setGenerator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setGenerator_IpRange("generator", opLambda, aggsLambda);
+    public void setPath_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        setPath_IpRange("path", opLambda, aggsLambda);
     }
 
-    public void setGenerator_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setPath_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "generator");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -670,51 +670,51 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setGenerator_Count() {
-        setGenerator_Count(null);
+    public void setPath_Count() {
+        setPath_Count(null);
     }
 
-    public void setGenerator_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setGenerator_Count("generator", opLambda);
+    public void setPath_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setPath_Count("path", opLambda);
     }
 
-    public void setGenerator_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "generator");
+    public void setPath_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_Cardinality() {
-        setGenerator_Cardinality(null);
+    public void setPath_Cardinality() {
+        setPath_Cardinality(null);
     }
 
-    public void setGenerator_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setGenerator_Cardinality("generator", opLambda);
+    public void setPath_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setPath_Cardinality("path", opLambda);
     }
 
-    public void setGenerator_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "generator");
+    public void setPath_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_Missing() {
-        setGenerator_Missing(null);
+    public void setPath_Missing() {
+        setPath_Missing(null);
     }
 
-    public void setGenerator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setGenerator_Missing("generator", opLambda, null);
+    public void setPath_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setPath_Missing("path", opLambda, null);
     }
 
-    public void setGenerator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setGenerator_Missing("generator", opLambda, aggsLambda);
+    public void setPath_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        setPath_Missing("path", opLambda, aggsLambda);
     }
 
-    public void setGenerator_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setPath_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "generator");
+        MissingAggregationBuilder builder = regMissingA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -725,21 +725,21 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setThumbnailId_Terms() {
-        setThumbnailId_Terms(null);
+    public void setTarget_Terms() {
+        setTarget_Terms(null);
     }
 
-    public void setThumbnailId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setThumbnailId_Terms("thumbnail_id", opLambda, null);
+    public void setTarget_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setTarget_Terms("target", opLambda, null);
     }
 
-    public void setThumbnailId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setThumbnailId_Terms("thumbnail_id", opLambda, aggsLambda);
+    public void setTarget_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        setTarget_Terms("target", opLambda, aggsLambda);
     }
 
-    public void setThumbnailId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+    public void setTarget_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "thumbnail_id");
+        TermsAggregationBuilder builder = regTermsA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -750,22 +750,22 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setThumbnailId_SignificantTerms() {
-        setThumbnailId_SignificantTerms(null);
+    public void setTarget_SignificantTerms() {
+        setTarget_SignificantTerms(null);
     }
 
-    public void setThumbnailId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setThumbnailId_SignificantTerms("thumbnail_id", opLambda, null);
+    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setTarget_SignificantTerms("target", opLambda, null);
     }
 
-    public void setThumbnailId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setThumbnailId_SignificantTerms("thumbnail_id", opLambda, aggsLambda);
+        setTarget_SignificantTerms("target", opLambda, aggsLambda);
     }
 
-    public void setThumbnailId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setTarget_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "thumbnail_id");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -776,21 +776,21 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setThumbnailId_IpRange() {
-        setThumbnailId_IpRange(null);
+    public void setTarget_IpRange() {
+        setTarget_IpRange(null);
     }
 
-    public void setThumbnailId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setThumbnailId_IpRange("thumbnail_id", opLambda, null);
+    public void setTarget_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setTarget_IpRange("target", opLambda, null);
     }
 
-    public void setThumbnailId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setThumbnailId_IpRange("thumbnail_id", opLambda, aggsLambda);
+    public void setTarget_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        setTarget_IpRange("target", opLambda, aggsLambda);
     }
 
-    public void setThumbnailId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setTarget_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "thumbnail_id");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -801,51 +801,51 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setThumbnailId_Count() {
-        setThumbnailId_Count(null);
+    public void setTarget_Count() {
+        setTarget_Count(null);
     }
 
-    public void setThumbnailId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setThumbnailId_Count("thumbnail_id", opLambda);
+    public void setTarget_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setTarget_Count("target", opLambda);
     }
 
-    public void setThumbnailId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "thumbnail_id");
+    public void setTarget_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setThumbnailId_Cardinality() {
-        setThumbnailId_Cardinality(null);
+    public void setTarget_Cardinality() {
+        setTarget_Cardinality(null);
     }
 
-    public void setThumbnailId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setThumbnailId_Cardinality("thumbnail_id", opLambda);
+    public void setTarget_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setTarget_Cardinality("target", opLambda);
     }
 
-    public void setThumbnailId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "thumbnail_id");
+    public void setTarget_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setThumbnailId_Missing() {
-        setThumbnailId_Missing(null);
+    public void setTarget_Missing() {
+        setTarget_Missing(null);
     }
 
-    public void setThumbnailId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setThumbnailId_Missing("thumbnail_id", opLambda, null);
+    public void setTarget_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setTarget_Missing("target", opLambda, null);
     }
 
-    public void setThumbnailId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setThumbnailId_Missing("thumbnail_id", opLambda, aggsLambda);
+    public void setTarget_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        setTarget_Missing("target", opLambda, aggsLambda);
     }
 
-    public void setThumbnailId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setTarget_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "thumbnail_id");
+        MissingAggregationBuilder builder = regMissingA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -856,21 +856,21 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setPath_Terms() {
-        setPath_Terms(null);
+    public void setThumbnailId_Terms() {
+        setThumbnailId_Terms(null);
     }
 
-    public void setPath_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setPath_Terms("path", opLambda, null);
+    public void setThumbnailId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setThumbnailId_Terms("thumbnail_id", opLambda, null);
     }
 
-    public void setPath_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setPath_Terms("path", opLambda, aggsLambda);
+    public void setThumbnailId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        setThumbnailId_Terms("thumbnail_id", opLambda, aggsLambda);
     }
 
-    public void setPath_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+    public void setThumbnailId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "path");
+        TermsAggregationBuilder builder = regTermsA(name, "thumbnail_id");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -881,22 +881,22 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setPath_SignificantTerms() {
-        setPath_SignificantTerms(null);
+    public void setThumbnailId_SignificantTerms() {
+        setThumbnailId_SignificantTerms(null);
     }
 
-    public void setPath_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setPath_SignificantTerms("path", opLambda, null);
+    public void setThumbnailId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setThumbnailId_SignificantTerms("thumbnail_id", opLambda, null);
     }
 
-    public void setPath_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setThumbnailId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setPath_SignificantTerms("path", opLambda, aggsLambda);
+        setThumbnailId_SignificantTerms("thumbnail_id", opLambda, aggsLambda);
     }
 
-    public void setPath_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setThumbnailId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "path");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "thumbnail_id");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -907,21 +907,21 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setPath_IpRange() {
-        setPath_IpRange(null);
+    public void setThumbnailId_IpRange() {
+        setThumbnailId_IpRange(null);
     }
 
-    public void setPath_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setPath_IpRange("path", opLambda, null);
+    public void setThumbnailId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setThumbnailId_IpRange("thumbnail_id", opLambda, null);
     }
 
-    public void setPath_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setPath_IpRange("path", opLambda, aggsLambda);
+    public void setThumbnailId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        setThumbnailId_IpRange("thumbnail_id", opLambda, aggsLambda);
     }
 
-    public void setPath_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setThumbnailId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "path");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "thumbnail_id");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -932,51 +932,51 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void setPath_Count() {
-        setPath_Count(null);
+    public void setThumbnailId_Count() {
+        setThumbnailId_Count(null);
     }
 
-    public void setPath_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setPath_Count("path", opLambda);
+    public void setThumbnailId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setThumbnailId_Count("thumbnail_id", opLambda);
     }
 
-    public void setPath_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "path");
+    public void setThumbnailId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "thumbnail_id");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPath_Cardinality() {
-        setPath_Cardinality(null);
+    public void setThumbnailId_Cardinality() {
+        setThumbnailId_Cardinality(null);
     }
 
-    public void setPath_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setPath_Cardinality("path", opLambda);
+    public void setThumbnailId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setThumbnailId_Cardinality("thumbnail_id", opLambda);
     }
 
-    public void setPath_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "path");
+    public void setThumbnailId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "thumbnail_id");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPath_Missing() {
-        setPath_Missing(null);
+    public void setThumbnailId_Missing() {
+        setThumbnailId_Missing(null);
     }
 
-    public void setPath_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setPath_Missing("path", opLambda, null);
+    public void setThumbnailId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setThumbnailId_Missing("thumbnail_id", opLambda, null);
     }
 
-    public void setPath_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        setPath_Missing("path", opLambda, aggsLambda);
+    public void setThumbnailId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        setThumbnailId_Missing("thumbnail_id", opLambda, aggsLambda);
     }
 
-    public void setPath_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setThumbnailId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "path");
+        MissingAggregationBuilder builder = regMissingA(name, "thumbnail_id");
         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 d3ef6af6c40807422d203d25cc7dfe942bc856dd..c61e581f7ef4fb01805911b46140a700850aa62d 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -473,16 +473,16 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1095,16 +1095,16 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void setPort_PercentileRanks() {
-        setPort_PercentileRanks(null);
+    public void setPort_PercentileRanks(double[] values) {
+        setPort_PercentileRanks(values, null);
     }
 
-    public void setPort_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setPort_PercentileRanks("port", opLambda);
+    public void setPort_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setPort_PercentileRanks("port", values, opLambda);
     }
 
-    public void setPort_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "port");
+    public void setPort_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "port", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1585,16 +1585,16 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         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 443809ae0674e582e0732c4278c9a1b8de84f79b..b73a9507524e59f6bebbd9b8cf41eadbdd0cb17a 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -211,16 +211,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setAvailable_PercentileRanks() {
-        setAvailable_PercentileRanks(null);
+    public void setAvailable_PercentileRanks(double[] values) {
+        setAvailable_PercentileRanks(values, null);
     }
 
-    public void setAvailable_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setAvailable_PercentileRanks("available", opLambda);
+    public void setAvailable_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setAvailable_PercentileRanks("available", values, opLambda);
     }
 
-    public void setAvailable_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available");
+    public void setAvailable_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -436,16 +436,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setBoost_PercentileRanks() {
-        setBoost_PercentileRanks(null);
+    public void setBoost_PercentileRanks(double[] values) {
+        setBoost_PercentileRanks(values, null);
     }
 
-    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setBoost_PercentileRanks("boost", opLambda);
+    public void setBoost_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setBoost_PercentileRanks("boost", values, opLambda);
     }
 
-    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost");
+    public void setBoost_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -922,16 +922,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCreatedTime_PercentileRanks() {
-        setCreatedTime_PercentileRanks(null);
+    public void setCreatedTime_PercentileRanks(double[] values) {
+        setCreatedTime_PercentileRanks(values, null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setCreatedTime_PercentileRanks("createdTime", opLambda);
+    public void setCreatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setCreatedTime_PercentileRanks("createdTime", values, opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1147,16 +1147,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDepth_PercentileRanks() {
-        setDepth_PercentileRanks(null);
+    public void setDepth_PercentileRanks(double[] values) {
+        setDepth_PercentileRanks(values, null);
     }
 
-    public void setDepth_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setDepth_PercentileRanks("depth", opLambda);
+    public void setDepth_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setDepth_PercentileRanks("depth", values, opLambda);
     }
 
-    public void setDepth_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "depth");
+    public void setDepth_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "depth", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1950,16 +1950,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setIntervalTime_PercentileRanks() {
-        setIntervalTime_PercentileRanks(null);
+    public void setIntervalTime_PercentileRanks(double[] values) {
+        setIntervalTime_PercentileRanks(values, null);
     }
 
-    public void setIntervalTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setIntervalTime_PercentileRanks("intervalTime", opLambda);
+    public void setIntervalTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setIntervalTime_PercentileRanks("intervalTime", values, opLambda);
     }
 
-    public void setIntervalTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "intervalTime");
+    public void setIntervalTime_PercentileRanks(String name, double[] values,
+            ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "intervalTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2070,231 +2071,6 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTimeToLive_Avg() {
-        setTimeToLive_Avg(null);
-    }
-
-    public void setTimeToLive_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        setTimeToLive_Avg("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        AvgAggregationBuilder builder = regAvgA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Max() {
-        setTimeToLive_Max(null);
-    }
-
-    public void setTimeToLive_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        setTimeToLive_Max("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        MaxAggregationBuilder builder = regMaxA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Min() {
-        setTimeToLive_Min(null);
-    }
-
-    public void setTimeToLive_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        setTimeToLive_Min("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        MinAggregationBuilder builder = regMinA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Sum() {
-        setTimeToLive_Sum(null);
-    }
-
-    public void setTimeToLive_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        setTimeToLive_Sum("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        SumAggregationBuilder builder = regSumA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_ExtendedStats() {
-        setTimeToLive_ExtendedStats(null);
-    }
-
-    public void setTimeToLive_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        setTimeToLive_ExtendedStats("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Stats() {
-        setTimeToLive_Stats(null);
-    }
-
-    public void setTimeToLive_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        setTimeToLive_Stats("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        StatsAggregationBuilder builder = regStatsA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Percentiles() {
-        setTimeToLive_Percentiles(null);
-    }
-
-    public void setTimeToLive_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        setTimeToLive_Percentiles("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        PercentilesAggregationBuilder builder = regPercentilesA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_PercentileRanks() {
-        setTimeToLive_PercentileRanks(null);
-    }
-
-    public void setTimeToLive_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setTimeToLive_PercentileRanks("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Histogram() {
-        setTimeToLive_Histogram(null);
-    }
-
-    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
-        setTimeToLive_Histogram("timeToLive", opLambda, null);
-    }
-
-    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        setTimeToLive_Histogram("timeToLive", opLambda, aggsLambda);
-    }
-
-    public void setTimeToLive_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
-            OperatorCall<BsWebConfigCA> aggsLambda) {
-        HistogramAggregationBuilder builder = regHistogramA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            WebConfigCA ca = new WebConfigCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setTimeToLive_Range() {
-        setTimeToLive_Range(null);
-    }
-
-    public void setTimeToLive_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
-        setTimeToLive_Range("timeToLive", opLambda, null);
-    }
-
-    public void setTimeToLive_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        setTimeToLive_Range("timeToLive", opLambda, aggsLambda);
-    }
-
-    public void setTimeToLive_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
-            OperatorCall<BsWebConfigCA> aggsLambda) {
-        RangeAggregationBuilder builder = regRangeA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            WebConfigCA ca = new WebConfigCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setTimeToLive_Count() {
-        setTimeToLive_Count(null);
-    }
-
-    public void setTimeToLive_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setTimeToLive_Count("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Cardinality() {
-        setTimeToLive_Cardinality(null);
-    }
-
-    public void setTimeToLive_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setTimeToLive_Cardinality("timeToLive", opLambda);
-    }
-
-    public void setTimeToLive_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Missing() {
-        setTimeToLive_Missing(null);
-    }
-
-    public void setTimeToLive_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setTimeToLive_Missing("timeToLive", opLambda, null);
-    }
-
-    public void setTimeToLive_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        setTimeToLive_Missing("timeToLive", opLambda, aggsLambda);
-    }
-
-    public void setTimeToLive_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            WebConfigCA ca = new WebConfigCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
     public void setMaxAccessCount_Avg() {
         setMaxAccessCount_Avg(null);
     }
@@ -2400,16 +2176,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setMaxAccessCount_PercentileRanks() {
-        setMaxAccessCount_PercentileRanks(null);
+    public void setMaxAccessCount_PercentileRanks(double[] values) {
+        setMaxAccessCount_PercentileRanks(values, null);
     }
 
-    public void setMaxAccessCount_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setMaxAccessCount_PercentileRanks("maxAccessCount", opLambda);
+    public void setMaxAccessCount_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setMaxAccessCount_PercentileRanks("maxAccessCount", values, opLambda);
     }
 
-    public void setMaxAccessCount_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "maxAccessCount");
+    public void setMaxAccessCount_PercentileRanks(String name, double[] values,
+            ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "maxAccessCount", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2754,16 +2531,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setNumOfThread_PercentileRanks() {
-        setNumOfThread_PercentileRanks(null);
+    public void setNumOfThread_PercentileRanks(double[] values) {
+        setNumOfThread_PercentileRanks(values, null);
     }
 
-    public void setNumOfThread_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setNumOfThread_PercentileRanks("numOfThread", opLambda);
+    public void setNumOfThread_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setNumOfThread_PercentileRanks("numOfThread", values, opLambda);
     }
 
-    public void setNumOfThread_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "numOfThread");
+    public void setNumOfThread_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "numOfThread", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3110,16 +2887,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSortOrder_PercentileRanks() {
-        setSortOrder_PercentileRanks(null);
+    public void setSortOrder_PercentileRanks(double[] values) {
+        setSortOrder_PercentileRanks(values, null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setSortOrder_PercentileRanks("sortOrder", opLambda);
+    public void setSortOrder_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setSortOrder_PercentileRanks("sortOrder", values, opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3230,6 +3007,231 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
+    public void setTimeToLive_Avg() {
+        setTimeToLive_Avg(null);
+    }
+
+    public void setTimeToLive_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        setTimeToLive_Avg("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Max() {
+        setTimeToLive_Max(null);
+    }
+
+    public void setTimeToLive_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        setTimeToLive_Max("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Min() {
+        setTimeToLive_Min(null);
+    }
+
+    public void setTimeToLive_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        setTimeToLive_Min("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Sum() {
+        setTimeToLive_Sum(null);
+    }
+
+    public void setTimeToLive_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        setTimeToLive_Sum("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_ExtendedStats() {
+        setTimeToLive_ExtendedStats(null);
+    }
+
+    public void setTimeToLive_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        setTimeToLive_ExtendedStats("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Stats() {
+        setTimeToLive_Stats(null);
+    }
+
+    public void setTimeToLive_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        setTimeToLive_Stats("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Percentiles() {
+        setTimeToLive_Percentiles(null);
+    }
+
+    public void setTimeToLive_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        setTimeToLive_Percentiles("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_PercentileRanks(double[] values) {
+        setTimeToLive_PercentileRanks(values, null);
+    }
+
+    public void setTimeToLive_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setTimeToLive_PercentileRanks("timeToLive", values, opLambda);
+    }
+
+    public void setTimeToLive_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "timeToLive", values);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Histogram() {
+        setTimeToLive_Histogram(null);
+    }
+
+    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
+        setTimeToLive_Histogram("timeToLive", opLambda, null);
+    }
+
+    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+        setTimeToLive_Histogram("timeToLive", opLambda, aggsLambda);
+    }
+
+    public void setTimeToLive_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            WebConfigCA ca = new WebConfigCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setTimeToLive_Range() {
+        setTimeToLive_Range(null);
+    }
+
+    public void setTimeToLive_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
+        setTimeToLive_Range("timeToLive", opLambda, null);
+    }
+
+    public void setTimeToLive_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+        setTimeToLive_Range("timeToLive", opLambda, aggsLambda);
+    }
+
+    public void setTimeToLive_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            WebConfigCA ca = new WebConfigCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setTimeToLive_Count() {
+        setTimeToLive_Count(null);
+    }
+
+    public void setTimeToLive_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setTimeToLive_Count("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Cardinality() {
+        setTimeToLive_Cardinality(null);
+    }
+
+    public void setTimeToLive_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setTimeToLive_Cardinality("timeToLive", opLambda);
+    }
+
+    public void setTimeToLive_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Missing() {
+        setTimeToLive_Missing(null);
+    }
+
+    public void setTimeToLive_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setTimeToLive_Missing("timeToLive", opLambda, null);
+    }
+
+    public void setTimeToLive_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+        setTimeToLive_Missing("timeToLive", opLambda, aggsLambda);
+    }
+
+    public void setTimeToLive_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            WebConfigCA ca = new WebConfigCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
@@ -3466,16 +3468,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUpdatedTime_PercentileRanks() {
-        setUpdatedTime_PercentileRanks(null);
+    public void setUpdatedTime_PercentileRanks(double[] values) {
+        setUpdatedTime_PercentileRanks(values, null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUpdatedTime_PercentileRanks("updatedTime", opLambda);
+    public void setUpdatedTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
         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 59e271f23c8a1f78774cddf2db13b558499b325b..8fff6a63476a44f8b01bbe7c93d4395ab41136a1 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
@@ -23,7 +23,7 @@ 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.GlobalAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
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 47a6a8ee3ff4c8f21956e4e2a0eedc25190bfc6e..d3fb2a52760e6bf0241c820f5c135b024a0cb1e2 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
@@ -23,7 +23,7 @@ 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.GlobalAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
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 e0fa14d6b0cda764ddec44d52b1cdf831bbdbe96..0e55ecc61650da8a214d13253852d3a123df3c2a 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
@@ -186,1469 +186,1469 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
+    public void setCreatedBy_Equal(String createdBy) {
+        setCreatedBy_Term(createdBy, null);
     }
 
-    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setName_Term(name, opLambda);
+    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setCreatedBy_Term(createdBy, opLambda);
     }
 
-    public void setName_Term(String name) {
-        setName_Term(name, null);
+    public void setCreatedBy_Term(String createdBy) {
+        setCreatedBy_Term(createdBy, null);
     }
 
-    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("name", name);
+    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_NotEqual(String name) {
-        setName_NotTerm(name, null);
+    public void setCreatedBy_NotEqual(String createdBy) {
+        setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setName_NotTerm(String name) {
-        setName_NotTerm(name, null);
+    public void setCreatedBy_NotTerm(String createdBy) {
+        setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setName_NotTerm(name, opLambda);
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
     }
 
-    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setName_Term(name), opLambda);
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
+    public void setCreatedBy_Terms(Collection<String> createdByList) {
+        setCreatedBy_Terms(createdByList, null);
     }
 
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("name", nameList);
+    public void setCreatedBy_Terms(Collection<String> createdByList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("createdBy", createdByList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
+    public void setCreatedBy_InScope(Collection<String> createdByList) {
+        setCreatedBy_Terms(createdByList, null);
     }
 
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
+    public void setCreatedBy_InScope(Collection<String> createdByList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setCreatedBy_Terms(createdByList, opLambda);
     }
 
-    public void setName_Match(String name) {
-        setName_Match(name, null);
+    public void setCreatedBy_Match(String createdBy) {
+        setCreatedBy_Match(createdBy, null);
     }
 
-    public void setName_Match(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("name", name);
+    public void setCreatedBy_Match(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_MatchPhrase(String name) {
-        setName_MatchPhrase(name, null);
+    public void setCreatedBy_MatchPhrase(String createdBy) {
+        setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_MatchPhrasePrefix(String name) {
-        setName_MatchPhrasePrefix(name, null);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy) {
+        setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Fuzzy(String name) {
-        setName_Fuzzy(name, null);
+    public void setCreatedBy_Fuzzy(String createdBy) {
+        setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("name", name);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
+    public void setCreatedBy_Prefix(String createdBy) {
+        setCreatedBy_Prefix(createdBy, null);
     }
 
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("name", name);
+    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Wildcard(String name) {
-        setName_Wildcard(name, null);
+    public void setCreatedBy_Wildcard(String createdBy) {
+        setCreatedBy_Wildcard(createdBy, null);
     }
 
-    public void setName_Wildcard(String name, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("name", name);
+    public void setCreatedBy_Wildcard(String createdBy, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Regexp(String name) {
-        setName_Regexp(name, null);
+    public void setCreatedBy_Regexp(String createdBy) {
+        setCreatedBy_Regexp(createdBy, null);
     }
 
-    public void setName_Regexp(String name, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("name", name);
+    public void setCreatedBy_Regexp(String createdBy, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_SpanTerm(String name) {
-        setName_SpanTerm("name", null);
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
     }
 
-    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
+    public void setCreatedBy_GreaterThan(String createdBy) {
+        setCreatedBy_GreaterThan(createdBy, null);
     }
 
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = name;
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
+    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
+    public void setCreatedBy_LessThan(String createdBy) {
+        setCreatedBy_LessThan(createdBy, null);
     }
 
-    public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = name;
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
+    public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
+    public void setCreatedBy_GreaterEqual(String createdBy) {
+        setCreatedBy_GreaterEqual(createdBy, null);
     }
 
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = name;
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
+    public void setCreatedBy_LessEqual(String createdBy) {
+        setCreatedBy_LessEqual(createdBy, null);
     }
 
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = name;
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Exists() {
-        setName_Exists(null);
+    public void setCreatedBy_Exists() {
+        setCreatedBy_Exists(null);
     }
 
-    public void setName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("name");
+    public void setCreatedBy_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_CommonTerms(String name) {
-        setName_CommonTerms(name, null);
+    public void setCreatedBy_CommonTerms(String createdBy) {
+        setCreatedBy_CommonTerms(createdBy, null);
     }
 
-    public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
+    public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsAccessTokenCQ addOrderBy_Name_Asc() {
-        regOBA("name");
+    public BsAccessTokenCQ addOrderBy_CreatedBy_Asc() {
+        regOBA("createdBy");
         return this;
     }
 
-    public BsAccessTokenCQ addOrderBy_Name_Desc() {
-        regOBD("name");
+    public BsAccessTokenCQ addOrderBy_CreatedBy_Desc() {
+        regOBD("createdBy");
         return this;
     }
 
-    public void setToken_Equal(String token) {
-        setToken_Term(token, null);
+    public void setCreatedTime_Equal(Long createdTime) {
+        setCreatedTime_Term(createdTime, null);
     }
 
-    public void setToken_Equal(String token, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setToken_Term(token, opLambda);
+    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setCreatedTime_Term(createdTime, opLambda);
     }
 
-    public void setToken_Term(String token) {
-        setToken_Term(token, null);
+    public void setCreatedTime_Term(Long createdTime) {
+        setCreatedTime_Term(createdTime, null);
     }
 
-    public void setToken_Term(String token, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("token", token);
+    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setToken_NotEqual(String token) {
-        setToken_NotTerm(token, null);
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setToken_NotTerm(String token) {
-        setToken_NotTerm(token, null);
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setToken_NotEqual(String token, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setToken_NotTerm(token, opLambda);
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
     }
 
-    public void setToken_NotTerm(String token, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setToken_Term(token), opLambda);
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
-    public void setToken_Terms(Collection<String> tokenList) {
-        setToken_Terms(tokenList, null);
+    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
+        setCreatedTime_Terms(createdTimeList, null);
     }
 
-    public void setToken_Terms(Collection<String> tokenList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("token", tokenList);
+    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("createdTime", createdTimeList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setToken_InScope(Collection<String> tokenList) {
-        setToken_Terms(tokenList, null);
+    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
+        setCreatedTime_Terms(createdTimeList, null);
     }
 
-    public void setToken_InScope(Collection<String> tokenList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setToken_Terms(tokenList, opLambda);
+    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setCreatedTime_Terms(createdTimeList, opLambda);
     }
 
-    public void setToken_Match(String token) {
-        setToken_Match(token, null);
+    public void setCreatedTime_Match(Long createdTime) {
+        setCreatedTime_Match(createdTime, null);
     }
 
-    public void setToken_Match(String token, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("token", token);
+    public void setCreatedTime_Match(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setToken_MatchPhrase(String token) {
-        setToken_MatchPhrase(token, null);
+    public void setCreatedTime_MatchPhrase(Long createdTime) {
+        setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setToken_MatchPhrase(String token, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("token", token);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setToken_MatchPhrasePrefix(String token) {
-        setToken_MatchPhrasePrefix(token, null);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime) {
+        setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setToken_MatchPhrasePrefix(String token, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("token", token);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setToken_Fuzzy(String token) {
-        setToken_Fuzzy(token, null);
+    public void setCreatedTime_Fuzzy(Long createdTime) {
+        setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setToken_Fuzzy(String token, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("token", token);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setToken_Prefix(String token) {
-        setToken_Prefix(token, null);
-    }
-
-    public void setToken_Prefix(String token, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("token", token);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setToken_Wildcard(String token) {
-        setToken_Wildcard(token, null);
-    }
-
-    public void setToken_Wildcard(String token, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("token", token);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setToken_Regexp(String token) {
-        setToken_Regexp(token, null);
-    }
-
-    public void setToken_Regexp(String token, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("token", token);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    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 setCreatedTime_GreaterThan(Long createdTime) {
+        setCreatedTime_GreaterThan(createdTime, null);
     }
 
-    public void setToken_GreaterThan(String token, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = token;
-        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_GREATER_THAN, _value);
+    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setToken_LessThan(String token) {
-        setToken_LessThan(token, null);
+    public void setCreatedTime_LessThan(Long createdTime) {
+        setCreatedTime_LessThan(createdTime, null);
     }
 
-    public void setToken_LessThan(String token, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = token;
-        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_LESS_THAN, _value);
+    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setToken_GreaterEqual(String token) {
-        setToken_GreaterEqual(token, null);
+    public void setCreatedTime_GreaterEqual(Long createdTime) {
+        setCreatedTime_GreaterEqual(createdTime, null);
     }
 
-    public void setToken_GreaterEqual(String token, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = token;
-        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setToken_LessEqual(String token) {
-        setToken_LessEqual(token, null);
+    public void setCreatedTime_LessEqual(Long createdTime) {
+        setCreatedTime_LessEqual(createdTime, null);
     }
 
-    public void setToken_LessEqual(String token, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = token;
-        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setToken_Exists() {
-        setToken_Exists(null);
+    public void setCreatedTime_Exists() {
+        setCreatedTime_Exists(null);
     }
 
-    public void setToken_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("token");
+    public void setCreatedTime_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setToken_CommonTerms(String token) {
-        setToken_CommonTerms(token, null);
+    public void setCreatedTime_CommonTerms(Long createdTime) {
+        setCreatedTime_CommonTerms(createdTime, null);
     }
 
-    public void setToken_CommonTerms(String token, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("token", token);
+    public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsAccessTokenCQ addOrderBy_Token_Asc() {
-        regOBA("token");
+    public BsAccessTokenCQ addOrderBy_CreatedTime_Asc() {
+        regOBA("createdTime");
         return this;
     }
 
-    public BsAccessTokenCQ addOrderBy_Token_Desc() {
-        regOBD("token");
+    public BsAccessTokenCQ addOrderBy_CreatedTime_Desc() {
+        regOBD("createdTime");
         return this;
     }
 
-    public void setPermissions_Equal(String permissions) {
-        setPermissions_Term(permissions, null);
-    }
-
-    public void setPermissions_Equal(String permissions, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setPermissions_Term(permissions, opLambda);
-    }
-
-    public void setPermissions_Term(String permissions) {
-        setPermissions_Term(permissions, null);
-    }
-
-    public void setPermissions_Term(String permissions, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("permissions", permissions);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_NotEqual(String permissions) {
-        setPermissions_NotTerm(permissions, null);
-    }
-
-    public void setPermissions_NotTerm(String permissions) {
-        setPermissions_NotTerm(permissions, null);
-    }
-
-    public void setPermissions_NotEqual(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setPermissions_NotTerm(permissions, opLambda);
+    public void setExpiredTime_Equal(Long expiredTime) {
+        setExpiredTime_Term(expiredTime, null);
     }
 
-    public void setPermissions_NotTerm(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setPermissions_Term(permissions), opLambda);
+    public void setExpiredTime_Equal(Long expiredTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setExpiredTime_Term(expiredTime, opLambda);
     }
 
-    public void setPermissions_Terms(Collection<String> permissionsList) {
-        setPermissions_Terms(permissionsList, null);
+    public void setExpiredTime_Term(Long expiredTime) {
+        setExpiredTime_Term(expiredTime, null);
     }
 
-    public void setPermissions_Terms(Collection<String> permissionsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("permissions", permissionsList);
+    public void setExpiredTime_Term(Long expiredTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("expiredTime", expiredTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPermissions_InScope(Collection<String> permissionsList) {
-        setPermissions_Terms(permissionsList, null);
-    }
-
-    public void setPermissions_InScope(Collection<String> permissionsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setPermissions_Terms(permissionsList, opLambda);
-    }
-
-    public void setPermissions_Match(String permissions) {
-        setPermissions_Match(permissions, null);
+    public void setExpiredTime_NotEqual(Long expiredTime) {
+        setExpiredTime_NotTerm(expiredTime, null);
     }
 
-    public void setPermissions_Match(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("permissions", permissions);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setExpiredTime_NotTerm(Long expiredTime) {
+        setExpiredTime_NotTerm(expiredTime, null);
     }
 
-    public void setPermissions_MatchPhrase(String permissions) {
-        setPermissions_MatchPhrase(permissions, null);
+    public void setExpiredTime_NotEqual(Long expiredTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setExpiredTime_NotTerm(expiredTime, opLambda);
     }
 
-    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setExpiredTime_NotTerm(Long expiredTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setExpiredTime_Term(expiredTime), opLambda);
     }
 
-    public void setPermissions_MatchPhrasePrefix(String permissions) {
-        setPermissions_MatchPhrasePrefix(permissions, null);
+    public void setExpiredTime_Terms(Collection<Long> expiredTimeList) {
+        setExpiredTime_Terms(expiredTimeList, null);
     }
 
-    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
+    public void setExpiredTime_Terms(Collection<Long> expiredTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("expiredTime", expiredTimeList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPermissions_Fuzzy(String permissions) {
-        setPermissions_Fuzzy(permissions, null);
+    public void setExpiredTime_InScope(Collection<Long> expiredTimeList) {
+        setExpiredTime_Terms(expiredTimeList, null);
     }
 
-    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("permissions", permissions);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setExpiredTime_InScope(Collection<Long> expiredTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setExpiredTime_Terms(expiredTimeList, opLambda);
     }
 
-    public void setPermissions_Prefix(String permissions) {
-        setPermissions_Prefix(permissions, null);
+    public void setExpiredTime_Match(Long expiredTime) {
+        setExpiredTime_Match(expiredTime, null);
     }
 
-    public void setPermissions_Prefix(String permissions, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("permissions", permissions);
+    public void setExpiredTime_Match(Long expiredTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("expiredTime", expiredTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPermissions_Wildcard(String permissions) {
-        setPermissions_Wildcard(permissions, null);
+    public void setExpiredTime_MatchPhrase(Long expiredTime) {
+        setExpiredTime_MatchPhrase(expiredTime, null);
     }
 
-    public void setPermissions_Wildcard(String permissions, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("permissions", permissions);
+    public void setExpiredTime_MatchPhrase(Long expiredTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("expiredTime", expiredTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPermissions_Regexp(String permissions) {
-        setPermissions_Regexp(permissions, null);
+    public void setExpiredTime_MatchPhrasePrefix(Long expiredTime) {
+        setExpiredTime_MatchPhrasePrefix(expiredTime, null);
     }
 
-    public void setPermissions_Regexp(String permissions, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("permissions", permissions);
+    public void setExpiredTime_MatchPhrasePrefix(Long expiredTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("expiredTime", expiredTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPermissions_SpanTerm(String permissions) {
-        setPermissions_SpanTerm("permissions", null);
+    public void setExpiredTime_Fuzzy(Long expiredTime) {
+        setExpiredTime_Fuzzy(expiredTime, null);
     }
 
-    public void setPermissions_SpanTerm(String permissions, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("permissions", permissions);
+    public void setExpiredTime_Fuzzy(Long expiredTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("expiredTime", expiredTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPermissions_GreaterThan(String permissions) {
-        setPermissions_GreaterThan(permissions, null);
+    public void setExpiredTime_GreaterThan(Long expiredTime) {
+        setExpiredTime_GreaterThan(expiredTime, null);
     }
 
-    public void setPermissions_GreaterThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = permissions;
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, _value);
+    public void setExpiredTime_GreaterThan(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = expiredTime;
+        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPermissions_LessThan(String permissions) {
-        setPermissions_LessThan(permissions, null);
+    public void setExpiredTime_LessThan(Long expiredTime) {
+        setExpiredTime_LessThan(expiredTime, null);
     }
 
-    public void setPermissions_LessThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = permissions;
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, _value);
+    public void setExpiredTime_LessThan(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = expiredTime;
+        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPermissions_GreaterEqual(String permissions) {
-        setPermissions_GreaterEqual(permissions, null);
+    public void setExpiredTime_GreaterEqual(Long expiredTime) {
+        setExpiredTime_GreaterEqual(expiredTime, null);
     }
 
-    public void setPermissions_GreaterEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = permissions;
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setExpiredTime_GreaterEqual(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = expiredTime;
+        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPermissions_LessEqual(String permissions) {
-        setPermissions_LessEqual(permissions, null);
+    public void setExpiredTime_LessEqual(Long expiredTime) {
+        setExpiredTime_LessEqual(expiredTime, null);
     }
 
-    public void setPermissions_LessEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = permissions;
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setExpiredTime_LessEqual(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = expiredTime;
+        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPermissions_Exists() {
-        setPermissions_Exists(null);
+    public void setExpiredTime_Exists() {
+        setExpiredTime_Exists(null);
     }
 
-    public void setPermissions_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("permissions");
+    public void setExpiredTime_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPermissions_CommonTerms(String permissions) {
-        setPermissions_CommonTerms(permissions, null);
+    public void setExpiredTime_CommonTerms(Long expiredTime) {
+        setExpiredTime_CommonTerms(expiredTime, null);
     }
 
-    public void setPermissions_CommonTerms(String permissions, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("permissions", permissions);
+    public void setExpiredTime_CommonTerms(Long expiredTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("expiredTime", expiredTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsAccessTokenCQ addOrderBy_Permissions_Asc() {
-        regOBA("permissions");
+    public BsAccessTokenCQ addOrderBy_ExpiredTime_Asc() {
+        regOBA("expiredTime");
         return this;
     }
 
-    public BsAccessTokenCQ addOrderBy_Permissions_Desc() {
-        regOBD("permissions");
+    public BsAccessTokenCQ addOrderBy_ExpiredTime_Desc() {
+        regOBD("expiredTime");
         return this;
     }
 
-    public void setParameterName_Equal(String parameterName) {
-        setParameterName_Term(parameterName, null);
+    public void setName_Equal(String name) {
+        setName_Term(name, null);
     }
 
-    public void setParameterName_Equal(String parameterName, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setParameterName_Term(parameterName, opLambda);
+    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setName_Term(name, opLambda);
     }
 
-    public void setParameterName_Term(String parameterName) {
-        setParameterName_Term(parameterName, null);
+    public void setName_Term(String name) {
+        setName_Term(name, null);
     }
 
-    public void setParameterName_Term(String parameterName, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("parameter_name", parameterName);
+    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_NotEqual(String parameterName) {
-        setParameterName_NotTerm(parameterName, null);
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public void setParameterName_NotTerm(String parameterName) {
-        setParameterName_NotTerm(parameterName, null);
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public void setParameterName_NotEqual(String parameterName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setParameterName_NotTerm(parameterName, opLambda);
+    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
     }
 
-    public void setParameterName_NotTerm(String parameterName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setParameterName_Term(parameterName), opLambda);
+    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setName_Term(name), opLambda);
     }
 
-    public void setParameterName_Terms(Collection<String> parameterNameList) {
-        setParameterName_Terms(parameterNameList, null);
+    public void setName_Terms(Collection<String> nameList) {
+        setName_Terms(nameList, null);
     }
 
-    public void setParameterName_Terms(Collection<String> parameterNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("parameter_name", parameterNameList);
+    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("name", nameList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_InScope(Collection<String> parameterNameList) {
-        setParameterName_Terms(parameterNameList, null);
+    public void setName_InScope(Collection<String> nameList) {
+        setName_Terms(nameList, null);
     }
 
-    public void setParameterName_InScope(Collection<String> parameterNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setParameterName_Terms(parameterNameList, opLambda);
+    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setName_Terms(nameList, opLambda);
     }
 
-    public void setParameterName_Match(String parameterName) {
-        setParameterName_Match(parameterName, null);
+    public void setName_Match(String name) {
+        setName_Match(name, null);
     }
 
-    public void setParameterName_Match(String parameterName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("parameter_name", parameterName);
+    public void setName_Match(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_MatchPhrase(String parameterName) {
-        setParameterName_MatchPhrase(parameterName, null);
+    public void setName_MatchPhrase(String name) {
+        setName_MatchPhrase(name, null);
     }
 
-    public void setParameterName_MatchPhrase(String parameterName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("parameter_name", parameterName);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_MatchPhrasePrefix(String parameterName) {
-        setParameterName_MatchPhrasePrefix(parameterName, null);
+    public void setName_MatchPhrasePrefix(String name) {
+        setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setParameterName_MatchPhrasePrefix(String parameterName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("parameter_name", parameterName);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_Fuzzy(String parameterName) {
-        setParameterName_Fuzzy(parameterName, null);
+    public void setName_Fuzzy(String name) {
+        setName_Fuzzy(name, null);
     }
 
-    public void setParameterName_Fuzzy(String parameterName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("parameter_name", parameterName);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_Prefix(String parameterName) {
-        setParameterName_Prefix(parameterName, null);
+    public void setName_Prefix(String name) {
+        setName_Prefix(name, null);
     }
 
-    public void setParameterName_Prefix(String parameterName, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("parameter_name", parameterName);
+    public void setName_Prefix(String name, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_Wildcard(String parameterName) {
-        setParameterName_Wildcard(parameterName, null);
+    public void setName_Wildcard(String name) {
+        setName_Wildcard(name, null);
     }
 
-    public void setParameterName_Wildcard(String parameterName, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("parameter_name", parameterName);
+    public void setName_Wildcard(String name, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_Regexp(String parameterName) {
-        setParameterName_Regexp(parameterName, null);
+    public void setName_Regexp(String name) {
+        setName_Regexp(name, null);
     }
 
-    public void setParameterName_Regexp(String parameterName, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("parameter_name", parameterName);
+    public void setName_Regexp(String name, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_SpanTerm(String parameterName) {
-        setParameterName_SpanTerm("parameter_name", null);
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
     }
 
-    public void setParameterName_SpanTerm(String parameterName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("parameter_name", parameterName);
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_GreaterThan(String parameterName) {
-        setParameterName_GreaterThan(parameterName, null);
+    public void setName_GreaterThan(String name) {
+        setName_GreaterThan(name, null);
     }
 
-    public void setParameterName_GreaterThan(String parameterName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = parameterName;
-        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_GREATER_THAN, _value);
+    public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_LessThan(String parameterName) {
-        setParameterName_LessThan(parameterName, null);
+    public void setName_LessThan(String name) {
+        setName_LessThan(name, null);
     }
 
-    public void setParameterName_LessThan(String parameterName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = parameterName;
-        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_LESS_THAN, _value);
+    public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_GreaterEqual(String parameterName) {
-        setParameterName_GreaterEqual(parameterName, null);
+    public void setName_GreaterEqual(String name) {
+        setName_GreaterEqual(name, null);
     }
 
-    public void setParameterName_GreaterEqual(String parameterName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = parameterName;
-        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_LessEqual(String parameterName) {
-        setParameterName_LessEqual(parameterName, null);
+    public void setName_LessEqual(String name) {
+        setName_LessEqual(name, null);
     }
 
-    public void setParameterName_LessEqual(String parameterName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = parameterName;
-        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_Exists() {
-        setParameterName_Exists(null);
+    public void setName_Exists() {
+        setName_Exists(null);
     }
 
-    public void setParameterName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("parameter_name");
+    public void setName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setParameterName_CommonTerms(String parameterName) {
-        setParameterName_CommonTerms(parameterName, null);
+    public void setName_CommonTerms(String name) {
+        setName_CommonTerms(name, null);
     }
 
-    public void setParameterName_CommonTerms(String parameterName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("parameter_name", parameterName);
+    public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsAccessTokenCQ addOrderBy_ParameterName_Asc() {
-        regOBA("parameter_name");
+    public BsAccessTokenCQ addOrderBy_Name_Asc() {
+        regOBA("name");
         return this;
     }
 
-    public BsAccessTokenCQ addOrderBy_ParameterName_Desc() {
-        regOBD("parameter_name");
+    public BsAccessTokenCQ addOrderBy_Name_Desc() {
+        regOBD("name");
         return this;
     }
 
-    public void setExpiredTime_Equal(Long expiredTime) {
-        setExpiredTime_Term(expiredTime, null);
+    public void setParameterName_Equal(String parameterName) {
+        setParameterName_Term(parameterName, null);
     }
 
-    public void setExpiredTime_Equal(Long expiredTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setExpiredTime_Term(expiredTime, opLambda);
+    public void setParameterName_Equal(String parameterName, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setParameterName_Term(parameterName, opLambda);
     }
 
-    public void setExpiredTime_Term(Long expiredTime) {
-        setExpiredTime_Term(expiredTime, null);
+    public void setParameterName_Term(String parameterName) {
+        setParameterName_Term(parameterName, null);
+    }
+
+    public void setParameterName_Term(String parameterName, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("parameter_name", parameterName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setParameterName_NotEqual(String parameterName) {
+        setParameterName_NotTerm(parameterName, null);
+    }
+
+    public void setParameterName_NotTerm(String parameterName) {
+        setParameterName_NotTerm(parameterName, null);
+    }
+
+    public void setParameterName_NotEqual(String parameterName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setParameterName_NotTerm(parameterName, opLambda);
+    }
+
+    public void setParameterName_NotTerm(String parameterName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setParameterName_Term(parameterName), opLambda);
+    }
+
+    public void setParameterName_Terms(Collection<String> parameterNameList) {
+        setParameterName_Terms(parameterNameList, null);
+    }
+
+    public void setParameterName_Terms(Collection<String> parameterNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("parameter_name", parameterNameList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setParameterName_InScope(Collection<String> parameterNameList) {
+        setParameterName_Terms(parameterNameList, null);
+    }
+
+    public void setParameterName_InScope(Collection<String> parameterNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setParameterName_Terms(parameterNameList, opLambda);
+    }
+
+    public void setParameterName_Match(String parameterName) {
+        setParameterName_Match(parameterName, null);
     }
 
-    public void setExpiredTime_Term(Long expiredTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("expiredTime", expiredTime);
+    public void setParameterName_Match(String parameterName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("parameter_name", parameterName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setExpiredTime_NotEqual(Long expiredTime) {
-        setExpiredTime_NotTerm(expiredTime, null);
-    }
-
-    public void setExpiredTime_NotTerm(Long expiredTime) {
-        setExpiredTime_NotTerm(expiredTime, null);
-    }
-
-    public void setExpiredTime_NotEqual(Long expiredTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setExpiredTime_NotTerm(expiredTime, opLambda);
+    public void setParameterName_MatchPhrase(String parameterName) {
+        setParameterName_MatchPhrase(parameterName, null);
     }
 
-    public void setExpiredTime_NotTerm(Long expiredTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setExpiredTime_Term(expiredTime), opLambda);
+    public void setParameterName_MatchPhrase(String parameterName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("parameter_name", parameterName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setExpiredTime_Terms(Collection<Long> expiredTimeList) {
-        setExpiredTime_Terms(expiredTimeList, null);
+    public void setParameterName_MatchPhrasePrefix(String parameterName) {
+        setParameterName_MatchPhrasePrefix(parameterName, null);
     }
 
-    public void setExpiredTime_Terms(Collection<Long> expiredTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("expiredTime", expiredTimeList);
+    public void setParameterName_MatchPhrasePrefix(String parameterName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("parameter_name", parameterName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setExpiredTime_InScope(Collection<Long> expiredTimeList) {
-        setExpiredTime_Terms(expiredTimeList, null);
+    public void setParameterName_Fuzzy(String parameterName) {
+        setParameterName_Fuzzy(parameterName, null);
     }
 
-    public void setExpiredTime_InScope(Collection<Long> expiredTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setExpiredTime_Terms(expiredTimeList, opLambda);
+    public void setParameterName_Fuzzy(String parameterName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("parameter_name", parameterName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setExpiredTime_Match(Long expiredTime) {
-        setExpiredTime_Match(expiredTime, null);
+    public void setParameterName_Prefix(String parameterName) {
+        setParameterName_Prefix(parameterName, null);
     }
 
-    public void setExpiredTime_Match(Long expiredTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("expiredTime", expiredTime);
+    public void setParameterName_Prefix(String parameterName, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("parameter_name", parameterName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setExpiredTime_MatchPhrase(Long expiredTime) {
-        setExpiredTime_MatchPhrase(expiredTime, null);
+    public void setParameterName_Wildcard(String parameterName) {
+        setParameterName_Wildcard(parameterName, null);
     }
 
-    public void setExpiredTime_MatchPhrase(Long expiredTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("expiredTime", expiredTime);
+    public void setParameterName_Wildcard(String parameterName, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("parameter_name", parameterName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setExpiredTime_MatchPhrasePrefix(Long expiredTime) {
-        setExpiredTime_MatchPhrasePrefix(expiredTime, null);
+    public void setParameterName_Regexp(String parameterName) {
+        setParameterName_Regexp(parameterName, null);
     }
 
-    public void setExpiredTime_MatchPhrasePrefix(Long expiredTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("expiredTime", expiredTime);
+    public void setParameterName_Regexp(String parameterName, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("parameter_name", parameterName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setExpiredTime_Fuzzy(Long expiredTime) {
-        setExpiredTime_Fuzzy(expiredTime, null);
+    public void setParameterName_SpanTerm(String parameterName) {
+        setParameterName_SpanTerm("parameter_name", null);
     }
 
-    public void setExpiredTime_Fuzzy(Long expiredTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("expiredTime", expiredTime);
+    public void setParameterName_SpanTerm(String parameterName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("parameter_name", parameterName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setExpiredTime_GreaterThan(Long expiredTime) {
-        setExpiredTime_GreaterThan(expiredTime, null);
+    public void setParameterName_GreaterThan(String parameterName) {
+        setParameterName_GreaterThan(parameterName, null);
     }
 
-    public void setExpiredTime_GreaterThan(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = expiredTime;
-        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_GREATER_THAN, _value);
+    public void setParameterName_GreaterThan(String parameterName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = parameterName;
+        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setExpiredTime_LessThan(Long expiredTime) {
-        setExpiredTime_LessThan(expiredTime, null);
+    public void setParameterName_LessThan(String parameterName) {
+        setParameterName_LessThan(parameterName, null);
     }
 
-    public void setExpiredTime_LessThan(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = expiredTime;
-        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_LESS_THAN, _value);
+    public void setParameterName_LessThan(String parameterName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = parameterName;
+        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setExpiredTime_GreaterEqual(Long expiredTime) {
-        setExpiredTime_GreaterEqual(expiredTime, null);
+    public void setParameterName_GreaterEqual(String parameterName) {
+        setParameterName_GreaterEqual(parameterName, null);
     }
 
-    public void setExpiredTime_GreaterEqual(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = expiredTime;
-        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setParameterName_GreaterEqual(String parameterName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = parameterName;
+        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setExpiredTime_LessEqual(Long expiredTime) {
-        setExpiredTime_LessEqual(expiredTime, null);
+    public void setParameterName_LessEqual(String parameterName) {
+        setParameterName_LessEqual(parameterName, null);
     }
 
-    public void setExpiredTime_LessEqual(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = expiredTime;
-        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setParameterName_LessEqual(String parameterName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = parameterName;
+        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setExpiredTime_Exists() {
-        setExpiredTime_Exists(null);
+    public void setParameterName_Exists() {
+        setParameterName_Exists(null);
     }
 
-    public void setExpiredTime_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("expiredTime");
+    public void setParameterName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("parameter_name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setExpiredTime_CommonTerms(Long expiredTime) {
-        setExpiredTime_CommonTerms(expiredTime, null);
+    public void setParameterName_CommonTerms(String parameterName) {
+        setParameterName_CommonTerms(parameterName, null);
     }
 
-    public void setExpiredTime_CommonTerms(Long expiredTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("expiredTime", expiredTime);
+    public void setParameterName_CommonTerms(String parameterName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("parameter_name", parameterName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsAccessTokenCQ addOrderBy_ExpiredTime_Asc() {
-        regOBA("expiredTime");
+    public BsAccessTokenCQ addOrderBy_ParameterName_Asc() {
+        regOBA("parameter_name");
         return this;
     }
 
-    public BsAccessTokenCQ addOrderBy_ExpiredTime_Desc() {
-        regOBD("expiredTime");
+    public BsAccessTokenCQ addOrderBy_ParameterName_Desc() {
+        regOBD("parameter_name");
         return this;
     }
 
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
+    public void setPermissions_Equal(String permissions) {
+        setPermissions_Term(permissions, null);
     }
 
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
+    public void setPermissions_Equal(String permissions, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setPermissions_Term(permissions, opLambda);
     }
 
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
+    public void setPermissions_Term(String permissions) {
+        setPermissions_Term(permissions, null);
     }
 
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("createdBy", createdBy);
+    public void setPermissions_Term(String permissions, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotTerm(createdBy, null);
+    public void setPermissions_NotEqual(String permissions) {
+        setPermissions_NotTerm(permissions, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy) {
-        setCreatedBy_NotTerm(createdBy, null);
+    public void setPermissions_NotTerm(String permissions) {
+        setPermissions_NotTerm(permissions, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
+    public void setPermissions_NotEqual(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPermissions_NotTerm(permissions, opLambda);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
+    public void setPermissions_NotTerm(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPermissions_Term(permissions), opLambda);
     }
 
-    public void setCreatedBy_Terms(Collection<String> createdByList) {
-        setCreatedBy_Terms(createdByList, null);
+    public void setPermissions_Terms(Collection<String> permissionsList) {
+        setPermissions_Terms(permissionsList, null);
     }
 
-    public void setCreatedBy_Terms(Collection<String> createdByList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("createdBy", createdByList);
+    public void setPermissions_Terms(Collection<String> permissionsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("permissions", permissionsList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_InScope(Collection<String> createdByList) {
-        setCreatedBy_Terms(createdByList, null);
+    public void setPermissions_InScope(Collection<String> permissionsList) {
+        setPermissions_Terms(permissionsList, null);
     }
 
-    public void setCreatedBy_InScope(Collection<String> createdByList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
+    public void setPermissions_InScope(Collection<String> permissionsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setPermissions_Terms(permissionsList, opLambda);
     }
 
-    public void setCreatedBy_Match(String createdBy) {
-        setCreatedBy_Match(createdBy, null);
+    public void setPermissions_Match(String permissions) {
+        setPermissions_Match(permissions, null);
     }
 
-    public void setCreatedBy_Match(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("createdBy", createdBy);
+    public void setPermissions_Match(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy) {
-        setCreatedBy_MatchPhrase(createdBy, null);
+    public void setPermissions_MatchPhrase(String permissions) {
+        setPermissions_MatchPhrase(permissions, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy) {
-        setCreatedBy_MatchPhrasePrefix(createdBy, null);
+    public void setPermissions_MatchPhrasePrefix(String permissions) {
+        setPermissions_MatchPhrasePrefix(permissions, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy) {
-        setCreatedBy_Fuzzy(createdBy, null);
+    public void setPermissions_Fuzzy(String permissions) {
+        setPermissions_Fuzzy(permissions, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
+    public void setPermissions_Prefix(String permissions) {
+        setPermissions_Prefix(permissions, null);
     }
 
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("createdBy", createdBy);
+    public void setPermissions_Prefix(String permissions, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_Wildcard(String createdBy) {
-        setCreatedBy_Wildcard(createdBy, null);
+    public void setPermissions_Wildcard(String permissions) {
+        setPermissions_Wildcard(permissions, null);
     }
 
-    public void setCreatedBy_Wildcard(String createdBy, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("createdBy", createdBy);
+    public void setPermissions_Wildcard(String permissions, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_Regexp(String permissions) {
+        setPermissions_Regexp(permissions, null);
+    }
+
+    public void setPermissions_Regexp(String permissions, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    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 setCreatedBy_Regexp(String createdBy) {
-        setCreatedBy_Regexp(createdBy, null);
+    public void setPermissions_GreaterThan(String permissions) {
+        setPermissions_GreaterThan(permissions, null);
     }
 
-    public void setCreatedBy_Regexp(String createdBy, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("createdBy", createdBy);
+    public void setPermissions_GreaterThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_SpanTerm(String createdBy) {
-        setCreatedBy_SpanTerm("createdBy", null);
+    public void setPermissions_LessThan(String permissions) {
+        setPermissions_LessThan(permissions, null);
     }
 
-    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+    public void setPermissions_LessThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
+    public void setPermissions_GreaterEqual(String permissions) {
+        setPermissions_GreaterEqual(permissions, null);
     }
 
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = createdBy;
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
+    public void setPermissions_GreaterEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_LessThan(String createdBy) {
-        setCreatedBy_LessThan(createdBy, null);
+    public void setPermissions_LessEqual(String permissions) {
+        setPermissions_LessEqual(permissions, null);
     }
 
-    public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = createdBy;
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
+    public void setPermissions_LessEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_GreaterEqual(String createdBy) {
-        setCreatedBy_GreaterEqual(createdBy, null);
+    public void setPermissions_Exists() {
+        setPermissions_Exists(null);
     }
 
-    public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = createdBy;
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setPermissions_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_LessEqual(String createdBy) {
-        setCreatedBy_LessEqual(createdBy, null);
+    public void setPermissions_CommonTerms(String permissions) {
+        setPermissions_CommonTerms(permissions, null);
     }
 
-    public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = createdBy;
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setPermissions_CommonTerms(String permissions, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
+    public BsAccessTokenCQ addOrderBy_Permissions_Asc() {
+        regOBA("permissions");
+        return this;
     }
 
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public BsAccessTokenCQ addOrderBy_Permissions_Desc() {
+        regOBD("permissions");
+        return this;
     }
 
-    public void setCreatedBy_CommonTerms(String createdBy) {
-        setCreatedBy_CommonTerms(createdBy, null);
+    public void setToken_Equal(String token) {
+        setToken_Term(token, null);
     }
 
-    public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
+    public void setToken_Equal(String token, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setToken_Term(token, opLambda);
+    }
+
+    public void setToken_Term(String token) {
+        setToken_Term(token, null);
+    }
+
+    public void setToken_Term(String token, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("token", token);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsAccessTokenCQ addOrderBy_CreatedBy_Asc() {
-        regOBA("createdBy");
-        return this;
+    public void setToken_NotEqual(String token) {
+        setToken_NotTerm(token, null);
     }
 
-    public BsAccessTokenCQ addOrderBy_CreatedBy_Desc() {
-        regOBD("createdBy");
-        return this;
+    public void setToken_NotTerm(String token) {
+        setToken_NotTerm(token, null);
     }
 
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
+    public void setToken_NotEqual(String token, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setToken_NotTerm(token, opLambda);
     }
 
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
+    public void setToken_NotTerm(String token, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setToken_Term(token), opLambda);
     }
 
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
+    public void setToken_Terms(Collection<String> tokenList) {
+        setToken_Terms(tokenList, null);
     }
 
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("createdTime", createdTime);
+    public void setToken_Terms(Collection<String> tokenList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("token", tokenList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotTerm(createdTime, null);
+    public void setToken_InScope(Collection<String> tokenList) {
+        setToken_Terms(tokenList, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime) {
-        setCreatedTime_NotTerm(createdTime, null);
+    public void setToken_InScope(Collection<String> tokenList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setToken_Terms(tokenList, opLambda);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
+    public void setToken_Match(String token) {
+        setToken_Match(token, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
+    public void setToken_Match(String token, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("token", token);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
+    public void setToken_MatchPhrase(String token) {
+        setToken_MatchPhrase(token, null);
     }
 
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("createdTime", createdTimeList);
+    public void setToken_MatchPhrase(String token, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("token", token);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
+    public void setToken_MatchPhrasePrefix(String token) {
+        setToken_MatchPhrasePrefix(token, null);
     }
 
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
+    public void setToken_MatchPhrasePrefix(String token, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("token", token);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setCreatedTime_Match(Long createdTime) {
-        setCreatedTime_Match(createdTime, null);
+    public void setToken_Fuzzy(String token) {
+        setToken_Fuzzy(token, null);
     }
 
-    public void setCreatedTime_Match(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("createdTime", createdTime);
+    public void setToken_Fuzzy(String token, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("token", token);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime) {
-        setCreatedTime_MatchPhrase(createdTime, null);
+    public void setToken_Prefix(String token) {
+        setToken_Prefix(token, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setToken_Prefix(String token, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("token", token);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime) {
-        setCreatedTime_MatchPhrasePrefix(createdTime, null);
+    public void setToken_Wildcard(String token) {
+        setToken_Wildcard(token, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setToken_Wildcard(String token, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("token", token);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime) {
-        setCreatedTime_Fuzzy(createdTime, null);
+    public void setToken_Regexp(String token) {
+        setToken_Regexp(token, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setToken_Regexp(String token, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("token", token);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
+    public void setToken_SpanTerm(String token) {
+        setToken_SpanTerm("token", null);
     }
 
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = createdTime;
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
+    public void setToken_SpanTerm(String token, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("token", token);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
+    public void setToken_GreaterThan(String token) {
+        setToken_GreaterThan(token, null);
     }
 
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = createdTime;
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
+    public void setToken_GreaterThan(String token, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = token;
+        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
+    public void setToken_LessThan(String token) {
+        setToken_LessThan(token, null);
     }
 
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = createdTime;
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setToken_LessThan(String token, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = token;
+        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
+    public void setToken_GreaterEqual(String token) {
+        setToken_GreaterEqual(token, null);
     }
 
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = createdTime;
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setToken_GreaterEqual(String token, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = token;
+        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
+    public void setToken_LessEqual(String token) {
+        setToken_LessEqual(token, null);
     }
 
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("createdTime");
+    public void setToken_LessEqual(String token, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = token;
+        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCreatedTime_CommonTerms(Long createdTime) {
-        setCreatedTime_CommonTerms(createdTime, null);
+    public void setToken_Exists() {
+        setToken_Exists(null);
     }
 
-    public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
+    public void setToken_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("token");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsAccessTokenCQ addOrderBy_CreatedTime_Asc() {
-        regOBA("createdTime");
+    public void setToken_CommonTerms(String token) {
+        setToken_CommonTerms(token, null);
+    }
+
+    public void setToken_CommonTerms(String token, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("token", token);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsAccessTokenCQ addOrderBy_Token_Asc() {
+        regOBA("token");
         return this;
     }
 
-    public BsAccessTokenCQ addOrderBy_CreatedTime_Desc() {
-        regOBD("createdTime");
+    public BsAccessTokenCQ addOrderBy_Token_Desc() {
+        regOBD("token");
         return this;
     }
 
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 2279756a0511cea22b7459cfeef6ebaaa567cb16..5e7f38c786229403ee9895fbe2613edf7c56e620 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
@@ -764,6 +764,228 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         return this;
     }
 
+    public void setPermissions_Equal(String permissions) {
+        setPermissions_Term(permissions, null);
+    }
+
+    public void setPermissions_Equal(String permissions, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setPermissions_Term(permissions, opLambda);
+    }
+
+    public void setPermissions_Term(String permissions) {
+        setPermissions_Term(permissions, null);
+    }
+
+    public void setPermissions_Term(String permissions, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_NotEqual(String permissions) {
+        setPermissions_NotTerm(permissions, null);
+    }
+
+    public void setPermissions_NotTerm(String permissions) {
+        setPermissions_NotTerm(permissions, null);
+    }
+
+    public void setPermissions_NotEqual(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPermissions_NotTerm(permissions, opLambda);
+    }
+
+    public void setPermissions_NotTerm(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPermissions_Term(permissions), opLambda);
+    }
+
+    public void setPermissions_Terms(Collection<String> permissionsList) {
+        setPermissions_Terms(permissionsList, null);
+    }
+
+    public void setPermissions_Terms(Collection<String> permissionsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("permissions", permissionsList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_InScope(Collection<String> permissionsList) {
+        setPermissions_Terms(permissionsList, null);
+    }
+
+    public void setPermissions_InScope(Collection<String> permissionsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setPermissions_Terms(permissionsList, opLambda);
+    }
+
+    public void setPermissions_Match(String permissions) {
+        setPermissions_Match(permissions, null);
+    }
+
+    public void setPermissions_Match(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_MatchPhrase(String permissions) {
+        setPermissions_MatchPhrase(permissions, null);
+    }
+
+    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_MatchPhrasePrefix(String permissions) {
+        setPermissions_MatchPhrasePrefix(permissions, null);
+    }
+
+    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_Fuzzy(String permissions) {
+        setPermissions_Fuzzy(permissions, null);
+    }
+
+    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_Prefix(String permissions) {
+        setPermissions_Prefix(permissions, null);
+    }
+
+    public void setPermissions_Prefix(String permissions, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_Wildcard(String permissions) {
+        setPermissions_Wildcard(permissions, null);
+    }
+
+    public void setPermissions_Wildcard(String permissions, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_Regexp(String permissions) {
+        setPermissions_Regexp(permissions, null);
+    }
+
+    public void setPermissions_Regexp(String permissions, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    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) {
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_LessThan(String permissions) {
+        setPermissions_LessThan(permissions, null);
+    }
+
+    public void setPermissions_LessThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_GreaterEqual(String permissions) {
+        setPermissions_GreaterEqual(permissions, null);
+    }
+
+    public void setPermissions_GreaterEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_LessEqual(String permissions) {
+        setPermissions_LessEqual(permissions, null);
+    }
+
+    public void setPermissions_LessEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_Exists() {
+        setPermissions_Exists(null);
+    }
+
+    public void setPermissions_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("permissions");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPermissions_CommonTerms(String permissions) {
+        setPermissions_CommonTerms(permissions, null);
+    }
+
+    public void setPermissions_CommonTerms(String permissions, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsElevateWordCQ addOrderBy_Permissions_Asc() {
+        regOBA("permissions");
+        return this;
+    }
+
+    public BsElevateWordCQ addOrderBy_Permissions_Desc() {
+        regOBD("permissions");
+        return this;
+    }
+
     public void setReading_Equal(String reading) {
         setReading_Term(reading, null);
     }
@@ -1652,228 +1874,6 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setPermissions_Equal(String permissions) {
-        setPermissions_Term(permissions, null);
-    }
-
-    public void setPermissions_Equal(String permissions, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setPermissions_Term(permissions, opLambda);
-    }
-
-    public void setPermissions_Term(String permissions) {
-        setPermissions_Term(permissions, null);
-    }
-
-    public void setPermissions_Term(String permissions, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("permissions", permissions);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_NotEqual(String permissions) {
-        setPermissions_NotTerm(permissions, null);
-    }
-
-    public void setPermissions_NotTerm(String permissions) {
-        setPermissions_NotTerm(permissions, null);
-    }
-
-    public void setPermissions_NotEqual(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setPermissions_NotTerm(permissions, opLambda);
-    }
-
-    public void setPermissions_NotTerm(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setPermissions_Term(permissions), opLambda);
-    }
-
-    public void setPermissions_Terms(Collection<String> permissionsList) {
-        setPermissions_Terms(permissionsList, null);
-    }
-
-    public void setPermissions_Terms(Collection<String> permissionsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("permissions", permissionsList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_InScope(Collection<String> permissionsList) {
-        setPermissions_Terms(permissionsList, null);
-    }
-
-    public void setPermissions_InScope(Collection<String> permissionsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setPermissions_Terms(permissionsList, opLambda);
-    }
-
-    public void setPermissions_Match(String permissions) {
-        setPermissions_Match(permissions, null);
-    }
-
-    public void setPermissions_Match(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("permissions", permissions);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_MatchPhrase(String permissions) {
-        setPermissions_MatchPhrase(permissions, null);
-    }
-
-    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_MatchPhrasePrefix(String permissions) {
-        setPermissions_MatchPhrasePrefix(permissions, null);
-    }
-
-    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_Fuzzy(String permissions) {
-        setPermissions_Fuzzy(permissions, null);
-    }
-
-    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("permissions", permissions);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_Prefix(String permissions) {
-        setPermissions_Prefix(permissions, null);
-    }
-
-    public void setPermissions_Prefix(String permissions, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("permissions", permissions);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_Wildcard(String permissions) {
-        setPermissions_Wildcard(permissions, null);
-    }
-
-    public void setPermissions_Wildcard(String permissions, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("permissions", permissions);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_Regexp(String permissions) {
-        setPermissions_Regexp(permissions, null);
-    }
-
-    public void setPermissions_Regexp(String permissions, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("permissions", permissions);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    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) {
-        final Object _value = permissions;
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_LessThan(String permissions) {
-        setPermissions_LessThan(permissions, null);
-    }
-
-    public void setPermissions_LessThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = permissions;
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_GreaterEqual(String permissions) {
-        setPermissions_GreaterEqual(permissions, null);
-    }
-
-    public void setPermissions_GreaterEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = permissions;
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_LessEqual(String permissions) {
-        setPermissions_LessEqual(permissions, null);
-    }
-
-    public void setPermissions_LessEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = permissions;
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_Exists() {
-        setPermissions_Exists(null);
-    }
-
-    public void setPermissions_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("permissions");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPermissions_CommonTerms(String permissions) {
-        setPermissions_CommonTerms(permissions, null);
-    }
-
-    public void setPermissions_CommonTerms(String permissions, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("permissions", permissions);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsElevateWordCQ addOrderBy_Permissions_Asc() {
-        regOBA("permissions");
-        return this;
-    }
-
-    public BsElevateWordCQ addOrderBy_Permissions_Desc() {
-        regOBD("permissions");
-        return this;
-    }
-
     public void setUpdatedBy_Equal(String updatedBy) {
         setUpdatedBy_Term(updatedBy, null);
     }
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 2cad7a5f2ef51f2f3a2a8ccfb2707c44349c238a..5c7d012931aeaabaa6d20f997871f376f4f482b5 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
@@ -2620,184 +2620,6 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setTimeToLive_Equal(Integer timeToLive) {
-        setTimeToLive_Term(timeToLive, null);
-    }
-
-    public void setTimeToLive_Equal(Integer timeToLive, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setTimeToLive_Term(timeToLive, opLambda);
-    }
-
-    public void setTimeToLive_Term(Integer timeToLive) {
-        setTimeToLive_Term(timeToLive, null);
-    }
-
-    public void setTimeToLive_Term(Integer timeToLive, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("timeToLive", timeToLive);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_NotEqual(Integer timeToLive) {
-        setTimeToLive_NotTerm(timeToLive, null);
-    }
-
-    public void setTimeToLive_NotTerm(Integer timeToLive) {
-        setTimeToLive_NotTerm(timeToLive, null);
-    }
-
-    public void setTimeToLive_NotEqual(Integer timeToLive, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setTimeToLive_NotTerm(timeToLive, opLambda);
-    }
-
-    public void setTimeToLive_NotTerm(Integer timeToLive, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setTimeToLive_Term(timeToLive), opLambda);
-    }
-
-    public void setTimeToLive_Terms(Collection<Integer> timeToLiveList) {
-        setTimeToLive_Terms(timeToLiveList, null);
-    }
-
-    public void setTimeToLive_Terms(Collection<Integer> timeToLiveList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("timeToLive", timeToLiveList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_InScope(Collection<Integer> timeToLiveList) {
-        setTimeToLive_Terms(timeToLiveList, null);
-    }
-
-    public void setTimeToLive_InScope(Collection<Integer> timeToLiveList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setTimeToLive_Terms(timeToLiveList, opLambda);
-    }
-
-    public void setTimeToLive_Match(Integer timeToLive) {
-        setTimeToLive_Match(timeToLive, null);
-    }
-
-    public void setTimeToLive_Match(Integer timeToLive, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("timeToLive", timeToLive);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_MatchPhrase(Integer timeToLive) {
-        setTimeToLive_MatchPhrase(timeToLive, null);
-    }
-
-    public void setTimeToLive_MatchPhrase(Integer timeToLive, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("timeToLive", timeToLive);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_MatchPhrasePrefix(Integer timeToLive) {
-        setTimeToLive_MatchPhrasePrefix(timeToLive, null);
-    }
-
-    public void setTimeToLive_MatchPhrasePrefix(Integer timeToLive, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("timeToLive", timeToLive);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Fuzzy(Integer timeToLive) {
-        setTimeToLive_Fuzzy(timeToLive, null);
-    }
-
-    public void setTimeToLive_Fuzzy(Integer timeToLive, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("timeToLive", timeToLive);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_GreaterThan(Integer timeToLive) {
-        setTimeToLive_GreaterThan(timeToLive, null);
-    }
-
-    public void setTimeToLive_GreaterThan(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = timeToLive;
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_LessThan(Integer timeToLive) {
-        setTimeToLive_LessThan(timeToLive, null);
-    }
-
-    public void setTimeToLive_LessThan(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = timeToLive;
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_GreaterEqual(Integer timeToLive) {
-        setTimeToLive_GreaterEqual(timeToLive, null);
-    }
-
-    public void setTimeToLive_GreaterEqual(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = timeToLive;
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_LessEqual(Integer timeToLive) {
-        setTimeToLive_LessEqual(timeToLive, null);
-    }
-
-    public void setTimeToLive_LessEqual(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = timeToLive;
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Exists() {
-        setTimeToLive_Exists(null);
-    }
-
-    public void setTimeToLive_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_CommonTerms(Integer timeToLive) {
-        setTimeToLive_CommonTerms(timeToLive, null);
-    }
-
-    public void setTimeToLive_CommonTerms(Integer timeToLive, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("timeToLive", timeToLive);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsFileConfigCQ addOrderBy_TimeToLive_Asc() {
-        regOBA("timeToLive");
-        return this;
-    }
-
-    public BsFileConfigCQ addOrderBy_TimeToLive_Desc() {
-        regOBD("timeToLive");
-        return this;
-    }
-
     public void setMaxAccessCount_Equal(Long maxAccessCount) {
         setMaxAccessCount_Term(maxAccessCount, null);
     }
@@ -3998,6 +3820,184 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         return this;
     }
 
+    public void setTimeToLive_Equal(Integer timeToLive) {
+        setTimeToLive_Term(timeToLive, null);
+    }
+
+    public void setTimeToLive_Equal(Integer timeToLive, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setTimeToLive_Term(timeToLive, opLambda);
+    }
+
+    public void setTimeToLive_Term(Integer timeToLive) {
+        setTimeToLive_Term(timeToLive, null);
+    }
+
+    public void setTimeToLive_Term(Integer timeToLive, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("timeToLive", timeToLive);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_NotEqual(Integer timeToLive) {
+        setTimeToLive_NotTerm(timeToLive, null);
+    }
+
+    public void setTimeToLive_NotTerm(Integer timeToLive) {
+        setTimeToLive_NotTerm(timeToLive, null);
+    }
+
+    public void setTimeToLive_NotEqual(Integer timeToLive, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTimeToLive_NotTerm(timeToLive, opLambda);
+    }
+
+    public void setTimeToLive_NotTerm(Integer timeToLive, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTimeToLive_Term(timeToLive), opLambda);
+    }
+
+    public void setTimeToLive_Terms(Collection<Integer> timeToLiveList) {
+        setTimeToLive_Terms(timeToLiveList, null);
+    }
+
+    public void setTimeToLive_Terms(Collection<Integer> timeToLiveList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("timeToLive", timeToLiveList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_InScope(Collection<Integer> timeToLiveList) {
+        setTimeToLive_Terms(timeToLiveList, null);
+    }
+
+    public void setTimeToLive_InScope(Collection<Integer> timeToLiveList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setTimeToLive_Terms(timeToLiveList, opLambda);
+    }
+
+    public void setTimeToLive_Match(Integer timeToLive) {
+        setTimeToLive_Match(timeToLive, null);
+    }
+
+    public void setTimeToLive_Match(Integer timeToLive, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("timeToLive", timeToLive);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_MatchPhrase(Integer timeToLive) {
+        setTimeToLive_MatchPhrase(timeToLive, null);
+    }
+
+    public void setTimeToLive_MatchPhrase(Integer timeToLive, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("timeToLive", timeToLive);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_MatchPhrasePrefix(Integer timeToLive) {
+        setTimeToLive_MatchPhrasePrefix(timeToLive, null);
+    }
+
+    public void setTimeToLive_MatchPhrasePrefix(Integer timeToLive, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("timeToLive", timeToLive);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Fuzzy(Integer timeToLive) {
+        setTimeToLive_Fuzzy(timeToLive, null);
+    }
+
+    public void setTimeToLive_Fuzzy(Integer timeToLive, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("timeToLive", timeToLive);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_GreaterThan(Integer timeToLive) {
+        setTimeToLive_GreaterThan(timeToLive, null);
+    }
+
+    public void setTimeToLive_GreaterThan(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_LessThan(Integer timeToLive) {
+        setTimeToLive_LessThan(timeToLive, null);
+    }
+
+    public void setTimeToLive_LessThan(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_GreaterEqual(Integer timeToLive) {
+        setTimeToLive_GreaterEqual(timeToLive, null);
+    }
+
+    public void setTimeToLive_GreaterEqual(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_LessEqual(Integer timeToLive) {
+        setTimeToLive_LessEqual(timeToLive, null);
+    }
+
+    public void setTimeToLive_LessEqual(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Exists() {
+        setTimeToLive_Exists(null);
+    }
+
+    public void setTimeToLive_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_CommonTerms(Integer timeToLive) {
+        setTimeToLive_CommonTerms(timeToLive, null);
+    }
+
+    public void setTimeToLive_CommonTerms(Integer timeToLive, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("timeToLive", timeToLive);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsFileConfigCQ addOrderBy_TimeToLive_Asc() {
+        regOBA("timeToLive");
+        return this;
+    }
+
+    public BsFileConfigCQ addOrderBy_TimeToLive_Desc() {
+        regOBD("timeToLive");
+        return this;
+    }
+
     public void setUpdatedBy_Equal(String updatedBy) {
         setUpdatedBy_Term(updatedBy, null);
     }
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 626ef4ee9fe34e6b00979ad5989af94392393b28..9c835efd297297d2e5162c4df2706ee730ae2141 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
@@ -807,6 +807,184 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         return this;
     }
 
+    public void setLastUpdated_Equal(Long lastUpdated) {
+        setLastUpdated_Term(lastUpdated, null);
+    }
+
+    public void setLastUpdated_Equal(Long lastUpdated, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setLastUpdated_Term(lastUpdated, opLambda);
+    }
+
+    public void setLastUpdated_Term(Long lastUpdated) {
+        setLastUpdated_Term(lastUpdated, null);
+    }
+
+    public void setLastUpdated_Term(Long lastUpdated, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("lastUpdated", lastUpdated);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_NotEqual(Long lastUpdated) {
+        setLastUpdated_NotTerm(lastUpdated, null);
+    }
+
+    public void setLastUpdated_NotTerm(Long lastUpdated) {
+        setLastUpdated_NotTerm(lastUpdated, null);
+    }
+
+    public void setLastUpdated_NotEqual(Long lastUpdated, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setLastUpdated_NotTerm(lastUpdated, opLambda);
+    }
+
+    public void setLastUpdated_NotTerm(Long lastUpdated, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setLastUpdated_Term(lastUpdated), opLambda);
+    }
+
+    public void setLastUpdated_Terms(Collection<Long> lastUpdatedList) {
+        setLastUpdated_Terms(lastUpdatedList, null);
+    }
+
+    public void setLastUpdated_Terms(Collection<Long> lastUpdatedList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("lastUpdated", lastUpdatedList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_InScope(Collection<Long> lastUpdatedList) {
+        setLastUpdated_Terms(lastUpdatedList, null);
+    }
+
+    public void setLastUpdated_InScope(Collection<Long> lastUpdatedList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setLastUpdated_Terms(lastUpdatedList, opLambda);
+    }
+
+    public void setLastUpdated_Match(Long lastUpdated) {
+        setLastUpdated_Match(lastUpdated, null);
+    }
+
+    public void setLastUpdated_Match(Long lastUpdated, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("lastUpdated", lastUpdated);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_MatchPhrase(Long lastUpdated) {
+        setLastUpdated_MatchPhrase(lastUpdated, null);
+    }
+
+    public void setLastUpdated_MatchPhrase(Long lastUpdated, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("lastUpdated", lastUpdated);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_MatchPhrasePrefix(Long lastUpdated) {
+        setLastUpdated_MatchPhrasePrefix(lastUpdated, null);
+    }
+
+    public void setLastUpdated_MatchPhrasePrefix(Long lastUpdated, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("lastUpdated", lastUpdated);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_Fuzzy(Long lastUpdated) {
+        setLastUpdated_Fuzzy(lastUpdated, null);
+    }
+
+    public void setLastUpdated_Fuzzy(Long lastUpdated, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("lastUpdated", lastUpdated);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_GreaterThan(Long lastUpdated) {
+        setLastUpdated_GreaterThan(lastUpdated, null);
+    }
+
+    public void setLastUpdated_GreaterThan(Long lastUpdated, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = lastUpdated;
+        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_LessThan(Long lastUpdated) {
+        setLastUpdated_LessThan(lastUpdated, null);
+    }
+
+    public void setLastUpdated_LessThan(Long lastUpdated, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = lastUpdated;
+        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_GreaterEqual(Long lastUpdated) {
+        setLastUpdated_GreaterEqual(lastUpdated, null);
+    }
+
+    public void setLastUpdated_GreaterEqual(Long lastUpdated, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = lastUpdated;
+        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_LessEqual(Long lastUpdated) {
+        setLastUpdated_LessEqual(lastUpdated, null);
+    }
+
+    public void setLastUpdated_LessEqual(Long lastUpdated, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = lastUpdated;
+        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_Exists() {
+        setLastUpdated_Exists(null);
+    }
+
+    public void setLastUpdated_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("lastUpdated");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setLastUpdated_CommonTerms(Long lastUpdated) {
+        setLastUpdated_CommonTerms(lastUpdated, null);
+    }
+
+    public void setLastUpdated_CommonTerms(Long lastUpdated, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("lastUpdated", lastUpdated);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsJobLogCQ addOrderBy_LastUpdated_Asc() {
+        regOBA("lastUpdated");
+        return this;
+    }
+
+    public BsJobLogCQ addOrderBy_LastUpdated_Desc() {
+        regOBD("lastUpdated");
+        return this;
+    }
+
     public void setScriptData_Equal(String scriptData) {
         setScriptData_Term(scriptData, null);
     }
@@ -1873,182 +2051,4 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setLastUpdated_Equal(Long lastUpdated) {
-        setLastUpdated_Term(lastUpdated, null);
-    }
-
-    public void setLastUpdated_Equal(Long lastUpdated, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setLastUpdated_Term(lastUpdated, opLambda);
-    }
-
-    public void setLastUpdated_Term(Long lastUpdated) {
-        setLastUpdated_Term(lastUpdated, null);
-    }
-
-    public void setLastUpdated_Term(Long lastUpdated, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("lastUpdated", lastUpdated);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_NotEqual(Long lastUpdated) {
-        setLastUpdated_NotTerm(lastUpdated, null);
-    }
-
-    public void setLastUpdated_NotTerm(Long lastUpdated) {
-        setLastUpdated_NotTerm(lastUpdated, null);
-    }
-
-    public void setLastUpdated_NotEqual(Long lastUpdated, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setLastUpdated_NotTerm(lastUpdated, opLambda);
-    }
-
-    public void setLastUpdated_NotTerm(Long lastUpdated, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setLastUpdated_Term(lastUpdated), opLambda);
-    }
-
-    public void setLastUpdated_Terms(Collection<Long> lastUpdatedList) {
-        setLastUpdated_Terms(lastUpdatedList, null);
-    }
-
-    public void setLastUpdated_Terms(Collection<Long> lastUpdatedList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("lastUpdated", lastUpdatedList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_InScope(Collection<Long> lastUpdatedList) {
-        setLastUpdated_Terms(lastUpdatedList, null);
-    }
-
-    public void setLastUpdated_InScope(Collection<Long> lastUpdatedList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setLastUpdated_Terms(lastUpdatedList, opLambda);
-    }
-
-    public void setLastUpdated_Match(Long lastUpdated) {
-        setLastUpdated_Match(lastUpdated, null);
-    }
-
-    public void setLastUpdated_Match(Long lastUpdated, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("lastUpdated", lastUpdated);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_MatchPhrase(Long lastUpdated) {
-        setLastUpdated_MatchPhrase(lastUpdated, null);
-    }
-
-    public void setLastUpdated_MatchPhrase(Long lastUpdated, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("lastUpdated", lastUpdated);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_MatchPhrasePrefix(Long lastUpdated) {
-        setLastUpdated_MatchPhrasePrefix(lastUpdated, null);
-    }
-
-    public void setLastUpdated_MatchPhrasePrefix(Long lastUpdated, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("lastUpdated", lastUpdated);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_Fuzzy(Long lastUpdated) {
-        setLastUpdated_Fuzzy(lastUpdated, null);
-    }
-
-    public void setLastUpdated_Fuzzy(Long lastUpdated, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("lastUpdated", lastUpdated);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_GreaterThan(Long lastUpdated) {
-        setLastUpdated_GreaterThan(lastUpdated, null);
-    }
-
-    public void setLastUpdated_GreaterThan(Long lastUpdated, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = lastUpdated;
-        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_GREATER_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_LessThan(Long lastUpdated) {
-        setLastUpdated_LessThan(lastUpdated, null);
-    }
-
-    public void setLastUpdated_LessThan(Long lastUpdated, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = lastUpdated;
-        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_LESS_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_GreaterEqual(Long lastUpdated) {
-        setLastUpdated_GreaterEqual(lastUpdated, null);
-    }
-
-    public void setLastUpdated_GreaterEqual(Long lastUpdated, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = lastUpdated;
-        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_GREATER_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_LessEqual(Long lastUpdated) {
-        setLastUpdated_LessEqual(lastUpdated, null);
-    }
-
-    public void setLastUpdated_LessEqual(Long lastUpdated, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = lastUpdated;
-        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_Exists() {
-        setLastUpdated_Exists(null);
-    }
-
-    public void setLastUpdated_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("lastUpdated");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastUpdated_CommonTerms(Long lastUpdated) {
-        setLastUpdated_CommonTerms(lastUpdated, null);
-    }
-
-    public void setLastUpdated_CommonTerms(Long lastUpdated, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("lastUpdated", lastUpdated);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsJobLogCQ addOrderBy_LastUpdated_Asc() {
-        regOBA("lastUpdated");
-        return this;
-    }
-
-    public BsJobLogCQ addOrderBy_LastUpdated_Desc() {
-        regOBD("lastUpdated");
-        return this;
-    }
-
 }
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 9bb0d6e8f00bce9259b9b60f7f19f58c2183e80a..c5462965e50b9bf940a0f14ccf078c2b77c2657d 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
@@ -1385,228 +1385,6 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setVirtualHost_Equal(String virtualHost) {
-        setVirtualHost_Term(virtualHost, null);
-    }
-
-    public void setVirtualHost_Equal(String virtualHost, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setVirtualHost_Term(virtualHost, opLambda);
-    }
-
-    public void setVirtualHost_Term(String virtualHost) {
-        setVirtualHost_Term(virtualHost, null);
-    }
-
-    public void setVirtualHost_Term(String virtualHost, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_NotEqual(String virtualHost) {
-        setVirtualHost_NotTerm(virtualHost, null);
-    }
-
-    public void setVirtualHost_NotTerm(String virtualHost) {
-        setVirtualHost_NotTerm(virtualHost, null);
-    }
-
-    public void setVirtualHost_NotEqual(String virtualHost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setVirtualHost_NotTerm(virtualHost, opLambda);
-    }
-
-    public void setVirtualHost_NotTerm(String virtualHost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setVirtualHost_Term(virtualHost), opLambda);
-    }
-
-    public void setVirtualHost_Terms(Collection<String> virtualHostList) {
-        setVirtualHost_Terms(virtualHostList, null);
-    }
-
-    public void setVirtualHost_Terms(Collection<String> virtualHostList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("virtualHost", virtualHostList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_InScope(Collection<String> virtualHostList) {
-        setVirtualHost_Terms(virtualHostList, null);
-    }
-
-    public void setVirtualHost_InScope(Collection<String> virtualHostList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setVirtualHost_Terms(virtualHostList, opLambda);
-    }
-
-    public void setVirtualHost_Match(String virtualHost) {
-        setVirtualHost_Match(virtualHost, null);
-    }
-
-    public void setVirtualHost_Match(String virtualHost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_MatchPhrase(String virtualHost) {
-        setVirtualHost_MatchPhrase(virtualHost, null);
-    }
-
-    public void setVirtualHost_MatchPhrase(String virtualHost, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_MatchPhrasePrefix(String virtualHost) {
-        setVirtualHost_MatchPhrasePrefix(virtualHost, null);
-    }
-
-    public void setVirtualHost_MatchPhrasePrefix(String virtualHost, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_Fuzzy(String virtualHost) {
-        setVirtualHost_Fuzzy(virtualHost, null);
-    }
-
-    public void setVirtualHost_Fuzzy(String virtualHost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_Prefix(String virtualHost) {
-        setVirtualHost_Prefix(virtualHost, null);
-    }
-
-    public void setVirtualHost_Prefix(String virtualHost, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_Wildcard(String virtualHost) {
-        setVirtualHost_Wildcard(virtualHost, null);
-    }
-
-    public void setVirtualHost_Wildcard(String virtualHost, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_Regexp(String virtualHost) {
-        setVirtualHost_Regexp(virtualHost, null);
-    }
-
-    public void setVirtualHost_Regexp(String virtualHost, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_SpanTerm(String virtualHost) {
-        setVirtualHost_SpanTerm("virtualHost", null);
-    }
-
-    public void setVirtualHost_SpanTerm(String virtualHost, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_GreaterThan(String virtualHost) {
-        setVirtualHost_GreaterThan(virtualHost, null);
-    }
-
-    public void setVirtualHost_GreaterThan(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = virtualHost;
-        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_GREATER_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_LessThan(String virtualHost) {
-        setVirtualHost_LessThan(virtualHost, null);
-    }
-
-    public void setVirtualHost_LessThan(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = virtualHost;
-        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_LESS_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_GreaterEqual(String virtualHost) {
-        setVirtualHost_GreaterEqual(virtualHost, null);
-    }
-
-    public void setVirtualHost_GreaterEqual(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = virtualHost;
-        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_GREATER_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_LessEqual(String virtualHost) {
-        setVirtualHost_LessEqual(virtualHost, null);
-    }
-
-    public void setVirtualHost_LessEqual(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = virtualHost;
-        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_Exists() {
-        setVirtualHost_Exists(null);
-    }
-
-    public void setVirtualHost_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("virtualHost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_CommonTerms(String virtualHost) {
-        setVirtualHost_CommonTerms(virtualHost, null);
-    }
-
-    public void setVirtualHost_CommonTerms(String virtualHost, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsKeyMatchCQ addOrderBy_VirtualHost_Asc() {
-        regOBA("virtualHost");
-        return this;
-    }
-
-    public BsKeyMatchCQ addOrderBy_VirtualHost_Desc() {
-        regOBD("virtualHost");
-        return this;
-    }
-
     public void setUpdatedBy_Equal(String updatedBy) {
         setUpdatedBy_Term(updatedBy, null);
     }
@@ -2007,4 +1785,226 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         return this;
     }
 
+    public void setVirtualHost_Equal(String virtualHost) {
+        setVirtualHost_Term(virtualHost, null);
+    }
+
+    public void setVirtualHost_Equal(String virtualHost, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setVirtualHost_Term(virtualHost, opLambda);
+    }
+
+    public void setVirtualHost_Term(String virtualHost) {
+        setVirtualHost_Term(virtualHost, null);
+    }
+
+    public void setVirtualHost_Term(String virtualHost, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_NotEqual(String virtualHost) {
+        setVirtualHost_NotTerm(virtualHost, null);
+    }
+
+    public void setVirtualHost_NotTerm(String virtualHost) {
+        setVirtualHost_NotTerm(virtualHost, null);
+    }
+
+    public void setVirtualHost_NotEqual(String virtualHost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setVirtualHost_NotTerm(virtualHost, opLambda);
+    }
+
+    public void setVirtualHost_NotTerm(String virtualHost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setVirtualHost_Term(virtualHost), opLambda);
+    }
+
+    public void setVirtualHost_Terms(Collection<String> virtualHostList) {
+        setVirtualHost_Terms(virtualHostList, null);
+    }
+
+    public void setVirtualHost_Terms(Collection<String> virtualHostList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("virtualHost", virtualHostList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_InScope(Collection<String> virtualHostList) {
+        setVirtualHost_Terms(virtualHostList, null);
+    }
+
+    public void setVirtualHost_InScope(Collection<String> virtualHostList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setVirtualHost_Terms(virtualHostList, opLambda);
+    }
+
+    public void setVirtualHost_Match(String virtualHost) {
+        setVirtualHost_Match(virtualHost, null);
+    }
+
+    public void setVirtualHost_Match(String virtualHost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_MatchPhrase(String virtualHost) {
+        setVirtualHost_MatchPhrase(virtualHost, null);
+    }
+
+    public void setVirtualHost_MatchPhrase(String virtualHost, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_MatchPhrasePrefix(String virtualHost) {
+        setVirtualHost_MatchPhrasePrefix(virtualHost, null);
+    }
+
+    public void setVirtualHost_MatchPhrasePrefix(String virtualHost, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_Fuzzy(String virtualHost) {
+        setVirtualHost_Fuzzy(virtualHost, null);
+    }
+
+    public void setVirtualHost_Fuzzy(String virtualHost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_Prefix(String virtualHost) {
+        setVirtualHost_Prefix(virtualHost, null);
+    }
+
+    public void setVirtualHost_Prefix(String virtualHost, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_Wildcard(String virtualHost) {
+        setVirtualHost_Wildcard(virtualHost, null);
+    }
+
+    public void setVirtualHost_Wildcard(String virtualHost, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_Regexp(String virtualHost) {
+        setVirtualHost_Regexp(virtualHost, null);
+    }
+
+    public void setVirtualHost_Regexp(String virtualHost, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_SpanTerm(String virtualHost) {
+        setVirtualHost_SpanTerm("virtualHost", null);
+    }
+
+    public void setVirtualHost_SpanTerm(String virtualHost, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_GreaterThan(String virtualHost) {
+        setVirtualHost_GreaterThan(virtualHost, null);
+    }
+
+    public void setVirtualHost_GreaterThan(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = virtualHost;
+        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_LessThan(String virtualHost) {
+        setVirtualHost_LessThan(virtualHost, null);
+    }
+
+    public void setVirtualHost_LessThan(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = virtualHost;
+        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_GreaterEqual(String virtualHost) {
+        setVirtualHost_GreaterEqual(virtualHost, null);
+    }
+
+    public void setVirtualHost_GreaterEqual(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = virtualHost;
+        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_LessEqual(String virtualHost) {
+        setVirtualHost_LessEqual(virtualHost, null);
+    }
+
+    public void setVirtualHost_LessEqual(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = virtualHost;
+        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_Exists() {
+        setVirtualHost_Exists(null);
+    }
+
+    public void setVirtualHost_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("virtualHost");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_CommonTerms(String virtualHost) {
+        setVirtualHost_CommonTerms(virtualHost, null);
+    }
+
+    public void setVirtualHost_CommonTerms(String virtualHost, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsKeyMatchCQ addOrderBy_VirtualHost_Asc() {
+        regOBA("virtualHost");
+        return this;
+    }
+
+    public BsKeyMatchCQ addOrderBy_VirtualHost_Desc() {
+        regOBD("virtualHost");
+        return this;
+    }
+
 }
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 c7eda1d813fd367aaf958e486a952b8fd0fcb806..af903cbe628d476850b62187bc71d85805a83590 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
@@ -1473,228 +1473,6 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setVirtualHost_Equal(String virtualHost) {
-        setVirtualHost_Term(virtualHost, null);
-    }
-
-    public void setVirtualHost_Equal(String virtualHost, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setVirtualHost_Term(virtualHost, opLambda);
-    }
-
-    public void setVirtualHost_Term(String virtualHost) {
-        setVirtualHost_Term(virtualHost, null);
-    }
-
-    public void setVirtualHost_Term(String virtualHost, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_NotEqual(String virtualHost) {
-        setVirtualHost_NotTerm(virtualHost, null);
-    }
-
-    public void setVirtualHost_NotTerm(String virtualHost) {
-        setVirtualHost_NotTerm(virtualHost, null);
-    }
-
-    public void setVirtualHost_NotEqual(String virtualHost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setVirtualHost_NotTerm(virtualHost, opLambda);
-    }
-
-    public void setVirtualHost_NotTerm(String virtualHost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setVirtualHost_Term(virtualHost), opLambda);
-    }
-
-    public void setVirtualHost_Terms(Collection<String> virtualHostList) {
-        setVirtualHost_Terms(virtualHostList, null);
-    }
-
-    public void setVirtualHost_Terms(Collection<String> virtualHostList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("virtualHost", virtualHostList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_InScope(Collection<String> virtualHostList) {
-        setVirtualHost_Terms(virtualHostList, null);
-    }
-
-    public void setVirtualHost_InScope(Collection<String> virtualHostList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setVirtualHost_Terms(virtualHostList, opLambda);
-    }
-
-    public void setVirtualHost_Match(String virtualHost) {
-        setVirtualHost_Match(virtualHost, null);
-    }
-
-    public void setVirtualHost_Match(String virtualHost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_MatchPhrase(String virtualHost) {
-        setVirtualHost_MatchPhrase(virtualHost, null);
-    }
-
-    public void setVirtualHost_MatchPhrase(String virtualHost, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_MatchPhrasePrefix(String virtualHost) {
-        setVirtualHost_MatchPhrasePrefix(virtualHost, null);
-    }
-
-    public void setVirtualHost_MatchPhrasePrefix(String virtualHost, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_Fuzzy(String virtualHost) {
-        setVirtualHost_Fuzzy(virtualHost, null);
-    }
-
-    public void setVirtualHost_Fuzzy(String virtualHost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_Prefix(String virtualHost) {
-        setVirtualHost_Prefix(virtualHost, null);
-    }
-
-    public void setVirtualHost_Prefix(String virtualHost, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_Wildcard(String virtualHost) {
-        setVirtualHost_Wildcard(virtualHost, null);
-    }
-
-    public void setVirtualHost_Wildcard(String virtualHost, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_Regexp(String virtualHost) {
-        setVirtualHost_Regexp(virtualHost, null);
-    }
-
-    public void setVirtualHost_Regexp(String virtualHost, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_SpanTerm(String virtualHost) {
-        setVirtualHost_SpanTerm("virtualHost", null);
-    }
-
-    public void setVirtualHost_SpanTerm(String virtualHost, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_GreaterThan(String virtualHost) {
-        setVirtualHost_GreaterThan(virtualHost, null);
-    }
-
-    public void setVirtualHost_GreaterThan(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = virtualHost;
-        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_GREATER_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_LessThan(String virtualHost) {
-        setVirtualHost_LessThan(virtualHost, null);
-    }
-
-    public void setVirtualHost_LessThan(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = virtualHost;
-        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_LESS_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_GreaterEqual(String virtualHost) {
-        setVirtualHost_GreaterEqual(virtualHost, null);
-    }
-
-    public void setVirtualHost_GreaterEqual(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = virtualHost;
-        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_GREATER_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_LessEqual(String virtualHost) {
-        setVirtualHost_LessEqual(virtualHost, null);
-    }
-
-    public void setVirtualHost_LessEqual(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = virtualHost;
-        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_Exists() {
-        setVirtualHost_Exists(null);
-    }
-
-    public void setVirtualHost_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("virtualHost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setVirtualHost_CommonTerms(String virtualHost) {
-        setVirtualHost_CommonTerms(virtualHost, null);
-    }
-
-    public void setVirtualHost_CommonTerms(String virtualHost, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHost", virtualHost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsLabelTypeCQ addOrderBy_VirtualHost_Asc() {
-        regOBA("virtualHost");
-        return this;
-    }
-
-    public BsLabelTypeCQ addOrderBy_VirtualHost_Desc() {
-        regOBD("virtualHost");
-        return this;
-    }
-
     public void setSortOrder_Equal(Integer sortOrder) {
         setSortOrder_Term(sortOrder, null);
     }
@@ -2495,4 +2273,226 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         return this;
     }
 
+    public void setVirtualHost_Equal(String virtualHost) {
+        setVirtualHost_Term(virtualHost, null);
+    }
+
+    public void setVirtualHost_Equal(String virtualHost, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setVirtualHost_Term(virtualHost, opLambda);
+    }
+
+    public void setVirtualHost_Term(String virtualHost) {
+        setVirtualHost_Term(virtualHost, null);
+    }
+
+    public void setVirtualHost_Term(String virtualHost, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_NotEqual(String virtualHost) {
+        setVirtualHost_NotTerm(virtualHost, null);
+    }
+
+    public void setVirtualHost_NotTerm(String virtualHost) {
+        setVirtualHost_NotTerm(virtualHost, null);
+    }
+
+    public void setVirtualHost_NotEqual(String virtualHost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setVirtualHost_NotTerm(virtualHost, opLambda);
+    }
+
+    public void setVirtualHost_NotTerm(String virtualHost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setVirtualHost_Term(virtualHost), opLambda);
+    }
+
+    public void setVirtualHost_Terms(Collection<String> virtualHostList) {
+        setVirtualHost_Terms(virtualHostList, null);
+    }
+
+    public void setVirtualHost_Terms(Collection<String> virtualHostList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("virtualHost", virtualHostList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_InScope(Collection<String> virtualHostList) {
+        setVirtualHost_Terms(virtualHostList, null);
+    }
+
+    public void setVirtualHost_InScope(Collection<String> virtualHostList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setVirtualHost_Terms(virtualHostList, opLambda);
+    }
+
+    public void setVirtualHost_Match(String virtualHost) {
+        setVirtualHost_Match(virtualHost, null);
+    }
+
+    public void setVirtualHost_Match(String virtualHost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_MatchPhrase(String virtualHost) {
+        setVirtualHost_MatchPhrase(virtualHost, null);
+    }
+
+    public void setVirtualHost_MatchPhrase(String virtualHost, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_MatchPhrasePrefix(String virtualHost) {
+        setVirtualHost_MatchPhrasePrefix(virtualHost, null);
+    }
+
+    public void setVirtualHost_MatchPhrasePrefix(String virtualHost, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_Fuzzy(String virtualHost) {
+        setVirtualHost_Fuzzy(virtualHost, null);
+    }
+
+    public void setVirtualHost_Fuzzy(String virtualHost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_Prefix(String virtualHost) {
+        setVirtualHost_Prefix(virtualHost, null);
+    }
+
+    public void setVirtualHost_Prefix(String virtualHost, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_Wildcard(String virtualHost) {
+        setVirtualHost_Wildcard(virtualHost, null);
+    }
+
+    public void setVirtualHost_Wildcard(String virtualHost, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_Regexp(String virtualHost) {
+        setVirtualHost_Regexp(virtualHost, null);
+    }
+
+    public void setVirtualHost_Regexp(String virtualHost, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_SpanTerm(String virtualHost) {
+        setVirtualHost_SpanTerm("virtualHost", null);
+    }
+
+    public void setVirtualHost_SpanTerm(String virtualHost, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_GreaterThan(String virtualHost) {
+        setVirtualHost_GreaterThan(virtualHost, null);
+    }
+
+    public void setVirtualHost_GreaterThan(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = virtualHost;
+        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_LessThan(String virtualHost) {
+        setVirtualHost_LessThan(virtualHost, null);
+    }
+
+    public void setVirtualHost_LessThan(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = virtualHost;
+        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_GreaterEqual(String virtualHost) {
+        setVirtualHost_GreaterEqual(virtualHost, null);
+    }
+
+    public void setVirtualHost_GreaterEqual(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = virtualHost;
+        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_LessEqual(String virtualHost) {
+        setVirtualHost_LessEqual(virtualHost, null);
+    }
+
+    public void setVirtualHost_LessEqual(String virtualHost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = virtualHost;
+        RangeQueryBuilder builder = regRangeQ("virtualHost", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_Exists() {
+        setVirtualHost_Exists(null);
+    }
+
+    public void setVirtualHost_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("virtualHost");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setVirtualHost_CommonTerms(String virtualHost) {
+        setVirtualHost_CommonTerms(virtualHost, null);
+    }
+
+    public void setVirtualHost_CommonTerms(String virtualHost, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHost", virtualHost);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsLabelTypeCQ addOrderBy_VirtualHost_Asc() {
+        regOBA("virtualHost");
+        return this;
+    }
+
+    public BsLabelTypeCQ addOrderBy_VirtualHost_Desc() {
+        regOBD("virtualHost");
+        return this;
+    }
+
 }
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 60acda11c421488373879c0df96d3784bd3a2b73..3301c31245912a38c227baace61a490cd88c01c2 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
@@ -1430,228 +1430,6 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setUserAgent_Equal(String userAgent) {
-        setUserAgent_Term(userAgent, null);
-    }
-
-    public void setUserAgent_Equal(String userAgent, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setUserAgent_Term(userAgent, opLambda);
-    }
-
-    public void setUserAgent_Term(String userAgent) {
-        setUserAgent_Term(userAgent, null);
-    }
-
-    public void setUserAgent_Term(String userAgent, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("userAgent", userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_NotEqual(String userAgent) {
-        setUserAgent_NotTerm(userAgent, null);
-    }
-
-    public void setUserAgent_NotTerm(String userAgent) {
-        setUserAgent_NotTerm(userAgent, null);
-    }
-
-    public void setUserAgent_NotEqual(String userAgent, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setUserAgent_NotTerm(userAgent, opLambda);
-    }
-
-    public void setUserAgent_NotTerm(String userAgent, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setUserAgent_Term(userAgent), opLambda);
-    }
-
-    public void setUserAgent_Terms(Collection<String> userAgentList) {
-        setUserAgent_Terms(userAgentList, null);
-    }
-
-    public void setUserAgent_Terms(Collection<String> userAgentList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("userAgent", userAgentList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_InScope(Collection<String> userAgentList) {
-        setUserAgent_Terms(userAgentList, null);
-    }
-
-    public void setUserAgent_InScope(Collection<String> userAgentList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setUserAgent_Terms(userAgentList, opLambda);
-    }
-
-    public void setUserAgent_Match(String userAgent) {
-        setUserAgent_Match(userAgent, null);
-    }
-
-    public void setUserAgent_Match(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("userAgent", userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_MatchPhrase(String userAgent) {
-        setUserAgent_MatchPhrase(userAgent, null);
-    }
-
-    public void setUserAgent_MatchPhrase(String userAgent, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("userAgent", userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_MatchPhrasePrefix(String userAgent) {
-        setUserAgent_MatchPhrasePrefix(userAgent, null);
-    }
-
-    public void setUserAgent_MatchPhrasePrefix(String userAgent, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("userAgent", userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_Fuzzy(String userAgent) {
-        setUserAgent_Fuzzy(userAgent, null);
-    }
-
-    public void setUserAgent_Fuzzy(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("userAgent", userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_Prefix(String userAgent) {
-        setUserAgent_Prefix(userAgent, null);
-    }
-
-    public void setUserAgent_Prefix(String userAgent, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("userAgent", userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_Wildcard(String userAgent) {
-        setUserAgent_Wildcard(userAgent, null);
-    }
-
-    public void setUserAgent_Wildcard(String userAgent, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("userAgent", userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_Regexp(String userAgent) {
-        setUserAgent_Regexp(userAgent, null);
-    }
-
-    public void setUserAgent_Regexp(String userAgent, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("userAgent", userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    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) {
-        final Object _value = userAgent;
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_LessThan(String userAgent) {
-        setUserAgent_LessThan(userAgent, null);
-    }
-
-    public void setUserAgent_LessThan(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = userAgent;
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_GreaterEqual(String userAgent) {
-        setUserAgent_GreaterEqual(userAgent, null);
-    }
-
-    public void setUserAgent_GreaterEqual(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = userAgent;
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_LessEqual(String userAgent) {
-        setUserAgent_LessEqual(userAgent, null);
-    }
-
-    public void setUserAgent_LessEqual(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = userAgent;
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_Exists() {
-        setUserAgent_Exists(null);
-    }
-
-    public void setUserAgent_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("userAgent");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_CommonTerms(String userAgent) {
-        setUserAgent_CommonTerms(userAgent, null);
-    }
-
-    public void setUserAgent_CommonTerms(String userAgent, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("userAgent", userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsPathMappingCQ addOrderBy_UserAgent_Asc() {
-        regOBA("userAgent");
-        return this;
-    }
-
-    public BsPathMappingCQ addOrderBy_UserAgent_Desc() {
-        regOBD("userAgent");
-        return this;
-    }
-
     public void setUpdatedBy_Equal(String updatedBy) {
         setUpdatedBy_Term(updatedBy, null);
     }
@@ -2052,4 +1830,226 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         return this;
     }
 
+    public void setUserAgent_Equal(String userAgent) {
+        setUserAgent_Term(userAgent, null);
+    }
+
+    public void setUserAgent_Equal(String userAgent, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setUserAgent_Term(userAgent, opLambda);
+    }
+
+    public void setUserAgent_Term(String userAgent) {
+        setUserAgent_Term(userAgent, null);
+    }
+
+    public void setUserAgent_Term(String userAgent, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_NotEqual(String userAgent) {
+        setUserAgent_NotTerm(userAgent, null);
+    }
+
+    public void setUserAgent_NotTerm(String userAgent) {
+        setUserAgent_NotTerm(userAgent, null);
+    }
+
+    public void setUserAgent_NotEqual(String userAgent, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUserAgent_NotTerm(userAgent, opLambda);
+    }
+
+    public void setUserAgent_NotTerm(String userAgent, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUserAgent_Term(userAgent), opLambda);
+    }
+
+    public void setUserAgent_Terms(Collection<String> userAgentList) {
+        setUserAgent_Terms(userAgentList, null);
+    }
+
+    public void setUserAgent_Terms(Collection<String> userAgentList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("userAgent", userAgentList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_InScope(Collection<String> userAgentList) {
+        setUserAgent_Terms(userAgentList, null);
+    }
+
+    public void setUserAgent_InScope(Collection<String> userAgentList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setUserAgent_Terms(userAgentList, opLambda);
+    }
+
+    public void setUserAgent_Match(String userAgent) {
+        setUserAgent_Match(userAgent, null);
+    }
+
+    public void setUserAgent_Match(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_MatchPhrase(String userAgent) {
+        setUserAgent_MatchPhrase(userAgent, null);
+    }
+
+    public void setUserAgent_MatchPhrase(String userAgent, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_MatchPhrasePrefix(String userAgent) {
+        setUserAgent_MatchPhrasePrefix(userAgent, null);
+    }
+
+    public void setUserAgent_MatchPhrasePrefix(String userAgent, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_Fuzzy(String userAgent) {
+        setUserAgent_Fuzzy(userAgent, null);
+    }
+
+    public void setUserAgent_Fuzzy(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_Prefix(String userAgent) {
+        setUserAgent_Prefix(userAgent, null);
+    }
+
+    public void setUserAgent_Prefix(String userAgent, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_Wildcard(String userAgent) {
+        setUserAgent_Wildcard(userAgent, null);
+    }
+
+    public void setUserAgent_Wildcard(String userAgent, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_Regexp(String userAgent) {
+        setUserAgent_Regexp(userAgent, null);
+    }
+
+    public void setUserAgent_Regexp(String userAgent, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    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) {
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_LessThan(String userAgent) {
+        setUserAgent_LessThan(userAgent, null);
+    }
+
+    public void setUserAgent_LessThan(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_GreaterEqual(String userAgent) {
+        setUserAgent_GreaterEqual(userAgent, null);
+    }
+
+    public void setUserAgent_GreaterEqual(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_LessEqual(String userAgent) {
+        setUserAgent_LessEqual(userAgent, null);
+    }
+
+    public void setUserAgent_LessEqual(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_Exists() {
+        setUserAgent_Exists(null);
+    }
+
+    public void setUserAgent_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("userAgent");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_CommonTerms(String userAgent) {
+        setUserAgent_CommonTerms(userAgent, null);
+    }
+
+    public void setUserAgent_CommonTerms(String userAgent, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsPathMappingCQ addOrderBy_UserAgent_Asc() {
+        regOBA("userAgent");
+        return this;
+    }
+
+    public BsPathMappingCQ addOrderBy_UserAgent_Desc() {
+        regOBD("userAgent");
+        return this;
+    }
+
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
index c5859b9deaa253e14bc1cf4f99ca0a16f806e131..07caf0a37ada4a0d9ebc1a0a03567a1062b72c39 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
@@ -186,6 +186,228 @@ public abstract class BsRelatedContentCQ extends EsAbstractConditionQuery {
         return this;
     }
 
+    public void setContent_Equal(String content) {
+        setContent_Term(content, null);
+    }
+
+    public void setContent_Equal(String content, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setContent_Term(content, opLambda);
+    }
+
+    public void setContent_Term(String content) {
+        setContent_Term(content, null);
+    }
+
+    public void setContent_Term(String content, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("content", content);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_NotEqual(String content) {
+        setContent_NotTerm(content, null);
+    }
+
+    public void setContent_NotTerm(String content) {
+        setContent_NotTerm(content, null);
+    }
+
+    public void setContent_NotEqual(String content, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setContent_NotTerm(content, opLambda);
+    }
+
+    public void setContent_NotTerm(String content, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setContent_Term(content), opLambda);
+    }
+
+    public void setContent_Terms(Collection<String> contentList) {
+        setContent_Terms(contentList, null);
+    }
+
+    public void setContent_Terms(Collection<String> contentList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("content", contentList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_InScope(Collection<String> contentList) {
+        setContent_Terms(contentList, null);
+    }
+
+    public void setContent_InScope(Collection<String> contentList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setContent_Terms(contentList, opLambda);
+    }
+
+    public void setContent_Match(String content) {
+        setContent_Match(content, null);
+    }
+
+    public void setContent_Match(String content, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("content", content);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_MatchPhrase(String content) {
+        setContent_MatchPhrase(content, null);
+    }
+
+    public void setContent_MatchPhrase(String content, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("content", content);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_MatchPhrasePrefix(String content) {
+        setContent_MatchPhrasePrefix(content, null);
+    }
+
+    public void setContent_MatchPhrasePrefix(String content, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("content", content);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_Fuzzy(String content) {
+        setContent_Fuzzy(content, null);
+    }
+
+    public void setContent_Fuzzy(String content, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("content", content);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_Prefix(String content) {
+        setContent_Prefix(content, null);
+    }
+
+    public void setContent_Prefix(String content, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("content", content);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_Wildcard(String content) {
+        setContent_Wildcard(content, null);
+    }
+
+    public void setContent_Wildcard(String content, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("content", content);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_Regexp(String content) {
+        setContent_Regexp(content, null);
+    }
+
+    public void setContent_Regexp(String content, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("content", content);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_SpanTerm(String content) {
+        setContent_SpanTerm("content", null);
+    }
+
+    public void setContent_SpanTerm(String content, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("content", content);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_GreaterThan(String content) {
+        setContent_GreaterThan(content, null);
+    }
+
+    public void setContent_GreaterThan(String content, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = content;
+        RangeQueryBuilder builder = regRangeQ("content", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_LessThan(String content) {
+        setContent_LessThan(content, null);
+    }
+
+    public void setContent_LessThan(String content, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = content;
+        RangeQueryBuilder builder = regRangeQ("content", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_GreaterEqual(String content) {
+        setContent_GreaterEqual(content, null);
+    }
+
+    public void setContent_GreaterEqual(String content, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = content;
+        RangeQueryBuilder builder = regRangeQ("content", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_LessEqual(String content) {
+        setContent_LessEqual(content, null);
+    }
+
+    public void setContent_LessEqual(String content, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = content;
+        RangeQueryBuilder builder = regRangeQ("content", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_Exists() {
+        setContent_Exists(null);
+    }
+
+    public void setContent_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("content");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setContent_CommonTerms(String content) {
+        setContent_CommonTerms(content, null);
+    }
+
+    public void setContent_CommonTerms(String content, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("content", content);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsRelatedContentCQ addOrderBy_Content_Asc() {
+        regOBA("content");
+        return this;
+    }
+
+    public BsRelatedContentCQ addOrderBy_Content_Desc() {
+        regOBD("content");
+        return this;
+    }
+
     public void setCreatedBy_Equal(String createdBy) {
         setCreatedBy_Term(createdBy, null);
     }
@@ -586,403 +808,181 @@ public abstract class BsRelatedContentCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
+    public void setSortOrder_Equal(Integer sortOrder) {
+        setSortOrder_Term(sortOrder, null);
     }
 
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
+    public void setSortOrder_Equal(Integer sortOrder, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setSortOrder_Term(sortOrder, opLambda);
     }
 
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
+    public void setSortOrder_Term(Integer sortOrder) {
+        setSortOrder_Term(sortOrder, null);
     }
 
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("updatedBy", updatedBy);
+    public void setSortOrder_Term(Integer sortOrder, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotTerm(updatedBy, null);
+    public void setSortOrder_NotEqual(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy) {
-        setUpdatedBy_NotTerm(updatedBy, null);
+    public void setSortOrder_NotTerm(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSortOrder_Term(sortOrder), opLambda);
     }
 
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Match(String updatedBy) {
-        setUpdatedBy_Match(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Match(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_MatchPhrase(String updatedBy) {
-        setUpdatedBy_MatchPhrase(updatedBy, null);
-    }
-
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy) {
-        setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Fuzzy(String updatedBy) {
-        setUpdatedBy_Fuzzy(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Wildcard(String updatedBy) {
-        setUpdatedBy_Wildcard(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Wildcard(String updatedBy, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Regexp(String updatedBy) {
-        setUpdatedBy_Regexp(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Regexp(String updatedBy, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    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) {
-        final Object _value = updatedBy;
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedBy;
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedBy;
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedBy;
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_CommonTerms(String updatedBy) {
-        setUpdatedBy_CommonTerms(updatedBy, null);
-    }
-
-    public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsRelatedContentCQ addOrderBy_UpdatedBy_Asc() {
-        regOBA("updatedBy");
-        return this;
-    }
-
-    public BsRelatedContentCQ addOrderBy_UpdatedBy_Desc() {
-        regOBD("updatedBy");
-        return this;
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotTerm(updatedTime, null);
-    }
-
-    public void setUpdatedTime_NotTerm(Long updatedTime) {
-        setUpdatedTime_NotTerm(updatedTime, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
+    public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
+        setSortOrder_Terms(sortOrderList, null);
     }
 
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("updatedTime", updatedTimeList);
+    public void setSortOrder_Terms(Collection<Integer> sortOrderList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("sortOrder", sortOrderList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
+    public void setSortOrder_InScope(Collection<Integer> sortOrderList) {
+        setSortOrder_Terms(sortOrderList, null);
     }
 
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
+    public void setSortOrder_InScope(Collection<Integer> sortOrderList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setSortOrder_Terms(sortOrderList, opLambda);
     }
 
-    public void setUpdatedTime_Match(Long updatedTime) {
-        setUpdatedTime_Match(updatedTime, null);
+    public void setSortOrder_Match(Integer sortOrder) {
+        setSortOrder_Match(sortOrder, null);
     }
 
-    public void setUpdatedTime_Match(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("updatedTime", updatedTime);
+    public void setSortOrder_Match(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime) {
-        setUpdatedTime_MatchPhrase(updatedTime, null);
+    public void setSortOrder_MatchPhrase(Integer sortOrder) {
+        setSortOrder_MatchPhrase(sortOrder, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime) {
-        setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
+    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder) {
+        setSortOrder_MatchPhrasePrefix(sortOrder, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime) {
-        setUpdatedTime_Fuzzy(updatedTime, null);
+    public void setSortOrder_Fuzzy(Integer sortOrder) {
+        setSortOrder_Fuzzy(sortOrder, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
+    public void setSortOrder_GreaterThan(Integer sortOrder) {
+        setSortOrder_GreaterThan(sortOrder, null);
     }
 
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedTime;
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
+    public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
+    public void setSortOrder_LessThan(Integer sortOrder) {
+        setSortOrder_LessThan(sortOrder, null);
     }
 
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedTime;
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
+    public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
+    public void setSortOrder_GreaterEqual(Integer sortOrder) {
+        setSortOrder_GreaterEqual(sortOrder, null);
     }
 
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedTime;
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
+    public void setSortOrder_LessEqual(Integer sortOrder) {
+        setSortOrder_LessEqual(sortOrder, null);
     }
 
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedTime;
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
+    public void setSortOrder_Exists() {
+        setSortOrder_Exists(null);
     }
 
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("updatedTime");
+    public void setSortOrder_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_CommonTerms(Long updatedTime) {
-        setUpdatedTime_CommonTerms(updatedTime, null);
+    public void setSortOrder_CommonTerms(Integer sortOrder) {
+        setSortOrder_CommonTerms(sortOrder, null);
     }
 
-    public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
+    public void setSortOrder_CommonTerms(Integer sortOrder, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsRelatedContentCQ addOrderBy_UpdatedTime_Asc() {
-        regOBA("updatedTime");
+    public BsRelatedContentCQ addOrderBy_SortOrder_Asc() {
+        regOBA("sortOrder");
         return this;
     }
 
-    public BsRelatedContentCQ addOrderBy_UpdatedTime_Desc() {
-        regOBD("updatedTime");
+    public BsRelatedContentCQ addOrderBy_SortOrder_Desc() {
+        regOBD("sortOrder");
         return this;
     }
 
@@ -1208,403 +1208,403 @@ public abstract class BsRelatedContentCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setContent_Equal(String content) {
-        setContent_Term(content, null);
+    public void setUpdatedBy_Equal(String updatedBy) {
+        setUpdatedBy_Term(updatedBy, null);
     }
 
-    public void setContent_Equal(String content, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setContent_Term(content, opLambda);
+    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setUpdatedBy_Term(updatedBy, opLambda);
     }
 
-    public void setContent_Term(String content) {
-        setContent_Term(content, null);
+    public void setUpdatedBy_Term(String updatedBy) {
+        setUpdatedBy_Term(updatedBy, null);
     }
 
-    public void setContent_Term(String content, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("content", content);
+    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_NotEqual(String content) {
-        setContent_NotTerm(content, null);
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setContent_NotTerm(String content) {
-        setContent_NotTerm(content, null);
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setContent_NotEqual(String content, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setContent_NotTerm(content, opLambda);
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
     }
 
-    public void setContent_NotTerm(String content, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setContent_Term(content), opLambda);
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
-    public void setContent_Terms(Collection<String> contentList) {
-        setContent_Terms(contentList, null);
+    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
+        setUpdatedBy_Terms(updatedByList, null);
     }
 
-    public void setContent_Terms(Collection<String> contentList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("content", contentList);
+    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("updatedBy", updatedByList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_InScope(Collection<String> contentList) {
-        setContent_Terms(contentList, null);
+    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
+        setUpdatedBy_Terms(updatedByList, null);
     }
 
-    public void setContent_InScope(Collection<String> contentList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setContent_Terms(contentList, opLambda);
+    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setUpdatedBy_Terms(updatedByList, opLambda);
     }
 
-    public void setContent_Match(String content) {
-        setContent_Match(content, null);
+    public void setUpdatedBy_Match(String updatedBy) {
+        setUpdatedBy_Match(updatedBy, null);
     }
 
-    public void setContent_Match(String content, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("content", content);
+    public void setUpdatedBy_Match(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_MatchPhrase(String content) {
-        setContent_MatchPhrase(content, null);
+    public void setUpdatedBy_MatchPhrase(String updatedBy) {
+        setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setContent_MatchPhrase(String content, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("content", content);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_MatchPhrasePrefix(String content) {
-        setContent_MatchPhrasePrefix(content, null);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy) {
+        setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setContent_MatchPhrasePrefix(String content, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("content", content);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_Fuzzy(String content) {
-        setContent_Fuzzy(content, null);
+    public void setUpdatedBy_Fuzzy(String updatedBy) {
+        setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setContent_Fuzzy(String content, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("content", content);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_Prefix(String content) {
-        setContent_Prefix(content, null);
+    public void setUpdatedBy_Prefix(String updatedBy) {
+        setUpdatedBy_Prefix(updatedBy, null);
     }
 
-    public void setContent_Prefix(String content, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("content", content);
+    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_Wildcard(String content) {
-        setContent_Wildcard(content, null);
+    public void setUpdatedBy_Wildcard(String updatedBy) {
+        setUpdatedBy_Wildcard(updatedBy, null);
     }
 
-    public void setContent_Wildcard(String content, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("content", content);
+    public void setUpdatedBy_Wildcard(String updatedBy, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_Regexp(String content) {
-        setContent_Regexp(content, null);
+    public void setUpdatedBy_Regexp(String updatedBy) {
+        setUpdatedBy_Regexp(updatedBy, null);
     }
 
-    public void setContent_Regexp(String content, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("content", content);
+    public void setUpdatedBy_Regexp(String updatedBy, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_SpanTerm(String content) {
-        setContent_SpanTerm("content", null);
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
     }
 
-    public void setContent_SpanTerm(String content, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("content", content);
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_GreaterThan(String content) {
-        setContent_GreaterThan(content, null);
+    public void setUpdatedBy_GreaterThan(String updatedBy) {
+        setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
-    public void setContent_GreaterThan(String content, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = content;
-        RangeQueryBuilder builder = regRangeQ("content", ConditionKey.CK_GREATER_THAN, _value);
+    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_LessThan(String content) {
-        setContent_LessThan(content, null);
+    public void setUpdatedBy_LessThan(String updatedBy) {
+        setUpdatedBy_LessThan(updatedBy, null);
     }
 
-    public void setContent_LessThan(String content, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = content;
-        RangeQueryBuilder builder = regRangeQ("content", ConditionKey.CK_LESS_THAN, _value);
+    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_GreaterEqual(String content) {
-        setContent_GreaterEqual(content, null);
+    public void setUpdatedBy_GreaterEqual(String updatedBy) {
+        setUpdatedBy_GreaterEqual(updatedBy, null);
     }
 
-    public void setContent_GreaterEqual(String content, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = content;
-        RangeQueryBuilder builder = regRangeQ("content", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_LessEqual(String content) {
-        setContent_LessEqual(content, null);
+    public void setUpdatedBy_LessEqual(String updatedBy) {
+        setUpdatedBy_LessEqual(updatedBy, null);
     }
 
-    public void setContent_LessEqual(String content, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = content;
-        RangeQueryBuilder builder = regRangeQ("content", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_Exists() {
-        setContent_Exists(null);
+    public void setUpdatedBy_Exists() {
+        setUpdatedBy_Exists(null);
     }
 
-    public void setContent_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("content");
+    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setContent_CommonTerms(String content) {
-        setContent_CommonTerms(content, null);
+    public void setUpdatedBy_CommonTerms(String updatedBy) {
+        setUpdatedBy_CommonTerms(updatedBy, null);
     }
 
-    public void setContent_CommonTerms(String content, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("content", content);
+    public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsRelatedContentCQ addOrderBy_Content_Asc() {
-        regOBA("content");
+    public BsRelatedContentCQ addOrderBy_UpdatedBy_Asc() {
+        regOBA("updatedBy");
         return this;
     }
 
-    public BsRelatedContentCQ addOrderBy_Content_Desc() {
-        regOBD("content");
+    public BsRelatedContentCQ addOrderBy_UpdatedBy_Desc() {
+        regOBD("updatedBy");
         return this;
     }
 
-    public void setSortOrder_Equal(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
+    public void setUpdatedTime_Equal(Long updatedTime) {
+        setUpdatedTime_Term(updatedTime, null);
     }
 
-    public void setSortOrder_Equal(Integer sortOrder, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setSortOrder_Term(sortOrder, opLambda);
+    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setUpdatedTime_Term(updatedTime, opLambda);
     }
 
-    public void setSortOrder_Term(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
+    public void setUpdatedTime_Term(Long updatedTime) {
+        setUpdatedTime_Term(updatedTime, null);
     }
 
-    public void setSortOrder_Term(Integer sortOrder, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("sortOrder", sortOrder);
+    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_NotEqual(Integer sortOrder) {
-        setSortOrder_NotTerm(sortOrder, null);
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setSortOrder_NotTerm(Integer sortOrder) {
-        setSortOrder_NotTerm(sortOrder, null);
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setSortOrder_NotTerm(sortOrder, opLambda);
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
     }
 
-    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setSortOrder_Term(sortOrder), opLambda);
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
+    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
+        setUpdatedTime_Terms(updatedTimeList, null);
     }
 
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("sortOrder", sortOrderList);
+    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("updatedTime", updatedTimeList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
+    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
+        setUpdatedTime_Terms(updatedTimeList, null);
     }
 
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setSortOrder_Terms(sortOrderList, opLambda);
+    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setUpdatedTime_Terms(updatedTimeList, opLambda);
     }
 
-    public void setSortOrder_Match(Integer sortOrder) {
-        setSortOrder_Match(sortOrder, null);
+    public void setUpdatedTime_Match(Long updatedTime) {
+        setUpdatedTime_Match(updatedTime, null);
     }
 
-    public void setSortOrder_Match(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("sortOrder", sortOrder);
+    public void setUpdatedTime_Match(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_MatchPhrase(Integer sortOrder) {
-        setSortOrder_MatchPhrase(sortOrder, null);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime) {
+        setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder) {
-        setSortOrder_MatchPhrasePrefix(sortOrder, null);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime) {
+        setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_Fuzzy(Integer sortOrder) {
-        setSortOrder_Fuzzy(sortOrder, null);
+    public void setUpdatedTime_Fuzzy(Long updatedTime) {
+        setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_GreaterThan(Integer sortOrder) {
-        setSortOrder_GreaterThan(sortOrder, null);
+    public void setUpdatedTime_GreaterThan(Long updatedTime) {
+        setUpdatedTime_GreaterThan(updatedTime, null);
     }
 
-    public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = sortOrder;
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, _value);
+    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_LessThan(Integer sortOrder) {
-        setSortOrder_LessThan(sortOrder, null);
+    public void setUpdatedTime_LessThan(Long updatedTime) {
+        setUpdatedTime_LessThan(updatedTime, null);
     }
 
-    public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = sortOrder;
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, _value);
+    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_GreaterEqual(Integer sortOrder) {
-        setSortOrder_GreaterEqual(sortOrder, null);
+    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
+        setUpdatedTime_GreaterEqual(updatedTime, null);
     }
 
-    public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = sortOrder;
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_LessEqual(Integer sortOrder) {
-        setSortOrder_LessEqual(sortOrder, null);
+    public void setUpdatedTime_LessEqual(Long updatedTime) {
+        setUpdatedTime_LessEqual(updatedTime, null);
     }
 
-    public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = sortOrder;
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_Exists() {
-        setSortOrder_Exists(null);
+    public void setUpdatedTime_Exists() {
+        setUpdatedTime_Exists(null);
     }
 
-    public void setSortOrder_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("sortOrder");
+    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSortOrder_CommonTerms(Integer sortOrder) {
-        setSortOrder_CommonTerms(sortOrder, null);
+    public void setUpdatedTime_CommonTerms(Long updatedTime) {
+        setUpdatedTime_CommonTerms(updatedTime, null);
     }
 
-    public void setSortOrder_CommonTerms(Integer sortOrder, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("sortOrder", sortOrder);
+    public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsRelatedContentCQ addOrderBy_SortOrder_Asc() {
-        regOBA("sortOrder");
+    public BsRelatedContentCQ addOrderBy_UpdatedTime_Asc() {
+        regOBA("updatedTime");
         return this;
     }
 
-    public BsRelatedContentCQ addOrderBy_SortOrder_Desc() {
-        regOBD("sortOrder");
+    public BsRelatedContentCQ addOrderBy_UpdatedTime_Desc() {
+        regOBD("updatedTime");
         return this;
     }
 
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
index 05bcade7e17d624f0be3217d2b18159df98ec4a4..0cd5e1d4e152617dfa2ae93798e9bd4de2719c42 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
@@ -586,847 +586,847 @@ public abstract class BsRelatedQueryCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
+    public void setQueries_Equal(String queries) {
+        setQueries_Term(queries, null);
     }
 
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
+    public void setQueries_Equal(String queries, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setQueries_Term(queries, opLambda);
     }
 
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
+    public void setQueries_Term(String queries) {
+        setQueries_Term(queries, null);
     }
 
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("updatedBy", updatedBy);
+    public void setQueries_Term(String queries, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("queries", queries);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotTerm(updatedBy, null);
+    public void setQueries_NotEqual(String queries) {
+        setQueries_NotTerm(queries, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy) {
-        setUpdatedBy_NotTerm(updatedBy, null);
+    public void setQueries_NotTerm(String queries) {
+        setQueries_NotTerm(queries, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    public void setQueries_NotEqual(String queries, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setQueries_NotTerm(queries, opLambda);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
+    public void setQueries_NotTerm(String queries, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setQueries_Term(queries), opLambda);
     }
 
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
+    public void setQueries_Terms(Collection<String> queriesList) {
+        setQueries_Terms(queriesList, null);
     }
 
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("updatedBy", updatedByList);
+    public void setQueries_Terms(Collection<String> queriesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("queries", queriesList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
+    public void setQueries_InScope(Collection<String> queriesList) {
+        setQueries_Terms(queriesList, null);
     }
 
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
+    public void setQueries_InScope(Collection<String> queriesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setQueries_Terms(queriesList, opLambda);
     }
 
-    public void setUpdatedBy_Match(String updatedBy) {
-        setUpdatedBy_Match(updatedBy, null);
+    public void setQueries_Match(String queries) {
+        setQueries_Match(queries, null);
     }
 
-    public void setUpdatedBy_Match(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("updatedBy", updatedBy);
+    public void setQueries_Match(String queries, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("queries", queries);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy) {
-        setUpdatedBy_MatchPhrase(updatedBy, null);
+    public void setQueries_MatchPhrase(String queries) {
+        setQueries_MatchPhrase(queries, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setQueries_MatchPhrase(String queries, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queries", queries);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy) {
-        setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
+    public void setQueries_MatchPhrasePrefix(String queries) {
+        setQueries_MatchPhrasePrefix(queries, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setQueries_MatchPhrasePrefix(String queries, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queries", queries);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy) {
-        setUpdatedBy_Fuzzy(updatedBy, null);
+    public void setQueries_Fuzzy(String queries) {
+        setQueries_Fuzzy(queries, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setQueries_Fuzzy(String queries, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("queries", queries);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
+    public void setQueries_Prefix(String queries) {
+        setQueries_Prefix(queries, null);
     }
 
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("updatedBy", updatedBy);
+    public void setQueries_Prefix(String queries, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("queries", queries);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_Wildcard(String updatedBy) {
-        setUpdatedBy_Wildcard(updatedBy, null);
+    public void setQueries_Wildcard(String queries) {
+        setQueries_Wildcard(queries, null);
     }
 
-    public void setUpdatedBy_Wildcard(String updatedBy, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("updatedBy", updatedBy);
+    public void setQueries_Wildcard(String queries, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("queries", queries);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_Regexp(String updatedBy) {
-        setUpdatedBy_Regexp(updatedBy, null);
+    public void setQueries_Regexp(String queries) {
+        setQueries_Regexp(queries, null);
     }
 
-    public void setUpdatedBy_Regexp(String updatedBy, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("updatedBy", updatedBy);
+    public void setQueries_Regexp(String queries, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("queries", queries);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_SpanTerm(String updatedBy) {
-        setUpdatedBy_SpanTerm("updatedBy", null);
+    public void setQueries_SpanTerm(String queries) {
+        setQueries_SpanTerm("queries", null);
     }
 
-    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+    public void setQueries_SpanTerm(String queries, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("queries", queries);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
+    public void setQueries_GreaterThan(String queries) {
+        setQueries_GreaterThan(queries, null);
     }
 
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedBy;
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
+    public void setQueries_GreaterThan(String queries, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queries;
+        RangeQueryBuilder builder = regRangeQ("queries", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
+    public void setQueries_LessThan(String queries) {
+        setQueries_LessThan(queries, null);
     }
 
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedBy;
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
+    public void setQueries_LessThan(String queries, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queries;
+        RangeQueryBuilder builder = regRangeQ("queries", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
+    public void setQueries_GreaterEqual(String queries) {
+        setQueries_GreaterEqual(queries, null);
     }
 
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedBy;
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setQueries_GreaterEqual(String queries, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queries;
+        RangeQueryBuilder builder = regRangeQ("queries", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
+    public void setQueries_LessEqual(String queries) {
+        setQueries_LessEqual(queries, null);
     }
 
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedBy;
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setQueries_LessEqual(String queries, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queries;
+        RangeQueryBuilder builder = regRangeQ("queries", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
+    public void setQueries_Exists() {
+        setQueries_Exists(null);
     }
 
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("updatedBy");
+    public void setQueries_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("queries");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedBy_CommonTerms(String updatedBy) {
-        setUpdatedBy_CommonTerms(updatedBy, null);
+    public void setQueries_CommonTerms(String queries) {
+        setQueries_CommonTerms(queries, null);
     }
 
-    public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
+    public void setQueries_CommonTerms(String queries, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("queries", queries);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsRelatedQueryCQ addOrderBy_UpdatedBy_Asc() {
-        regOBA("updatedBy");
+    public BsRelatedQueryCQ addOrderBy_Queries_Asc() {
+        regOBA("queries");
         return this;
     }
 
-    public BsRelatedQueryCQ addOrderBy_UpdatedBy_Desc() {
-        regOBD("updatedBy");
+    public BsRelatedQueryCQ addOrderBy_Queries_Desc() {
+        regOBD("queries");
         return this;
     }
 
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
+    public void setTerm_Equal(String term) {
+        setTerm_Term(term, null);
     }
 
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
+    public void setTerm_Equal(String term, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setTerm_Term(term, opLambda);
     }
 
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
+    public void setTerm_Term(String term) {
+        setTerm_Term(term, null);
     }
 
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("updatedTime", updatedTime);
+    public void setTerm_Term(String term, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("term", term);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotTerm(updatedTime, null);
+    public void setTerm_NotEqual(String term) {
+        setTerm_NotTerm(term, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime) {
-        setUpdatedTime_NotTerm(updatedTime, null);
+    public void setTerm_NotTerm(String term) {
+        setTerm_NotTerm(term, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    public void setTerm_NotEqual(String term, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTerm_NotTerm(term, opLambda);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
+    public void setTerm_NotTerm(String term, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTerm_Term(term), opLambda);
     }
 
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
+    public void setTerm_Terms(Collection<String> termList) {
+        setTerm_Terms(termList, null);
     }
 
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("updatedTime", updatedTimeList);
+    public void setTerm_Terms(Collection<String> termList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("term", termList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
+    public void setTerm_InScope(Collection<String> termList) {
+        setTerm_Terms(termList, null);
     }
 
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
+    public void setTerm_InScope(Collection<String> termList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setTerm_Terms(termList, opLambda);
     }
 
-    public void setUpdatedTime_Match(Long updatedTime) {
-        setUpdatedTime_Match(updatedTime, null);
+    public void setTerm_Match(String term) {
+        setTerm_Match(term, null);
     }
 
-    public void setUpdatedTime_Match(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("updatedTime", updatedTime);
+    public void setTerm_Match(String term, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("term", term);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime) {
-        setUpdatedTime_MatchPhrase(updatedTime, null);
+    public void setTerm_MatchPhrase(String term) {
+        setTerm_MatchPhrase(term, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setTerm_MatchPhrase(String term, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("term", term);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime) {
-        setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
+    public void setTerm_MatchPhrasePrefix(String term) {
+        setTerm_MatchPhrasePrefix(term, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setTerm_MatchPhrasePrefix(String term, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("term", term);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime) {
-        setUpdatedTime_Fuzzy(updatedTime, null);
+    public void setTerm_Fuzzy(String term) {
+        setTerm_Fuzzy(term, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setTerm_Fuzzy(String term, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("term", term);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
+    public void setTerm_Prefix(String term) {
+        setTerm_Prefix(term, null);
     }
 
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedTime;
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
+    public void setTerm_Prefix(String term, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("term", term);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
+    public void setTerm_Wildcard(String term) {
+        setTerm_Wildcard(term, null);
     }
 
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedTime;
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
+    public void setTerm_Wildcard(String term, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("term", term);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
+    public void setTerm_Regexp(String term) {
+        setTerm_Regexp(term, null);
     }
 
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedTime;
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setTerm_Regexp(String term, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("term", term);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
+    public void setTerm_SpanTerm(String term) {
+        setTerm_SpanTerm("term", null);
     }
 
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = updatedTime;
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setTerm_SpanTerm(String term, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("term", term);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
+    public void setTerm_GreaterThan(String term) {
+        setTerm_GreaterThan(term, null);
     }
 
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("updatedTime");
+    public void setTerm_GreaterThan(String term, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = term;
+        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUpdatedTime_CommonTerms(Long updatedTime) {
-        setUpdatedTime_CommonTerms(updatedTime, null);
+    public void setTerm_LessThan(String term) {
+        setTerm_LessThan(term, null);
     }
 
-    public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
+    public void setTerm_LessThan(String term, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = term;
+        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsRelatedQueryCQ addOrderBy_UpdatedTime_Asc() {
-        regOBA("updatedTime");
-        return this;
+    public void setTerm_GreaterEqual(String term) {
+        setTerm_GreaterEqual(term, null);
     }
 
-    public BsRelatedQueryCQ addOrderBy_UpdatedTime_Desc() {
-        regOBD("updatedTime");
-        return this;
+    public void setTerm_GreaterEqual(String term, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = term;
+        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setTerm_Equal(String term) {
-        setTerm_Term(term, null);
+    public void setTerm_LessEqual(String term) {
+        setTerm_LessEqual(term, null);
     }
 
-    public void setTerm_Equal(String term, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setTerm_Term(term, opLambda);
+    public void setTerm_LessEqual(String term, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = term;
+        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setTerm_Term(String term) {
-        setTerm_Term(term, null);
+    public void setTerm_Exists() {
+        setTerm_Exists(null);
     }
 
-    public void setTerm_Term(String term, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("term", term);
+    public void setTerm_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("term");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_NotEqual(String term) {
-        setTerm_NotTerm(term, null);
+    public void setTerm_CommonTerms(String term) {
+        setTerm_CommonTerms(term, null);
     }
 
-    public void setTerm_NotTerm(String term) {
-        setTerm_NotTerm(term, null);
+    public void setTerm_CommonTerms(String term, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("term", term);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setTerm_NotEqual(String term, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setTerm_NotTerm(term, opLambda);
+    public BsRelatedQueryCQ addOrderBy_Term_Asc() {
+        regOBA("term");
+        return this;
     }
 
-    public void setTerm_NotTerm(String term, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setTerm_Term(term), opLambda);
+    public BsRelatedQueryCQ addOrderBy_Term_Desc() {
+        regOBD("term");
+        return this;
     }
 
-    public void setTerm_Terms(Collection<String> termList) {
-        setTerm_Terms(termList, null);
+    public void setUpdatedBy_Equal(String updatedBy) {
+        setUpdatedBy_Term(updatedBy, null);
     }
 
-    public void setTerm_Terms(Collection<String> termList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("term", termList);
+    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setUpdatedBy_Term(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_Term(String updatedBy) {
+        setUpdatedBy_Term(updatedBy, null);
+    }
+
+    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_InScope(Collection<String> termList) {
-        setTerm_Terms(termList, null);
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setTerm_InScope(Collection<String> termList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setTerm_Terms(termList, opLambda);
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setTerm_Match(String term) {
-        setTerm_Match(term, null);
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
     }
 
-    public void setTerm_Match(String term, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("term", term);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
-    public void setTerm_MatchPhrase(String term) {
-        setTerm_MatchPhrase(term, null);
+    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
+        setUpdatedBy_Terms(updatedByList, null);
     }
 
-    public void setTerm_MatchPhrase(String term, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("term", term);
+    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("updatedBy", updatedByList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_MatchPhrasePrefix(String term) {
-        setTerm_MatchPhrasePrefix(term, null);
+    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
+        setUpdatedBy_Terms(updatedByList, null);
     }
 
-    public void setTerm_MatchPhrasePrefix(String term, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("term", term);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setUpdatedBy_Terms(updatedByList, opLambda);
     }
 
-    public void setTerm_Fuzzy(String term) {
-        setTerm_Fuzzy(term, null);
+    public void setUpdatedBy_Match(String updatedBy) {
+        setUpdatedBy_Match(updatedBy, null);
     }
 
-    public void setTerm_Fuzzy(String term, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("term", term);
+    public void setUpdatedBy_Match(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_Prefix(String term) {
-        setTerm_Prefix(term, null);
+    public void setUpdatedBy_MatchPhrase(String updatedBy) {
+        setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setTerm_Prefix(String term, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("term", term);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_Wildcard(String term) {
-        setTerm_Wildcard(term, null);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy) {
+        setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setTerm_Wildcard(String term, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("term", term);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_Regexp(String term) {
-        setTerm_Regexp(term, null);
+    public void setUpdatedBy_Fuzzy(String updatedBy) {
+        setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setTerm_Regexp(String term, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("term", term);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_SpanTerm(String term) {
-        setTerm_SpanTerm("term", null);
+    public void setUpdatedBy_Prefix(String updatedBy) {
+        setUpdatedBy_Prefix(updatedBy, null);
     }
 
-    public void setTerm_SpanTerm(String term, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("term", term);
+    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_GreaterThan(String term) {
-        setTerm_GreaterThan(term, null);
+    public void setUpdatedBy_Wildcard(String updatedBy) {
+        setUpdatedBy_Wildcard(updatedBy, null);
     }
 
-    public void setTerm_GreaterThan(String term, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = term;
-        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_GREATER_THAN, _value);
+    public void setUpdatedBy_Wildcard(String updatedBy, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_LessThan(String term) {
-        setTerm_LessThan(term, null);
+    public void setUpdatedBy_Regexp(String updatedBy) {
+        setUpdatedBy_Regexp(updatedBy, null);
     }
 
-    public void setTerm_LessThan(String term, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = term;
-        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_LESS_THAN, _value);
+    public void setUpdatedBy_Regexp(String updatedBy, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_GreaterEqual(String term) {
-        setTerm_GreaterEqual(term, null);
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
     }
 
-    public void setTerm_GreaterEqual(String term, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = term;
-        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_LessEqual(String term) {
-        setTerm_LessEqual(term, null);
+    public void setUpdatedBy_GreaterThan(String updatedBy) {
+        setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
-    public void setTerm_LessEqual(String term, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = term;
-        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_Exists() {
-        setTerm_Exists(null);
+    public void setUpdatedBy_LessThan(String updatedBy) {
+        setUpdatedBy_LessThan(updatedBy, null);
     }
 
-    public void setTerm_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("term");
+    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTerm_CommonTerms(String term) {
-        setTerm_CommonTerms(term, null);
+    public void setUpdatedBy_GreaterEqual(String updatedBy) {
+        setUpdatedBy_GreaterEqual(updatedBy, null);
     }
 
-    public void setTerm_CommonTerms(String term, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("term", term);
+    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsRelatedQueryCQ addOrderBy_Term_Asc() {
-        regOBA("term");
-        return this;
+    public void setUpdatedBy_LessEqual(String updatedBy) {
+        setUpdatedBy_LessEqual(updatedBy, null);
     }
 
-    public BsRelatedQueryCQ addOrderBy_Term_Desc() {
-        regOBD("term");
-        return this;
+    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setQueries_Equal(String queries) {
-        setQueries_Term(queries, null);
+    public void setUpdatedBy_Exists() {
+        setUpdatedBy_Exists(null);
     }
 
-    public void setQueries_Equal(String queries, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setQueries_Term(queries, opLambda);
+    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("updatedBy");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setQueries_Term(String queries) {
-        setQueries_Term(queries, null);
+    public void setUpdatedBy_CommonTerms(String updatedBy) {
+        setUpdatedBy_CommonTerms(updatedBy, null);
     }
 
-    public void setQueries_Term(String queries, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("queries", queries);
+    public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueries_NotEqual(String queries) {
-        setQueries_NotTerm(queries, null);
+    public BsRelatedQueryCQ addOrderBy_UpdatedBy_Asc() {
+        regOBA("updatedBy");
+        return this;
     }
 
-    public void setQueries_NotTerm(String queries) {
-        setQueries_NotTerm(queries, null);
+    public BsRelatedQueryCQ addOrderBy_UpdatedBy_Desc() {
+        regOBD("updatedBy");
+        return this;
     }
 
-    public void setQueries_NotEqual(String queries, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setQueries_NotTerm(queries, opLambda);
+    public void setUpdatedTime_Equal(Long updatedTime) {
+        setUpdatedTime_Term(updatedTime, null);
     }
 
-    public void setQueries_NotTerm(String queries, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setQueries_Term(queries), opLambda);
+    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setUpdatedTime_Term(updatedTime, opLambda);
     }
 
-    public void setQueries_Terms(Collection<String> queriesList) {
-        setQueries_Terms(queriesList, null);
+    public void setUpdatedTime_Term(Long updatedTime) {
+        setUpdatedTime_Term(updatedTime, null);
     }
 
-    public void setQueries_Terms(Collection<String> queriesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("queries", queriesList);
+    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueries_InScope(Collection<String> queriesList) {
-        setQueries_Terms(queriesList, null);
-    }
-
-    public void setQueries_InScope(Collection<String> queriesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setQueries_Terms(queriesList, opLambda);
-    }
-
-    public void setQueries_Match(String queries) {
-        setQueries_Match(queries, null);
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setQueries_Match(String queries, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("queries", queries);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setQueries_MatchPhrase(String queries) {
-        setQueries_MatchPhrase(queries, null);
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
     }
 
-    public void setQueries_MatchPhrase(String queries, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queries", queries);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
-    public void setQueries_MatchPhrasePrefix(String queries) {
-        setQueries_MatchPhrasePrefix(queries, null);
+    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
+        setUpdatedTime_Terms(updatedTimeList, null);
     }
 
-    public void setQueries_MatchPhrasePrefix(String queries, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queries", queries);
+    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("updatedTime", updatedTimeList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueries_Fuzzy(String queries) {
-        setQueries_Fuzzy(queries, null);
+    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
+        setUpdatedTime_Terms(updatedTimeList, null);
     }
 
-    public void setQueries_Fuzzy(String queries, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("queries", queries);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setUpdatedTime_Terms(updatedTimeList, opLambda);
     }
 
-    public void setQueries_Prefix(String queries) {
-        setQueries_Prefix(queries, null);
+    public void setUpdatedTime_Match(Long updatedTime) {
+        setUpdatedTime_Match(updatedTime, null);
     }
 
-    public void setQueries_Prefix(String queries, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("queries", queries);
+    public void setUpdatedTime_Match(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueries_Wildcard(String queries) {
-        setQueries_Wildcard(queries, null);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime) {
+        setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setQueries_Wildcard(String queries, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("queries", queries);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueries_Regexp(String queries) {
-        setQueries_Regexp(queries, null);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime) {
+        setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setQueries_Regexp(String queries, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("queries", queries);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueries_SpanTerm(String queries) {
-        setQueries_SpanTerm("queries", null);
+    public void setUpdatedTime_Fuzzy(Long updatedTime) {
+        setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setQueries_SpanTerm(String queries, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("queries", queries);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueries_GreaterThan(String queries) {
-        setQueries_GreaterThan(queries, null);
+    public void setUpdatedTime_GreaterThan(Long updatedTime) {
+        setUpdatedTime_GreaterThan(updatedTime, null);
     }
 
-    public void setQueries_GreaterThan(String queries, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queries;
-        RangeQueryBuilder builder = regRangeQ("queries", ConditionKey.CK_GREATER_THAN, _value);
+    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueries_LessThan(String queries) {
-        setQueries_LessThan(queries, null);
+    public void setUpdatedTime_LessThan(Long updatedTime) {
+        setUpdatedTime_LessThan(updatedTime, null);
     }
 
-    public void setQueries_LessThan(String queries, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queries;
-        RangeQueryBuilder builder = regRangeQ("queries", ConditionKey.CK_LESS_THAN, _value);
+    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueries_GreaterEqual(String queries) {
-        setQueries_GreaterEqual(queries, null);
+    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
+        setUpdatedTime_GreaterEqual(updatedTime, null);
     }
 
-    public void setQueries_GreaterEqual(String queries, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queries;
-        RangeQueryBuilder builder = regRangeQ("queries", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueries_LessEqual(String queries) {
-        setQueries_LessEqual(queries, null);
+    public void setUpdatedTime_LessEqual(Long updatedTime) {
+        setUpdatedTime_LessEqual(updatedTime, null);
     }
 
-    public void setQueries_LessEqual(String queries, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queries;
-        RangeQueryBuilder builder = regRangeQ("queries", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueries_Exists() {
-        setQueries_Exists(null);
+    public void setUpdatedTime_Exists() {
+        setUpdatedTime_Exists(null);
     }
 
-    public void setQueries_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("queries");
+    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueries_CommonTerms(String queries) {
-        setQueries_CommonTerms(queries, null);
+    public void setUpdatedTime_CommonTerms(Long updatedTime) {
+        setUpdatedTime_CommonTerms(updatedTime, null);
     }
 
-    public void setQueries_CommonTerms(String queries, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("queries", queries);
+    public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsRelatedQueryCQ addOrderBy_Queries_Asc() {
-        regOBA("queries");
+    public BsRelatedQueryCQ addOrderBy_UpdatedTime_Asc() {
+        regOBA("updatedTime");
         return this;
     }
 
-    public BsRelatedQueryCQ addOrderBy_Queries_Desc() {
-        regOBD("queries");
+    public BsRelatedQueryCQ addOrderBy_UpdatedTime_Desc() {
+        regOBD("updatedTime");
         return this;
     }
 
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 b8f334b2fb3bfdee6110588543af55e87fd25621..9b1b792d5be45cd63e2912cacaf353e3d6a8c5c1 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
@@ -586,447 +586,669 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setTarget_Equal(String target) {
-        setTarget_Term(target, null);
+    public void setGenerator_Equal(String generator) {
+        setGenerator_Term(generator, null);
     }
 
-    public void setTarget_Equal(String target, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setTarget_Term(target, opLambda);
+    public void setGenerator_Equal(String generator, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setGenerator_Term(generator, opLambda);
     }
 
-    public void setTarget_Term(String target) {
-        setTarget_Term(target, null);
+    public void setGenerator_Term(String generator) {
+        setGenerator_Term(generator, null);
     }
 
-    public void setTarget_Term(String target, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("target", target);
+    public void setGenerator_Term(String generator, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("generator", generator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_NotEqual(String target) {
-        setTarget_NotTerm(target, null);
+    public void setGenerator_NotEqual(String generator) {
+        setGenerator_NotTerm(generator, null);
     }
 
-    public void setTarget_NotTerm(String target) {
-        setTarget_NotTerm(target, null);
+    public void setGenerator_NotTerm(String generator) {
+        setGenerator_NotTerm(generator, null);
     }
 
-    public void setTarget_NotEqual(String target, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setTarget_NotTerm(target, opLambda);
+    public void setGenerator_NotEqual(String generator, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setGenerator_NotTerm(generator, opLambda);
     }
 
-    public void setTarget_NotTerm(String target, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setTarget_Term(target), opLambda);
+    public void setGenerator_NotTerm(String generator, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setGenerator_Term(generator), opLambda);
     }
 
-    public void setTarget_Terms(Collection<String> targetList) {
-        setTarget_Terms(targetList, null);
+    public void setGenerator_Terms(Collection<String> generatorList) {
+        setGenerator_Terms(generatorList, null);
     }
 
-    public void setTarget_Terms(Collection<String> targetList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("target", targetList);
+    public void setGenerator_Terms(Collection<String> generatorList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("generator", generatorList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_InScope(Collection<String> targetList) {
-        setTarget_Terms(targetList, null);
+    public void setGenerator_InScope(Collection<String> generatorList) {
+        setGenerator_Terms(generatorList, null);
     }
 
-    public void setTarget_InScope(Collection<String> targetList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setTarget_Terms(targetList, opLambda);
+    public void setGenerator_InScope(Collection<String> generatorList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setGenerator_Terms(generatorList, opLambda);
     }
 
-    public void setTarget_Match(String target) {
-        setTarget_Match(target, null);
+    public void setGenerator_Match(String generator) {
+        setGenerator_Match(generator, null);
     }
 
-    public void setTarget_Match(String target, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("target", target);
+    public void setGenerator_Match(String generator, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("generator", generator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_MatchPhrase(String target) {
-        setTarget_MatchPhrase(target, null);
+    public void setGenerator_MatchPhrase(String generator) {
+        setGenerator_MatchPhrase(generator, null);
     }
 
-    public void setTarget_MatchPhrase(String target, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("target", target);
+    public void setGenerator_MatchPhrase(String generator, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("generator", generator);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setGenerator_MatchPhrasePrefix(String generator) {
+        setGenerator_MatchPhrasePrefix(generator, null);
+    }
+
+    public void setGenerator_MatchPhrasePrefix(String generator, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("generator", generator);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setGenerator_Fuzzy(String generator) {
+        setGenerator_Fuzzy(generator, null);
+    }
+
+    public void setGenerator_Fuzzy(String generator, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("generator", generator);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setGenerator_Prefix(String generator) {
+        setGenerator_Prefix(generator, null);
+    }
+
+    public void setGenerator_Prefix(String generator, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("generator", generator);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setGenerator_Wildcard(String generator) {
+        setGenerator_Wildcard(generator, null);
+    }
+
+    public void setGenerator_Wildcard(String generator, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("generator", generator);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setGenerator_Regexp(String generator) {
+        setGenerator_Regexp(generator, null);
+    }
+
+    public void setGenerator_Regexp(String generator, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("generator", generator);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    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) {
+        final Object _value = generator;
+        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setGenerator_LessThan(String generator) {
+        setGenerator_LessThan(generator, null);
+    }
+
+    public void setGenerator_LessThan(String generator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = generator;
+        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setGenerator_GreaterEqual(String generator) {
+        setGenerator_GreaterEqual(generator, null);
+    }
+
+    public void setGenerator_GreaterEqual(String generator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = generator;
+        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setGenerator_LessEqual(String generator) {
+        setGenerator_LessEqual(generator, null);
+    }
+
+    public void setGenerator_LessEqual(String generator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = generator;
+        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setGenerator_Exists() {
+        setGenerator_Exists(null);
+    }
+
+    public void setGenerator_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("generator");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setGenerator_CommonTerms(String generator) {
+        setGenerator_CommonTerms(generator, null);
+    }
+
+    public void setGenerator_CommonTerms(String generator, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("generator", generator);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsThumbnailQueueCQ addOrderBy_Generator_Asc() {
+        regOBA("generator");
+        return this;
+    }
+
+    public BsThumbnailQueueCQ addOrderBy_Generator_Desc() {
+        regOBD("generator");
+        return this;
+    }
+
+    public void setPath_Equal(String path) {
+        setPath_Term(path, null);
+    }
+
+    public void setPath_Equal(String path, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setPath_Term(path, opLambda);
+    }
+
+    public void setPath_Term(String path) {
+        setPath_Term(path, null);
+    }
+
+    public void setPath_Term(String path, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("path", path);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPath_NotEqual(String path) {
+        setPath_NotTerm(path, null);
+    }
+
+    public void setPath_NotTerm(String path) {
+        setPath_NotTerm(path, null);
+    }
+
+    public void setPath_NotEqual(String path, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPath_NotTerm(path, opLambda);
+    }
+
+    public void setPath_NotTerm(String path, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPath_Term(path), opLambda);
+    }
+
+    public void setPath_Terms(Collection<String> pathList) {
+        setPath_Terms(pathList, null);
+    }
+
+    public void setPath_Terms(Collection<String> pathList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("path", pathList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPath_InScope(Collection<String> pathList) {
+        setPath_Terms(pathList, null);
+    }
+
+    public void setPath_InScope(Collection<String> pathList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setPath_Terms(pathList, opLambda);
+    }
+
+    public void setPath_Match(String path) {
+        setPath_Match(path, null);
+    }
+
+    public void setPath_Match(String path, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("path", path);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setPath_MatchPhrase(String path) {
+        setPath_MatchPhrase(path, null);
+    }
+
+    public void setPath_MatchPhrase(String path, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("path", path);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_MatchPhrasePrefix(String target) {
-        setTarget_MatchPhrasePrefix(target, null);
+    public void setPath_MatchPhrasePrefix(String path) {
+        setPath_MatchPhrasePrefix(path, null);
     }
 
-    public void setTarget_MatchPhrasePrefix(String target, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("target", target);
+    public void setPath_MatchPhrasePrefix(String path, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("path", path);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_Fuzzy(String target) {
-        setTarget_Fuzzy(target, null);
+    public void setPath_Fuzzy(String path) {
+        setPath_Fuzzy(path, null);
     }
 
-    public void setTarget_Fuzzy(String target, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("target", target);
+    public void setPath_Fuzzy(String path, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("path", path);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_Prefix(String target) {
-        setTarget_Prefix(target, null);
+    public void setPath_Prefix(String path) {
+        setPath_Prefix(path, null);
     }
 
-    public void setTarget_Prefix(String target, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("target", target);
+    public void setPath_Prefix(String path, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("path", path);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_Wildcard(String target) {
-        setTarget_Wildcard(target, null);
+    public void setPath_Wildcard(String path) {
+        setPath_Wildcard(path, null);
     }
 
-    public void setTarget_Wildcard(String target, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("target", target);
+    public void setPath_Wildcard(String path, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("path", path);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_Regexp(String target) {
-        setTarget_Regexp(target, null);
+    public void setPath_Regexp(String path) {
+        setPath_Regexp(path, null);
     }
 
-    public void setTarget_Regexp(String target, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("target", target);
+    public void setPath_Regexp(String path, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("path", path);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_SpanTerm(String target) {
-        setTarget_SpanTerm("target", null);
+    public void setPath_SpanTerm(String path) {
+        setPath_SpanTerm("path", null);
     }
 
-    public void setTarget_SpanTerm(String target, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("target", target);
+    public void setPath_SpanTerm(String path, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("path", path);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_GreaterThan(String target) {
-        setTarget_GreaterThan(target, null);
+    public void setPath_GreaterThan(String path) {
+        setPath_GreaterThan(path, null);
     }
 
-    public void setTarget_GreaterThan(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = target;
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_THAN, _value);
+    public void setPath_GreaterThan(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = path;
+        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_LessThan(String target) {
-        setTarget_LessThan(target, null);
+    public void setPath_LessThan(String path) {
+        setPath_LessThan(path, null);
     }
 
-    public void setTarget_LessThan(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = target;
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_THAN, _value);
+    public void setPath_LessThan(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = path;
+        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_GreaterEqual(String target) {
-        setTarget_GreaterEqual(target, null);
+    public void setPath_GreaterEqual(String path) {
+        setPath_GreaterEqual(path, null);
     }
 
-    public void setTarget_GreaterEqual(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = target;
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setPath_GreaterEqual(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = path;
+        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_LessEqual(String target) {
-        setTarget_LessEqual(target, null);
+    public void setPath_LessEqual(String path) {
+        setPath_LessEqual(path, null);
     }
 
-    public void setTarget_LessEqual(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = target;
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setPath_LessEqual(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = path;
+        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_Exists() {
-        setTarget_Exists(null);
+    public void setPath_Exists() {
+        setPath_Exists(null);
     }
 
-    public void setTarget_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("target");
+    public void setPath_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTarget_CommonTerms(String target) {
-        setTarget_CommonTerms(target, null);
+    public void setPath_CommonTerms(String path) {
+        setPath_CommonTerms(path, null);
     }
 
-    public void setTarget_CommonTerms(String target, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("target", target);
+    public void setPath_CommonTerms(String path, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("path", path);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsThumbnailQueueCQ addOrderBy_Target_Asc() {
-        regOBA("target");
+    public BsThumbnailQueueCQ addOrderBy_Path_Asc() {
+        regOBA("path");
         return this;
     }
 
-    public BsThumbnailQueueCQ addOrderBy_Target_Desc() {
-        regOBD("target");
+    public BsThumbnailQueueCQ addOrderBy_Path_Desc() {
+        regOBD("path");
         return this;
     }
 
-    public void setGenerator_Equal(String generator) {
-        setGenerator_Term(generator, null);
+    public void setTarget_Equal(String target) {
+        setTarget_Term(target, null);
     }
 
-    public void setGenerator_Equal(String generator, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setGenerator_Term(generator, opLambda);
+    public void setTarget_Equal(String target, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setTarget_Term(target, opLambda);
     }
 
-    public void setGenerator_Term(String generator) {
-        setGenerator_Term(generator, null);
+    public void setTarget_Term(String target) {
+        setTarget_Term(target, null);
     }
 
-    public void setGenerator_Term(String generator, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("generator", generator);
+    public void setTarget_Term(String target, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_NotEqual(String generator) {
-        setGenerator_NotTerm(generator, null);
+    public void setTarget_NotEqual(String target) {
+        setTarget_NotTerm(target, null);
     }
 
-    public void setGenerator_NotTerm(String generator) {
-        setGenerator_NotTerm(generator, null);
+    public void setTarget_NotTerm(String target) {
+        setTarget_NotTerm(target, null);
     }
 
-    public void setGenerator_NotEqual(String generator, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setGenerator_NotTerm(generator, opLambda);
+    public void setTarget_NotEqual(String target, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTarget_NotTerm(target, opLambda);
     }
 
-    public void setGenerator_NotTerm(String generator, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setGenerator_Term(generator), opLambda);
+    public void setTarget_NotTerm(String target, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTarget_Term(target), opLambda);
     }
 
-    public void setGenerator_Terms(Collection<String> generatorList) {
-        setGenerator_Terms(generatorList, null);
+    public void setTarget_Terms(Collection<String> targetList) {
+        setTarget_Terms(targetList, null);
     }
 
-    public void setGenerator_Terms(Collection<String> generatorList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("generator", generatorList);
+    public void setTarget_Terms(Collection<String> targetList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("target", targetList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_InScope(Collection<String> generatorList) {
-        setGenerator_Terms(generatorList, null);
+    public void setTarget_InScope(Collection<String> targetList) {
+        setTarget_Terms(targetList, null);
     }
 
-    public void setGenerator_InScope(Collection<String> generatorList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setGenerator_Terms(generatorList, opLambda);
+    public void setTarget_InScope(Collection<String> targetList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setTarget_Terms(targetList, opLambda);
     }
 
-    public void setGenerator_Match(String generator) {
-        setGenerator_Match(generator, null);
+    public void setTarget_Match(String target) {
+        setTarget_Match(target, null);
     }
 
-    public void setGenerator_Match(String generator, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("generator", generator);
+    public void setTarget_Match(String target, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_MatchPhrase(String generator) {
-        setGenerator_MatchPhrase(generator, null);
+    public void setTarget_MatchPhrase(String target) {
+        setTarget_MatchPhrase(target, null);
     }
 
-    public void setGenerator_MatchPhrase(String generator, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("generator", generator);
+    public void setTarget_MatchPhrase(String target, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_MatchPhrasePrefix(String generator) {
-        setGenerator_MatchPhrasePrefix(generator, null);
+    public void setTarget_MatchPhrasePrefix(String target) {
+        setTarget_MatchPhrasePrefix(target, null);
     }
 
-    public void setGenerator_MatchPhrasePrefix(String generator, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("generator", generator);
+    public void setTarget_MatchPhrasePrefix(String target, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_Fuzzy(String generator) {
-        setGenerator_Fuzzy(generator, null);
+    public void setTarget_Fuzzy(String target) {
+        setTarget_Fuzzy(target, null);
     }
 
-    public void setGenerator_Fuzzy(String generator, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("generator", generator);
+    public void setTarget_Fuzzy(String target, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_Prefix(String generator) {
-        setGenerator_Prefix(generator, null);
+    public void setTarget_Prefix(String target) {
+        setTarget_Prefix(target, null);
     }
 
-    public void setGenerator_Prefix(String generator, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("generator", generator);
+    public void setTarget_Prefix(String target, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_Wildcard(String generator) {
-        setGenerator_Wildcard(generator, null);
+    public void setTarget_Wildcard(String target) {
+        setTarget_Wildcard(target, null);
     }
 
-    public void setGenerator_Wildcard(String generator, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("generator", generator);
+    public void setTarget_Wildcard(String target, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_Regexp(String generator) {
-        setGenerator_Regexp(generator, null);
+    public void setTarget_Regexp(String target) {
+        setTarget_Regexp(target, null);
     }
 
-    public void setGenerator_Regexp(String generator, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("generator", generator);
+    public void setTarget_Regexp(String target, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_SpanTerm(String generator) {
-        setGenerator_SpanTerm("generator", null);
+    public void setTarget_SpanTerm(String target) {
+        setTarget_SpanTerm("target", null);
     }
 
-    public void setGenerator_SpanTerm(String generator, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("generator", generator);
+    public void setTarget_SpanTerm(String target, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_GreaterThan(String generator) {
-        setGenerator_GreaterThan(generator, null);
+    public void setTarget_GreaterThan(String target) {
+        setTarget_GreaterThan(target, null);
     }
 
-    public void setGenerator_GreaterThan(String generator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = generator;
-        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_GREATER_THAN, _value);
+    public void setTarget_GreaterThan(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_LessThan(String generator) {
-        setGenerator_LessThan(generator, null);
+    public void setTarget_LessThan(String target) {
+        setTarget_LessThan(target, null);
     }
 
-    public void setGenerator_LessThan(String generator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = generator;
-        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_LESS_THAN, _value);
+    public void setTarget_LessThan(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_GreaterEqual(String generator) {
-        setGenerator_GreaterEqual(generator, null);
+    public void setTarget_GreaterEqual(String target) {
+        setTarget_GreaterEqual(target, null);
     }
 
-    public void setGenerator_GreaterEqual(String generator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = generator;
-        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setTarget_GreaterEqual(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_LessEqual(String generator) {
-        setGenerator_LessEqual(generator, null);
+    public void setTarget_LessEqual(String target) {
+        setTarget_LessEqual(target, null);
     }
 
-    public void setGenerator_LessEqual(String generator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = generator;
-        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setTarget_LessEqual(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_Exists() {
-        setGenerator_Exists(null);
+    public void setTarget_Exists() {
+        setTarget_Exists(null);
     }
 
-    public void setGenerator_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("generator");
+    public void setTarget_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGenerator_CommonTerms(String generator) {
-        setGenerator_CommonTerms(generator, null);
+    public void setTarget_CommonTerms(String target) {
+        setTarget_CommonTerms(target, null);
     }
 
-    public void setGenerator_CommonTerms(String generator, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("generator", generator);
+    public void setTarget_CommonTerms(String target, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsThumbnailQueueCQ addOrderBy_Generator_Asc() {
-        regOBA("generator");
+    public BsThumbnailQueueCQ addOrderBy_Target_Asc() {
+        regOBA("target");
         return this;
     }
 
-    public BsThumbnailQueueCQ addOrderBy_Generator_Desc() {
-        regOBD("generator");
+    public BsThumbnailQueueCQ addOrderBy_Target_Desc() {
+        regOBD("target");
         return this;
     }
 
@@ -1252,226 +1474,4 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setPath_Equal(String path) {
-        setPath_Term(path, null);
-    }
-
-    public void setPath_Equal(String path, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setPath_Term(path, opLambda);
-    }
-
-    public void setPath_Term(String path) {
-        setPath_Term(path, null);
-    }
-
-    public void setPath_Term(String path, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_NotEqual(String path) {
-        setPath_NotTerm(path, null);
-    }
-
-    public void setPath_NotTerm(String path) {
-        setPath_NotTerm(path, null);
-    }
-
-    public void setPath_NotEqual(String path, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setPath_NotTerm(path, opLambda);
-    }
-
-    public void setPath_NotTerm(String path, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setPath_Term(path), opLambda);
-    }
-
-    public void setPath_Terms(Collection<String> pathList) {
-        setPath_Terms(pathList, null);
-    }
-
-    public void setPath_Terms(Collection<String> pathList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("path", pathList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_InScope(Collection<String> pathList) {
-        setPath_Terms(pathList, null);
-    }
-
-    public void setPath_InScope(Collection<String> pathList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setPath_Terms(pathList, opLambda);
-    }
-
-    public void setPath_Match(String path) {
-        setPath_Match(path, null);
-    }
-
-    public void setPath_Match(String path, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_MatchPhrase(String path) {
-        setPath_MatchPhrase(path, null);
-    }
-
-    public void setPath_MatchPhrase(String path, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_MatchPhrasePrefix(String path) {
-        setPath_MatchPhrasePrefix(path, null);
-    }
-
-    public void setPath_MatchPhrasePrefix(String path, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_Fuzzy(String path) {
-        setPath_Fuzzy(path, null);
-    }
-
-    public void setPath_Fuzzy(String path, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_Prefix(String path) {
-        setPath_Prefix(path, null);
-    }
-
-    public void setPath_Prefix(String path, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_Wildcard(String path) {
-        setPath_Wildcard(path, null);
-    }
-
-    public void setPath_Wildcard(String path, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_Regexp(String path) {
-        setPath_Regexp(path, null);
-    }
-
-    public void setPath_Regexp(String path, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    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) {
-        final Object _value = path;
-        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_GREATER_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_LessThan(String path) {
-        setPath_LessThan(path, null);
-    }
-
-    public void setPath_LessThan(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = path;
-        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_LESS_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_GreaterEqual(String path) {
-        setPath_GreaterEqual(path, null);
-    }
-
-    public void setPath_GreaterEqual(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = path;
-        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_GREATER_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_LessEqual(String path) {
-        setPath_LessEqual(path, null);
-    }
-
-    public void setPath_LessEqual(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = path;
-        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_Exists() {
-        setPath_Exists(null);
-    }
-
-    public void setPath_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("path");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_CommonTerms(String path) {
-        setPath_CommonTerms(path, null);
-    }
-
-    public void setPath_CommonTerms(String path, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsThumbnailQueueCQ addOrderBy_Path_Asc() {
-        regOBA("path");
-        return this;
-    }
-
-    public BsThumbnailQueueCQ addOrderBy_Path_Desc() {
-        regOBD("path");
-        return this;
-    }
-
 }
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 887dc4bd7f2662f3f4cb3031fe9dfb16a131d1a5..76a4e92414bb3a409cefb64788b720dc6fbf440d 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
@@ -2619,184 +2619,6 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setTimeToLive_Equal(Integer timeToLive) {
-        setTimeToLive_Term(timeToLive, null);
-    }
-
-    public void setTimeToLive_Equal(Integer timeToLive, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setTimeToLive_Term(timeToLive, opLambda);
-    }
-
-    public void setTimeToLive_Term(Integer timeToLive) {
-        setTimeToLive_Term(timeToLive, null);
-    }
-
-    public void setTimeToLive_Term(Integer timeToLive, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("timeToLive", timeToLive);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_NotEqual(Integer timeToLive) {
-        setTimeToLive_NotTerm(timeToLive, null);
-    }
-
-    public void setTimeToLive_NotTerm(Integer timeToLive) {
-        setTimeToLive_NotTerm(timeToLive, null);
-    }
-
-    public void setTimeToLive_NotEqual(Integer timeToLive, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setTimeToLive_NotTerm(timeToLive, opLambda);
-    }
-
-    public void setTimeToLive_NotTerm(Integer timeToLive, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setTimeToLive_Term(timeToLive), opLambda);
-    }
-
-    public void setTimeToLive_Terms(Collection<Integer> timeToLiveList) {
-        setTimeToLive_Terms(timeToLiveList, null);
-    }
-
-    public void setTimeToLive_Terms(Collection<Integer> timeToLiveList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("timeToLive", timeToLiveList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_InScope(Collection<Integer> timeToLiveList) {
-        setTimeToLive_Terms(timeToLiveList, null);
-    }
-
-    public void setTimeToLive_InScope(Collection<Integer> timeToLiveList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setTimeToLive_Terms(timeToLiveList, opLambda);
-    }
-
-    public void setTimeToLive_Match(Integer timeToLive) {
-        setTimeToLive_Match(timeToLive, null);
-    }
-
-    public void setTimeToLive_Match(Integer timeToLive, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("timeToLive", timeToLive);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_MatchPhrase(Integer timeToLive) {
-        setTimeToLive_MatchPhrase(timeToLive, null);
-    }
-
-    public void setTimeToLive_MatchPhrase(Integer timeToLive, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("timeToLive", timeToLive);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_MatchPhrasePrefix(Integer timeToLive) {
-        setTimeToLive_MatchPhrasePrefix(timeToLive, null);
-    }
-
-    public void setTimeToLive_MatchPhrasePrefix(Integer timeToLive, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("timeToLive", timeToLive);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Fuzzy(Integer timeToLive) {
-        setTimeToLive_Fuzzy(timeToLive, null);
-    }
-
-    public void setTimeToLive_Fuzzy(Integer timeToLive, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("timeToLive", timeToLive);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_GreaterThan(Integer timeToLive) {
-        setTimeToLive_GreaterThan(timeToLive, null);
-    }
-
-    public void setTimeToLive_GreaterThan(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = timeToLive;
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_LessThan(Integer timeToLive) {
-        setTimeToLive_LessThan(timeToLive, null);
-    }
-
-    public void setTimeToLive_LessThan(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = timeToLive;
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_GreaterEqual(Integer timeToLive) {
-        setTimeToLive_GreaterEqual(timeToLive, null);
-    }
-
-    public void setTimeToLive_GreaterEqual(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = timeToLive;
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_LessEqual(Integer timeToLive) {
-        setTimeToLive_LessEqual(timeToLive, null);
-    }
-
-    public void setTimeToLive_LessEqual(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = timeToLive;
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_Exists() {
-        setTimeToLive_Exists(null);
-    }
-
-    public void setTimeToLive_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("timeToLive");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTimeToLive_CommonTerms(Integer timeToLive) {
-        setTimeToLive_CommonTerms(timeToLive, null);
-    }
-
-    public void setTimeToLive_CommonTerms(Integer timeToLive, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("timeToLive", timeToLive);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsWebConfigCQ addOrderBy_TimeToLive_Asc() {
-        regOBA("timeToLive");
-        return this;
-    }
-
-    public BsWebConfigCQ addOrderBy_TimeToLive_Desc() {
-        regOBD("timeToLive");
-        return this;
-    }
-
     public void setMaxAccessCount_Equal(Long maxAccessCount) {
         setMaxAccessCount_Term(maxAccessCount, null);
     }
@@ -3775,6 +3597,184 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         return this;
     }
 
+    public void setTimeToLive_Equal(Integer timeToLive) {
+        setTimeToLive_Term(timeToLive, null);
+    }
+
+    public void setTimeToLive_Equal(Integer timeToLive, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setTimeToLive_Term(timeToLive, opLambda);
+    }
+
+    public void setTimeToLive_Term(Integer timeToLive) {
+        setTimeToLive_Term(timeToLive, null);
+    }
+
+    public void setTimeToLive_Term(Integer timeToLive, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("timeToLive", timeToLive);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_NotEqual(Integer timeToLive) {
+        setTimeToLive_NotTerm(timeToLive, null);
+    }
+
+    public void setTimeToLive_NotTerm(Integer timeToLive) {
+        setTimeToLive_NotTerm(timeToLive, null);
+    }
+
+    public void setTimeToLive_NotEqual(Integer timeToLive, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTimeToLive_NotTerm(timeToLive, opLambda);
+    }
+
+    public void setTimeToLive_NotTerm(Integer timeToLive, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTimeToLive_Term(timeToLive), opLambda);
+    }
+
+    public void setTimeToLive_Terms(Collection<Integer> timeToLiveList) {
+        setTimeToLive_Terms(timeToLiveList, null);
+    }
+
+    public void setTimeToLive_Terms(Collection<Integer> timeToLiveList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("timeToLive", timeToLiveList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_InScope(Collection<Integer> timeToLiveList) {
+        setTimeToLive_Terms(timeToLiveList, null);
+    }
+
+    public void setTimeToLive_InScope(Collection<Integer> timeToLiveList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setTimeToLive_Terms(timeToLiveList, opLambda);
+    }
+
+    public void setTimeToLive_Match(Integer timeToLive) {
+        setTimeToLive_Match(timeToLive, null);
+    }
+
+    public void setTimeToLive_Match(Integer timeToLive, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("timeToLive", timeToLive);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_MatchPhrase(Integer timeToLive) {
+        setTimeToLive_MatchPhrase(timeToLive, null);
+    }
+
+    public void setTimeToLive_MatchPhrase(Integer timeToLive, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("timeToLive", timeToLive);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_MatchPhrasePrefix(Integer timeToLive) {
+        setTimeToLive_MatchPhrasePrefix(timeToLive, null);
+    }
+
+    public void setTimeToLive_MatchPhrasePrefix(Integer timeToLive, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("timeToLive", timeToLive);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Fuzzy(Integer timeToLive) {
+        setTimeToLive_Fuzzy(timeToLive, null);
+    }
+
+    public void setTimeToLive_Fuzzy(Integer timeToLive, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("timeToLive", timeToLive);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_GreaterThan(Integer timeToLive) {
+        setTimeToLive_GreaterThan(timeToLive, null);
+    }
+
+    public void setTimeToLive_GreaterThan(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_LessThan(Integer timeToLive) {
+        setTimeToLive_LessThan(timeToLive, null);
+    }
+
+    public void setTimeToLive_LessThan(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_GreaterEqual(Integer timeToLive) {
+        setTimeToLive_GreaterEqual(timeToLive, null);
+    }
+
+    public void setTimeToLive_GreaterEqual(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_LessEqual(Integer timeToLive) {
+        setTimeToLive_LessEqual(timeToLive, null);
+    }
+
+    public void setTimeToLive_LessEqual(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_Exists() {
+        setTimeToLive_Exists(null);
+    }
+
+    public void setTimeToLive_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("timeToLive");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTimeToLive_CommonTerms(Integer timeToLive) {
+        setTimeToLive_CommonTerms(timeToLive, null);
+    }
+
+    public void setTimeToLive_CommonTerms(Integer timeToLive, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("timeToLive", timeToLive);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsWebConfigCQ addOrderBy_TimeToLive_Asc() {
+        regOBA("timeToLive");
+        return this;
+    }
+
+    public BsWebConfigCQ addOrderBy_TimeToLive_Desc() {
+        regOBD("timeToLive");
+        return this;
+    }
+
     public void setUpdatedBy_Equal(String updatedBy) {
         setUpdatedBy_Term(updatedBy, null);
     }
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 f8bd808d4fb14eb0c695be88d8d1123c37739109..0f52495b0c07956651f1fa5357551393c270818a 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
@@ -145,7 +145,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         final EsPagingResultBean<RESULT> list = new EsPagingResultBean<>(builder);
         final SearchHits searchHits = response.getHits();
         searchHits.forEach(hit -> {
-            final Map<String, Object> source = hit.getSource();
+            final Map<String, Object> source = hit.getSourceAsMap();
             final RESULT entity = createEntity(source, entityType);
             final DocMeta docMeta = ((EsAbstractEntity) entity).asDocMeta();
             docMeta.id(hit.getId());
@@ -157,7 +157,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         list.setAllRecordCount((int) searchHits.getTotalHits());
         list.setCurrentPageNumber(cb.getFetchPageNumber());
 
-        list.setTook(response.getTookInMillis());
+        list.setTook(response.getTook().getMillis());
         list.setTotalShards(response.getTotalShards());
         list.setSuccessfulShards(response.getSuccessfulShards());
         list.setFailedShards(response.getFailedShards());
@@ -183,7 +183,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
                 if (handler.isBreakCursor()) {
                     return;
                 }
-                final Map<String, Object> source = hit.getSource();
+                final Map<String, Object> source = hit.getSourceAsMap();
                 final RESULT entity = createEntity(source, entityType);
                 final DocMeta docMeta = ((EsAbstractEntity) entity).asDocMeta();
                 docMeta.id(hit.getId());
@@ -204,7 +204,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         delegateBulkRequest(cb, searchHits -> {
             List<RESULT> list = new ArrayList<>();
             searchHits.forEach(hit -> {
-                final Map<String, Object> source = hit.getSource();
+                final Map<String, Object> source = hit.getSourceAsMap();
                 final RESULT entity = createEntity(source, entityType);
                 final DocMeta docMeta = ((EsAbstractEntity) entity).asDocMeta();
                 docMeta.id(hit.getId());
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 76c9bdf330a4627a08f3b9c8b5da1922dcc37583..8be3e9c75fedd6129feb313ea6883c8c5145c118 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
@@ -29,9 +29,9 @@ import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuil
 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.DateRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -126,8 +126,8 @@ public abstract class EsAbstractConditionAggregation {
         return builder;
     }
 
-    protected PercentileRanksAggregationBuilder regPercentileRanksA(String name, String field) {
-        PercentileRanksAggregationBuilder builder = AggregationBuilders.percentileRanks(name).field(field);
+    protected PercentileRanksAggregationBuilder regPercentileRanksA(String name, String field, double[] values) {
+        PercentileRanksAggregationBuilder builder = AggregationBuilders.percentileRanks(name, values).field(field);
         regA(builder);
         return builder;
     }
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
index 888cc24976d21995d67e8b6a92fda3d7b4485ec6..44f434ccfa908887a57410e1c7bde81385784699 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
@@ -51,7 +51,7 @@ public abstract class BsClickLogBhv extends EsAbstractBehavior<ClickLog, ClickLo
 
     @Override
     protected String asEsIndex() {
-        return "fess_log";
+        return "fess_log.click_log";
     }
 
     @Override
@@ -73,13 +73,13 @@ public abstract class BsClickLogBhv extends EsAbstractBehavior<ClickLog, ClickLo
     protected <RESULT extends ClickLog> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
+            result.setDocId(DfTypeUtil.toString(source.get("docId")));
+            result.setOrder(DfTypeUtil.toInteger(source.get("order")));
+            result.setQueryId(DfTypeUtil.toString(source.get("queryId")));
             result.setQueryRequestedAt(toLocalDateTime(source.get("queryRequestedAt")));
             result.setRequestedAt(toLocalDateTime(source.get("requestedAt")));
-            result.setQueryId(DfTypeUtil.toString(source.get("queryId")));
-            result.setDocId(DfTypeUtil.toString(source.get("docId")));
-            result.setUserSessionId(DfTypeUtil.toString(source.get("userSessionId")));
             result.setUrl(DfTypeUtil.toString(source.get("url")));
-            result.setOrder(DfTypeUtil.toInteger(source.get("order")));
+            result.setUserSessionId(DfTypeUtil.toString(source.get("userSessionId")));
             return updateEntity(source, result);
         } catch (InstantiationException | IllegalAccessException e) {
             final String msg = "Cannot create a new instance: " + entityType.getName();
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
index 2ba4525a2c31e549583cfea70c7e81a2f08431e2..2d90309f78067953e95e5a6a127e27609ca33e98 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
@@ -51,7 +51,7 @@ public abstract class BsFavoriteLogBhv extends EsAbstractBehavior<FavoriteLog, F
 
     @Override
     protected String asEsIndex() {
-        return "fess_log";
+        return "fess_log.favorite_log";
     }
 
     @Override
@@ -74,9 +74,9 @@ public abstract class BsFavoriteLogBhv extends EsAbstractBehavior<FavoriteLog, F
         try {
             final RESULT result = entityType.newInstance();
             result.setCreatedAt(toLocalDateTime(source.get("createdAt")));
-            result.setUrl(DfTypeUtil.toString(source.get("url")));
             result.setDocId(DfTypeUtil.toString(source.get("docId")));
             result.setQueryId(DfTypeUtil.toString(source.get("queryId")));
+            result.setUrl(DfTypeUtil.toString(source.get("url")));
             result.setUserInfoId(DfTypeUtil.toString(source.get("userInfoId")));
             return updateEntity(source, result);
         } catch (InstantiationException | IllegalAccessException e) {
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
index a059a2427b43b0818a0e3834c7a290c0ecb0c1f0..94478036cd24dfce615204ca2c2d4b1316006d51 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
@@ -51,7 +51,7 @@ public abstract class BsSearchLogBhv extends EsAbstractBehavior<SearchLog, Searc
 
     @Override
     protected String asEsIndex() {
-        return "fess_log";
+        return "fess_log.search_log";
     }
 
     @Override
@@ -74,22 +74,22 @@ public abstract class BsSearchLogBhv extends EsAbstractBehavior<SearchLog, Searc
         try {
             final RESULT result = entityType.newInstance();
             result.setAccessType(DfTypeUtil.toString(source.get("accessType")));
-            result.setUser(DfTypeUtil.toString(source.get("user")));
-            result.setRoles(toStringArray(source.get("roles")));
-            result.setQueryId(DfTypeUtil.toString(source.get("queryId")));
             result.setClientIp(DfTypeUtil.toString(source.get("clientIp")));
             result.setHitCount(DfTypeUtil.toLong(source.get("hitCount")));
+            result.setLanguages(DfTypeUtil.toString(source.get("languages")));
+            result.setQueryId(DfTypeUtil.toString(source.get("queryId")));
             result.setQueryOffset(DfTypeUtil.toInteger(source.get("queryOffset")));
             result.setQueryPageSize(DfTypeUtil.toInteger(source.get("queryPageSize")));
+            result.setQueryTime(DfTypeUtil.toLong(source.get("queryTime")));
             result.setReferer(DfTypeUtil.toString(source.get("referer")));
             result.setRequestedAt(toLocalDateTime(source.get("requestedAt")));
             result.setResponseTime(DfTypeUtil.toLong(source.get("responseTime")));
-            result.setQueryTime(DfTypeUtil.toLong(source.get("queryTime")));
+            result.setRoles(toStringArray(source.get("roles")));
             result.setSearchWord(DfTypeUtil.toString(source.get("searchWord")));
+            result.setUser(DfTypeUtil.toString(source.get("user")));
             result.setUserAgent(DfTypeUtil.toString(source.get("userAgent")));
             result.setUserInfoId(DfTypeUtil.toString(source.get("userInfoId")));
             result.setUserSessionId(DfTypeUtil.toString(source.get("userSessionId")));
-            result.setLanguages(DfTypeUtil.toString(source.get("languages")));
             result.setVirtualHost(DfTypeUtil.toString(source.get("virtualHost")));
             return updateEntity(source, result);
         } catch (InstantiationException | IllegalAccessException e) {
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
index 7a17bff230e216cf7e6a77de670d517dea5896bc..14f8b6f42f8e4cd5f8400497c78b775cd21a5fce 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
@@ -50,7 +50,7 @@ public abstract class BsUserInfoBhv extends EsAbstractBehavior<UserInfo, UserInf
 
     @Override
     protected String asEsIndex() {
-        return "fess_log";
+        return "fess_log.user_info";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java
index d82e22564d24d86f8fa8a963c81bf7b28a609101..ac6a83e87cb5c27face6bd22dcc57350c4d56e09 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java
@@ -37,26 +37,26 @@ public class BsClickLog extends EsAbstractEntity {
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    /** queryRequestedAt */
-    protected LocalDateTime queryRequestedAt;
+    /** docId */
+    protected String docId;
 
-    /** requestedAt */
-    protected LocalDateTime requestedAt;
+    /** order */
+    protected Integer order;
 
     /** queryId */
     protected String queryId;
 
-    /** docId */
-    protected String docId;
+    /** queryRequestedAt */
+    protected LocalDateTime queryRequestedAt;
 
-    /** userSessionId */
-    protected String userSessionId;
+    /** requestedAt */
+    protected LocalDateTime requestedAt;
 
     /** url */
     protected String url;
 
-    /** order */
-    protected Integer order;
+    /** userSessionId */
+    protected String userSessionId;
 
     // [Referrers] *comment only
 
@@ -79,26 +79,26 @@ public class BsClickLog extends EsAbstractEntity {
     @Override
     public Map<String, Object> toSource() {
         Map<String, Object> sourceMap = new HashMap<>();
-        if (queryRequestedAt != null) {
-            addFieldToSource(sourceMap, "queryRequestedAt", queryRequestedAt);
+        if (docId != null) {
+            addFieldToSource(sourceMap, "docId", docId);
         }
-        if (requestedAt != null) {
-            addFieldToSource(sourceMap, "requestedAt", requestedAt);
+        if (order != null) {
+            addFieldToSource(sourceMap, "order", order);
         }
         if (queryId != null) {
             addFieldToSource(sourceMap, "queryId", queryId);
         }
-        if (docId != null) {
-            addFieldToSource(sourceMap, "docId", docId);
+        if (queryRequestedAt != null) {
+            addFieldToSource(sourceMap, "queryRequestedAt", queryRequestedAt);
         }
-        if (userSessionId != null) {
-            addFieldToSource(sourceMap, "userSessionId", userSessionId);
+        if (requestedAt != null) {
+            addFieldToSource(sourceMap, "requestedAt", requestedAt);
         }
         if (url != null) {
             addFieldToSource(sourceMap, "url", url);
         }
-        if (order != null) {
-            addFieldToSource(sourceMap, "order", order);
+        if (userSessionId != null) {
+            addFieldToSource(sourceMap, "userSessionId", userSessionId);
         }
         return sourceMap;
     }
@@ -113,13 +113,13 @@ public class BsClickLog extends EsAbstractEntity {
     @Override
     protected String doBuildColumnString(String dm) {
         StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(docId);
+        sb.append(dm).append(order);
+        sb.append(dm).append(queryId);
         sb.append(dm).append(queryRequestedAt);
         sb.append(dm).append(requestedAt);
-        sb.append(dm).append(queryId);
-        sb.append(dm).append(docId);
-        sb.append(dm).append(userSessionId);
         sb.append(dm).append(url);
-        sb.append(dm).append(order);
+        sb.append(dm).append(userSessionId);
         if (sb.length() > dm.length()) {
             sb.delete(0, dm.length());
         }
@@ -130,24 +130,24 @@ public class BsClickLog extends EsAbstractEntity {
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
-    public LocalDateTime getQueryRequestedAt() {
-        checkSpecifiedProperty("queryRequestedAt");
-        return queryRequestedAt;
+    public String getDocId() {
+        checkSpecifiedProperty("docId");
+        return convertEmptyToNull(docId);
     }
 
-    public void setQueryRequestedAt(LocalDateTime value) {
-        registerModifiedProperty("queryRequestedAt");
-        this.queryRequestedAt = value;
+    public void setDocId(String value) {
+        registerModifiedProperty("docId");
+        this.docId = value;
     }
 
-    public LocalDateTime getRequestedAt() {
-        checkSpecifiedProperty("requestedAt");
-        return requestedAt;
+    public Integer getOrder() {
+        checkSpecifiedProperty("order");
+        return order;
     }
 
-    public void setRequestedAt(LocalDateTime value) {
-        registerModifiedProperty("requestedAt");
-        this.requestedAt = value;
+    public void setOrder(Integer value) {
+        registerModifiedProperty("order");
+        this.order = value;
     }
 
     public String getQueryId() {
@@ -160,24 +160,24 @@ public class BsClickLog extends EsAbstractEntity {
         this.queryId = value;
     }
 
-    public String getDocId() {
-        checkSpecifiedProperty("docId");
-        return convertEmptyToNull(docId);
+    public LocalDateTime getQueryRequestedAt() {
+        checkSpecifiedProperty("queryRequestedAt");
+        return queryRequestedAt;
     }
 
-    public void setDocId(String value) {
-        registerModifiedProperty("docId");
-        this.docId = value;
+    public void setQueryRequestedAt(LocalDateTime value) {
+        registerModifiedProperty("queryRequestedAt");
+        this.queryRequestedAt = value;
     }
 
-    public String getUserSessionId() {
-        checkSpecifiedProperty("userSessionId");
-        return convertEmptyToNull(userSessionId);
+    public LocalDateTime getRequestedAt() {
+        checkSpecifiedProperty("requestedAt");
+        return requestedAt;
     }
 
-    public void setUserSessionId(String value) {
-        registerModifiedProperty("userSessionId");
-        this.userSessionId = value;
+    public void setRequestedAt(LocalDateTime value) {
+        registerModifiedProperty("requestedAt");
+        this.requestedAt = value;
     }
 
     public String getUrl() {
@@ -190,13 +190,13 @@ public class BsClickLog extends EsAbstractEntity {
         this.url = value;
     }
 
-    public Integer getOrder() {
-        checkSpecifiedProperty("order");
-        return order;
+    public String getUserSessionId() {
+        checkSpecifiedProperty("userSessionId");
+        return convertEmptyToNull(userSessionId);
     }
 
-    public void setOrder(Integer value) {
-        registerModifiedProperty("order");
-        this.order = value;
+    public void setUserSessionId(String value) {
+        registerModifiedProperty("userSessionId");
+        this.userSessionId = value;
     }
 }
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java
index 4522ed9a78d3dbc350e15ae2ff9bd05011b08dfe..03f2dee75c0013070bdead3c27dd032398cc1764 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java
@@ -40,15 +40,15 @@ public class BsFavoriteLog extends EsAbstractEntity {
     /** createdAt */
     protected LocalDateTime createdAt;
 
-    /** url */
-    protected String url;
-
     /** docId */
     protected String docId;
 
     /** queryId */
     protected String queryId;
 
+    /** url */
+    protected String url;
+
     /** userInfoId */
     protected String userInfoId;
 
@@ -76,15 +76,15 @@ public class BsFavoriteLog extends EsAbstractEntity {
         if (createdAt != null) {
             addFieldToSource(sourceMap, "createdAt", createdAt);
         }
-        if (url != null) {
-            addFieldToSource(sourceMap, "url", url);
-        }
         if (docId != null) {
             addFieldToSource(sourceMap, "docId", docId);
         }
         if (queryId != null) {
             addFieldToSource(sourceMap, "queryId", queryId);
         }
+        if (url != null) {
+            addFieldToSource(sourceMap, "url", url);
+        }
         if (userInfoId != null) {
             addFieldToSource(sourceMap, "userInfoId", userInfoId);
         }
@@ -102,9 +102,9 @@ public class BsFavoriteLog extends EsAbstractEntity {
     protected String doBuildColumnString(String dm) {
         StringBuilder sb = new StringBuilder();
         sb.append(dm).append(createdAt);
-        sb.append(dm).append(url);
         sb.append(dm).append(docId);
         sb.append(dm).append(queryId);
+        sb.append(dm).append(url);
         sb.append(dm).append(userInfoId);
         if (sb.length() > dm.length()) {
             sb.delete(0, dm.length());
@@ -126,16 +126,6 @@ public class BsFavoriteLog extends EsAbstractEntity {
         this.createdAt = value;
     }
 
-    public String getUrl() {
-        checkSpecifiedProperty("url");
-        return convertEmptyToNull(url);
-    }
-
-    public void setUrl(String value) {
-        registerModifiedProperty("url");
-        this.url = value;
-    }
-
     public String getDocId() {
         checkSpecifiedProperty("docId");
         return convertEmptyToNull(docId);
@@ -156,6 +146,16 @@ public class BsFavoriteLog extends EsAbstractEntity {
         this.queryId = value;
     }
 
+    public String getUrl() {
+        checkSpecifiedProperty("url");
+        return convertEmptyToNull(url);
+    }
+
+    public void setUrl(String value) {
+        registerModifiedProperty("url");
+        this.url = value;
+    }
+
     public String getUserInfoId() {
         checkSpecifiedProperty("userInfoId");
         return convertEmptyToNull(userInfoId);
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java
index a2d6eaab29a9368521fc95b73afbf096a71bfe24..38933843093554398fe0d05a2b95099776983356 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java
@@ -40,27 +40,27 @@ public class BsSearchLog extends EsAbstractEntity {
     /** accessType */
     protected String accessType;
 
-    /** user */
-    protected String user;
-
-    /** roles */
-    protected String[] roles;
-
-    /** queryId */
-    protected String queryId;
-
     /** clientIp */
     protected String clientIp;
 
     /** hitCount */
     protected Long hitCount;
 
+    /** languages */
+    protected String languages;
+
+    /** queryId */
+    protected String queryId;
+
     /** queryOffset */
     protected Integer queryOffset;
 
     /** queryPageSize */
     protected Integer queryPageSize;
 
+    /** queryTime */
+    protected Long queryTime;
+
     /** referer */
     protected String referer;
 
@@ -70,12 +70,15 @@ public class BsSearchLog extends EsAbstractEntity {
     /** responseTime */
     protected Long responseTime;
 
-    /** queryTime */
-    protected Long queryTime;
+    /** roles */
+    protected String[] roles;
 
     /** searchWord */
     protected String searchWord;
 
+    /** user */
+    protected String user;
+
     /** userAgent */
     protected String userAgent;
 
@@ -85,9 +88,6 @@ public class BsSearchLog extends EsAbstractEntity {
     /** userSessionId */
     protected String userSessionId;
 
-    /** languages */
-    protected String languages;
-
     /** virtualHost */
     protected String virtualHost;
 
@@ -115,27 +115,27 @@ public class BsSearchLog extends EsAbstractEntity {
         if (accessType != null) {
             addFieldToSource(sourceMap, "accessType", accessType);
         }
-        if (user != null) {
-            addFieldToSource(sourceMap, "user", user);
-        }
-        if (roles != null) {
-            addFieldToSource(sourceMap, "roles", roles);
-        }
-        if (queryId != null) {
-            addFieldToSource(sourceMap, "queryId", queryId);
-        }
         if (clientIp != null) {
             addFieldToSource(sourceMap, "clientIp", clientIp);
         }
         if (hitCount != null) {
             addFieldToSource(sourceMap, "hitCount", hitCount);
         }
+        if (languages != null) {
+            addFieldToSource(sourceMap, "languages", languages);
+        }
+        if (queryId != null) {
+            addFieldToSource(sourceMap, "queryId", queryId);
+        }
         if (queryOffset != null) {
             addFieldToSource(sourceMap, "queryOffset", queryOffset);
         }
         if (queryPageSize != null) {
             addFieldToSource(sourceMap, "queryPageSize", queryPageSize);
         }
+        if (queryTime != null) {
+            addFieldToSource(sourceMap, "queryTime", queryTime);
+        }
         if (referer != null) {
             addFieldToSource(sourceMap, "referer", referer);
         }
@@ -145,12 +145,15 @@ public class BsSearchLog extends EsAbstractEntity {
         if (responseTime != null) {
             addFieldToSource(sourceMap, "responseTime", responseTime);
         }
-        if (queryTime != null) {
-            addFieldToSource(sourceMap, "queryTime", queryTime);
+        if (roles != null) {
+            addFieldToSource(sourceMap, "roles", roles);
         }
         if (searchWord != null) {
             addFieldToSource(sourceMap, "searchWord", searchWord);
         }
+        if (user != null) {
+            addFieldToSource(sourceMap, "user", user);
+        }
         if (userAgent != null) {
             addFieldToSource(sourceMap, "userAgent", userAgent);
         }
@@ -160,9 +163,6 @@ public class BsSearchLog extends EsAbstractEntity {
         if (userSessionId != null) {
             addFieldToSource(sourceMap, "userSessionId", userSessionId);
         }
-        if (languages != null) {
-            addFieldToSource(sourceMap, "languages", languages);
-        }
         if (virtualHost != null) {
             addFieldToSource(sourceMap, "virtualHost", virtualHost);
         }
@@ -180,22 +180,22 @@ public class BsSearchLog extends EsAbstractEntity {
     protected String doBuildColumnString(String dm) {
         StringBuilder sb = new StringBuilder();
         sb.append(dm).append(accessType);
-        sb.append(dm).append(user);
-        sb.append(dm).append(roles);
-        sb.append(dm).append(queryId);
         sb.append(dm).append(clientIp);
         sb.append(dm).append(hitCount);
+        sb.append(dm).append(languages);
+        sb.append(dm).append(queryId);
         sb.append(dm).append(queryOffset);
         sb.append(dm).append(queryPageSize);
+        sb.append(dm).append(queryTime);
         sb.append(dm).append(referer);
         sb.append(dm).append(requestedAt);
         sb.append(dm).append(responseTime);
-        sb.append(dm).append(queryTime);
+        sb.append(dm).append(roles);
         sb.append(dm).append(searchWord);
+        sb.append(dm).append(user);
         sb.append(dm).append(userAgent);
         sb.append(dm).append(userInfoId);
         sb.append(dm).append(userSessionId);
-        sb.append(dm).append(languages);
         sb.append(dm).append(virtualHost);
         if (sb.length() > dm.length()) {
             sb.delete(0, dm.length());
@@ -217,36 +217,6 @@ public class BsSearchLog extends EsAbstractEntity {
         this.accessType = value;
     }
 
-    public String getUser() {
-        checkSpecifiedProperty("user");
-        return convertEmptyToNull(user);
-    }
-
-    public void setUser(String value) {
-        registerModifiedProperty("user");
-        this.user = value;
-    }
-
-    public String[] getRoles() {
-        checkSpecifiedProperty("roles");
-        return roles;
-    }
-
-    public void setRoles(String[] value) {
-        registerModifiedProperty("roles");
-        this.roles = value;
-    }
-
-    public String getQueryId() {
-        checkSpecifiedProperty("queryId");
-        return convertEmptyToNull(queryId);
-    }
-
-    public void setQueryId(String value) {
-        registerModifiedProperty("queryId");
-        this.queryId = value;
-    }
-
     public String getClientIp() {
         checkSpecifiedProperty("clientIp");
         return convertEmptyToNull(clientIp);
@@ -267,6 +237,26 @@ public class BsSearchLog extends EsAbstractEntity {
         this.hitCount = value;
     }
 
+    public String getLanguages() {
+        checkSpecifiedProperty("languages");
+        return convertEmptyToNull(languages);
+    }
+
+    public void setLanguages(String value) {
+        registerModifiedProperty("languages");
+        this.languages = value;
+    }
+
+    public String getQueryId() {
+        checkSpecifiedProperty("queryId");
+        return convertEmptyToNull(queryId);
+    }
+
+    public void setQueryId(String value) {
+        registerModifiedProperty("queryId");
+        this.queryId = value;
+    }
+
     public Integer getQueryOffset() {
         checkSpecifiedProperty("queryOffset");
         return queryOffset;
@@ -287,6 +277,16 @@ public class BsSearchLog extends EsAbstractEntity {
         this.queryPageSize = value;
     }
 
+    public Long getQueryTime() {
+        checkSpecifiedProperty("queryTime");
+        return queryTime;
+    }
+
+    public void setQueryTime(Long value) {
+        registerModifiedProperty("queryTime");
+        this.queryTime = value;
+    }
+
     public String getReferer() {
         checkSpecifiedProperty("referer");
         return convertEmptyToNull(referer);
@@ -317,14 +317,14 @@ public class BsSearchLog extends EsAbstractEntity {
         this.responseTime = value;
     }
 
-    public Long getQueryTime() {
-        checkSpecifiedProperty("queryTime");
-        return queryTime;
+    public String[] getRoles() {
+        checkSpecifiedProperty("roles");
+        return roles;
     }
 
-    public void setQueryTime(Long value) {
-        registerModifiedProperty("queryTime");
-        this.queryTime = value;
+    public void setRoles(String[] value) {
+        registerModifiedProperty("roles");
+        this.roles = value;
     }
 
     public String getSearchWord() {
@@ -337,6 +337,16 @@ public class BsSearchLog extends EsAbstractEntity {
         this.searchWord = value;
     }
 
+    public String getUser() {
+        checkSpecifiedProperty("user");
+        return convertEmptyToNull(user);
+    }
+
+    public void setUser(String value) {
+        registerModifiedProperty("user");
+        this.user = value;
+    }
+
     public String getUserAgent() {
         checkSpecifiedProperty("userAgent");
         return convertEmptyToNull(userAgent);
@@ -367,16 +377,6 @@ public class BsSearchLog extends EsAbstractEntity {
         this.userSessionId = value;
     }
 
-    public String getLanguages() {
-        checkSpecifiedProperty("languages");
-        return convertEmptyToNull(languages);
-    }
-
-    public void setLanguages(String value) {
-        registerModifiedProperty("languages");
-        this.languages = value;
-    }
-
     public String getVirtualHost() {
         checkSpecifiedProperty("virtualHost");
         return convertEmptyToNull(virtualHost);
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 5c23198202242c11d1eec75a3bc174d9d19e3ad7..5655238370139a48766e02f3a5508b66e4d13e9b 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
@@ -79,16 +79,16 @@ public class ClickLogDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
+        setupEpg(_epgMap, et -> ((ClickLog) et).getDocId(), (et, vl) -> ((ClickLog) et).setDocId(DfTypeUtil.toString(vl)), "docId");
+        setupEpg(_epgMap, et -> ((ClickLog) et).getOrder(), (et, vl) -> ((ClickLog) et).setOrder(DfTypeUtil.toInteger(vl)), "order");
+        setupEpg(_epgMap, et -> ((ClickLog) et).getQueryId(), (et, vl) -> ((ClickLog) et).setQueryId(DfTypeUtil.toString(vl)), "queryId");
         setupEpg(_epgMap, et -> ((ClickLog) et).getQueryRequestedAt(),
                 (et, vl) -> ((ClickLog) et).setQueryRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "queryRequestedAt");
         setupEpg(_epgMap, et -> ((ClickLog) et).getRequestedAt(),
                 (et, vl) -> ((ClickLog) et).setRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "requestedAt");
-        setupEpg(_epgMap, et -> ((ClickLog) et).getQueryId(), (et, vl) -> ((ClickLog) et).setQueryId(DfTypeUtil.toString(vl)), "queryId");
-        setupEpg(_epgMap, et -> ((ClickLog) et).getDocId(), (et, vl) -> ((ClickLog) et).setDocId(DfTypeUtil.toString(vl)), "docId");
+        setupEpg(_epgMap, et -> ((ClickLog) et).getUrl(), (et, vl) -> ((ClickLog) et).setUrl(DfTypeUtil.toString(vl)), "url");
         setupEpg(_epgMap, et -> ((ClickLog) et).getUserSessionId(), (et, vl) -> ((ClickLog) et).setUserSessionId(DfTypeUtil.toString(vl)),
                 "userSessionId");
-        setupEpg(_epgMap, et -> ((ClickLog) et).getUrl(), (et, vl) -> ((ClickLog) et).setUrl(DfTypeUtil.toString(vl)), "url");
-        setupEpg(_epgMap, et -> ((ClickLog) et).getOrder(), (et, vl) -> ((ClickLog) et).setOrder(DfTypeUtil.toInteger(vl)), "order");
     }
 
     @Override
@@ -125,58 +125,58 @@ public class ClickLogDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
+    protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false,
+            "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false,
+            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnQueryRequestedAt = cci("queryRequestedAt", "queryRequestedAt", null, null, LocalDateTime.class,
             "queryRequestedAt", null, false, false, false, "LocalDateTime", 0, 0, null, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false,
-            "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId",
-            null, false, false, false, "keyword", 0, 0, null, 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, 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, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId",
+            null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
 
-    public ColumnInfo columnQueryRequestedAt() {
-        return _columnQueryRequestedAt;
+    public ColumnInfo columnDocId() {
+        return _columnDocId;
     }
 
-    public ColumnInfo columnRequestedAt() {
-        return _columnRequestedAt;
+    public ColumnInfo columnOrder() {
+        return _columnOrder;
     }
 
     public ColumnInfo columnQueryId() {
         return _columnQueryId;
     }
 
-    public ColumnInfo columnDocId() {
-        return _columnDocId;
+    public ColumnInfo columnQueryRequestedAt() {
+        return _columnQueryRequestedAt;
     }
 
-    public ColumnInfo columnUserSessionId() {
-        return _columnUserSessionId;
+    public ColumnInfo columnRequestedAt() {
+        return _columnRequestedAt;
     }
 
     public ColumnInfo columnUrl() {
         return _columnUrl;
     }
 
-    public ColumnInfo columnOrder() {
-        return _columnOrder;
+    public ColumnInfo columnUserSessionId() {
+        return _columnUserSessionId;
     }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
+        ls.add(columnDocId());
+        ls.add(columnOrder());
+        ls.add(columnQueryId());
         ls.add(columnQueryRequestedAt());
         ls.add(columnRequestedAt());
-        ls.add(columnQueryId());
-        ls.add(columnDocId());
-        ls.add(columnUserSessionId());
         ls.add(columnUrl());
-        ls.add(columnOrder());
+        ls.add(columnUserSessionId());
         return ls;
     }
 
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 ff653ba54d14e7dfc9cf5755ed2ed95cc8a91792..e527ff9d3172296c7aa0e453c9282591cd3796a9 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
@@ -81,10 +81,10 @@ public class FavoriteLogDbm extends AbstractDBMeta {
     {
         setupEpg(_epgMap, et -> ((FavoriteLog) et).getCreatedAt(),
                 (et, vl) -> ((FavoriteLog) et).setCreatedAt(DfTypeUtil.toLocalDateTime(vl)), "createdAt");
-        setupEpg(_epgMap, et -> ((FavoriteLog) et).getUrl(), (et, vl) -> ((FavoriteLog) et).setUrl(DfTypeUtil.toString(vl)), "url");
         setupEpg(_epgMap, et -> ((FavoriteLog) et).getDocId(), (et, vl) -> ((FavoriteLog) et).setDocId(DfTypeUtil.toString(vl)), "docId");
         setupEpg(_epgMap, et -> ((FavoriteLog) et).getQueryId(), (et, vl) -> ((FavoriteLog) et).setQueryId(DfTypeUtil.toString(vl)),
                 "queryId");
+        setupEpg(_epgMap, et -> ((FavoriteLog) et).getUrl(), (et, vl) -> ((FavoriteLog) et).setUrl(DfTypeUtil.toString(vl)), "url");
         setupEpg(_epgMap, et -> ((FavoriteLog) et).getUserInfoId(), (et, vl) -> ((FavoriteLog) et).setUserInfoId(DfTypeUtil.toString(vl)),
                 "userInfoId");
     }
@@ -125,12 +125,12 @@ 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, 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, 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, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false,
             "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false,
             false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
 
@@ -138,10 +138,6 @@ public class FavoriteLogDbm extends AbstractDBMeta {
         return _columnCreatedAt;
     }
 
-    public ColumnInfo columnUrl() {
-        return _columnUrl;
-    }
-
     public ColumnInfo columnDocId() {
         return _columnDocId;
     }
@@ -150,6 +146,10 @@ public class FavoriteLogDbm extends AbstractDBMeta {
         return _columnQueryId;
     }
 
+    public ColumnInfo columnUrl() {
+        return _columnUrl;
+    }
+
     public ColumnInfo columnUserInfoId() {
         return _columnUserInfoId;
     }
@@ -157,9 +157,9 @@ public class FavoriteLogDbm extends AbstractDBMeta {
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCreatedAt());
-        ls.add(columnUrl());
         ls.add(columnDocId());
         ls.add(columnQueryId());
+        ls.add(columnUrl());
         ls.add(columnUserInfoId());
         return ls;
     }
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 1be19034f0c735d46149eb067aa067a8f4d660ca..b91e4994bc0e313ac997113922dca2382d06f9fb 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
@@ -81,33 +81,33 @@ public class SearchLogDbm extends AbstractDBMeta {
     {
         setupEpg(_epgMap, et -> ((SearchLog) et).getAccessType(), (et, vl) -> ((SearchLog) et).setAccessType(DfTypeUtil.toString(vl)),
                 "accessType");
-        setupEpg(_epgMap, et -> ((SearchLog) et).getUser(), (et, vl) -> ((SearchLog) et).setUser(DfTypeUtil.toString(vl)), "user");
-        setupEpg(_epgMap, et -> ((SearchLog) et).getRoles(), (et, vl) -> ((SearchLog) et).setRoles((String[]) vl), "roles");
-        setupEpg(_epgMap, et -> ((SearchLog) et).getQueryId(), (et, vl) -> ((SearchLog) et).setQueryId(DfTypeUtil.toString(vl)), "queryId");
         setupEpg(_epgMap, et -> ((SearchLog) et).getClientIp(), (et, vl) -> ((SearchLog) et).setClientIp(DfTypeUtil.toString(vl)),
                 "clientIp");
         setupEpg(_epgMap, et -> ((SearchLog) et).getHitCount(), (et, vl) -> ((SearchLog) et).setHitCount(DfTypeUtil.toLong(vl)), "hitCount");
+        setupEpg(_epgMap, et -> ((SearchLog) et).getLanguages(), (et, vl) -> ((SearchLog) et).setLanguages(DfTypeUtil.toString(vl)),
+                "languages");
+        setupEpg(_epgMap, et -> ((SearchLog) et).getQueryId(), (et, vl) -> ((SearchLog) et).setQueryId(DfTypeUtil.toString(vl)), "queryId");
         setupEpg(_epgMap, et -> ((SearchLog) et).getQueryOffset(), (et, vl) -> ((SearchLog) et).setQueryOffset(DfTypeUtil.toInteger(vl)),
                 "queryOffset");
         setupEpg(_epgMap, et -> ((SearchLog) et).getQueryPageSize(),
                 (et, vl) -> ((SearchLog) et).setQueryPageSize(DfTypeUtil.toInteger(vl)), "queryPageSize");
+        setupEpg(_epgMap, et -> ((SearchLog) et).getQueryTime(), (et, vl) -> ((SearchLog) et).setQueryTime(DfTypeUtil.toLong(vl)),
+                "queryTime");
         setupEpg(_epgMap, et -> ((SearchLog) et).getReferer(), (et, vl) -> ((SearchLog) et).setReferer(DfTypeUtil.toString(vl)), "referer");
         setupEpg(_epgMap, et -> ((SearchLog) et).getRequestedAt(),
                 (et, vl) -> ((SearchLog) et).setRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "requestedAt");
         setupEpg(_epgMap, et -> ((SearchLog) et).getResponseTime(), (et, vl) -> ((SearchLog) et).setResponseTime(DfTypeUtil.toLong(vl)),
                 "responseTime");
-        setupEpg(_epgMap, et -> ((SearchLog) et).getQueryTime(), (et, vl) -> ((SearchLog) et).setQueryTime(DfTypeUtil.toLong(vl)),
-                "queryTime");
+        setupEpg(_epgMap, et -> ((SearchLog) et).getRoles(), (et, vl) -> ((SearchLog) et).setRoles((String[]) vl), "roles");
         setupEpg(_epgMap, et -> ((SearchLog) et).getSearchWord(), (et, vl) -> ((SearchLog) et).setSearchWord(DfTypeUtil.toString(vl)),
                 "searchWord");
+        setupEpg(_epgMap, et -> ((SearchLog) et).getUser(), (et, vl) -> ((SearchLog) et).setUser(DfTypeUtil.toString(vl)), "user");
         setupEpg(_epgMap, et -> ((SearchLog) et).getUserAgent(), (et, vl) -> ((SearchLog) et).setUserAgent(DfTypeUtil.toString(vl)),
                 "userAgent");
         setupEpg(_epgMap, et -> ((SearchLog) et).getUserInfoId(), (et, vl) -> ((SearchLog) et).setUserInfoId(DfTypeUtil.toString(vl)),
                 "userInfoId");
         setupEpg(_epgMap, et -> ((SearchLog) et).getUserSessionId(),
                 (et, vl) -> ((SearchLog) et).setUserSessionId(DfTypeUtil.toString(vl)), "userSessionId");
-        setupEpg(_epgMap, et -> ((SearchLog) et).getLanguages(), (et, vl) -> ((SearchLog) et).setLanguages(DfTypeUtil.toString(vl)),
-                "languages");
         setupEpg(_epgMap, et -> ((SearchLog) et).getVirtualHost(), (et, vl) -> ((SearchLog) et).setVirtualHost(DfTypeUtil.toString(vl)),
                 "virtualHost");
     }
@@ -148,38 +148,38 @@ public class SearchLogDbm extends AbstractDBMeta {
     //                                                                         ===========
     protected final ColumnInfo _columnAccessType = cci("accessType", "accessType", null, null, String.class, "accessType", null, false,
             false, false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnRoles = cci("roles", "roles", null, null, String[].class, "roles", null, false, false, false,
-            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false,
-            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnClientIp = cci("clientIp", "clientIp", null, null, String.class, "clientIp", null, false, false,
             false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnLanguages = cci("languages", "languages", null, null, String.class, "languages", null, false, false,
+            false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false,
+            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnQueryOffset = cci("queryOffset", "queryOffset", null, null, Integer.class, "queryOffset", null,
             false, false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnQueryPageSize = cci("queryPageSize", "queryPageSize", null, null, Integer.class, "queryPageSize",
             null, false, false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnQueryTime = cci("queryTime", "queryTime", null, null, Long.class, "queryTime", null, false, false,
+            false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnReferer = cci("referer", "referer", null, null, String.class, "referer", null, false, false, false,
             "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnResponseTime = cci("responseTime", "responseTime", null, null, Long.class, "responseTime", null,
             false, false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnQueryTime = cci("queryTime", "queryTime", null, null, Long.class, "queryTime", null, false, false,
-            false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnRoles = cci("roles", "roles", null, null, String[].class, "roles", null, false, false, false,
+            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSearchWord = cci("searchWord", "searchWord", null, null, String.class, "searchWord", null, false,
             false, false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false,
             false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false,
             false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId",
             null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnLanguages = cci("languages", "languages", null, null, String.class, "languages", null, false, false,
-            false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnVirtualHost = cci("virtualHost", "virtualHost", null, null, String.class, "virtualHost", null, false,
             false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
 
@@ -187,18 +187,6 @@ public class SearchLogDbm extends AbstractDBMeta {
         return _columnAccessType;
     }
 
-    public ColumnInfo columnUser() {
-        return _columnUser;
-    }
-
-    public ColumnInfo columnRoles() {
-        return _columnRoles;
-    }
-
-    public ColumnInfo columnQueryId() {
-        return _columnQueryId;
-    }
-
     public ColumnInfo columnClientIp() {
         return _columnClientIp;
     }
@@ -207,6 +195,14 @@ public class SearchLogDbm extends AbstractDBMeta {
         return _columnHitCount;
     }
 
+    public ColumnInfo columnLanguages() {
+        return _columnLanguages;
+    }
+
+    public ColumnInfo columnQueryId() {
+        return _columnQueryId;
+    }
+
     public ColumnInfo columnQueryOffset() {
         return _columnQueryOffset;
     }
@@ -215,6 +211,10 @@ public class SearchLogDbm extends AbstractDBMeta {
         return _columnQueryPageSize;
     }
 
+    public ColumnInfo columnQueryTime() {
+        return _columnQueryTime;
+    }
+
     public ColumnInfo columnReferer() {
         return _columnReferer;
     }
@@ -227,14 +227,18 @@ public class SearchLogDbm extends AbstractDBMeta {
         return _columnResponseTime;
     }
 
-    public ColumnInfo columnQueryTime() {
-        return _columnQueryTime;
+    public ColumnInfo columnRoles() {
+        return _columnRoles;
     }
 
     public ColumnInfo columnSearchWord() {
         return _columnSearchWord;
     }
 
+    public ColumnInfo columnUser() {
+        return _columnUser;
+    }
+
     public ColumnInfo columnUserAgent() {
         return _columnUserAgent;
     }
@@ -247,10 +251,6 @@ public class SearchLogDbm extends AbstractDBMeta {
         return _columnUserSessionId;
     }
 
-    public ColumnInfo columnLanguages() {
-        return _columnLanguages;
-    }
-
     public ColumnInfo columnVirtualHost() {
         return _columnVirtualHost;
     }
@@ -258,22 +258,22 @@ public class SearchLogDbm extends AbstractDBMeta {
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnAccessType());
-        ls.add(columnUser());
-        ls.add(columnRoles());
-        ls.add(columnQueryId());
         ls.add(columnClientIp());
         ls.add(columnHitCount());
+        ls.add(columnLanguages());
+        ls.add(columnQueryId());
         ls.add(columnQueryOffset());
         ls.add(columnQueryPageSize());
+        ls.add(columnQueryTime());
         ls.add(columnReferer());
         ls.add(columnRequestedAt());
         ls.add(columnResponseTime());
-        ls.add(columnQueryTime());
+        ls.add(columnRoles());
         ls.add(columnSearchWord());
+        ls.add(columnUser());
         ls.add(columnUserAgent());
         ls.add(columnUserInfoId());
         ls.add(columnUserSessionId());
-        ls.add(columnLanguages());
         ls.add(columnVirtualHost());
         return ls;
     }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
index 22b5aae9912d83607c607431e2cecf34ebe111bd..d65045de5d968faa6280c32ca8d1dace5a726cb1 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
@@ -176,32 +176,32 @@ public class BsClickLogCB extends EsAbstractConditionBean {
             doColumn("_id");
         }
 
-        public void columnQueryRequestedAt() {
-            doColumn("queryRequestedAt");
+        public void columnDocId() {
+            doColumn("docId");
         }
 
-        public void columnRequestedAt() {
-            doColumn("requestedAt");
+        public void columnOrder() {
+            doColumn("order");
         }
 
         public void columnQueryId() {
             doColumn("queryId");
         }
 
-        public void columnDocId() {
-            doColumn("docId");
+        public void columnQueryRequestedAt() {
+            doColumn("queryRequestedAt");
         }
 
-        public void columnUserSessionId() {
-            doColumn("userSessionId");
+        public void columnRequestedAt() {
+            doColumn("requestedAt");
         }
 
         public void columnUrl() {
             doColumn("url");
         }
 
-        public void columnOrder() {
-            doColumn("order");
+        public void columnUserSessionId() {
+            doColumn("userSessionId");
         }
     }
 }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
index 76e1c3e33af4f5b6cbeacaf807ad858e54acd4fc..0c7a2ed36bff2df93cc24ce444111797faf9e0dd 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
@@ -180,10 +180,6 @@ public class BsFavoriteLogCB extends EsAbstractConditionBean {
             doColumn("createdAt");
         }
 
-        public void columnUrl() {
-            doColumn("url");
-        }
-
         public void columnDocId() {
             doColumn("docId");
         }
@@ -192,6 +188,10 @@ public class BsFavoriteLogCB extends EsAbstractConditionBean {
             doColumn("queryId");
         }
 
+        public void columnUrl() {
+            doColumn("url");
+        }
+
         public void columnUserInfoId() {
             doColumn("userInfoId");
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
index 18d61954ba0b5a8b3f19228c38204b54e8369ad5..510636900c1b2a6c39844e99f8985e99c23a0a07 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
@@ -180,18 +180,6 @@ public class BsSearchLogCB extends EsAbstractConditionBean {
             doColumn("accessType");
         }
 
-        public void columnUser() {
-            doColumn("user");
-        }
-
-        public void columnRoles() {
-            doColumn("roles");
-        }
-
-        public void columnQueryId() {
-            doColumn("queryId");
-        }
-
         public void columnClientIp() {
             doColumn("clientIp");
         }
@@ -200,6 +188,14 @@ public class BsSearchLogCB extends EsAbstractConditionBean {
             doColumn("hitCount");
         }
 
+        public void columnLanguages() {
+            doColumn("languages");
+        }
+
+        public void columnQueryId() {
+            doColumn("queryId");
+        }
+
         public void columnQueryOffset() {
             doColumn("queryOffset");
         }
@@ -208,6 +204,10 @@ public class BsSearchLogCB extends EsAbstractConditionBean {
             doColumn("queryPageSize");
         }
 
+        public void columnQueryTime() {
+            doColumn("queryTime");
+        }
+
         public void columnReferer() {
             doColumn("referer");
         }
@@ -220,14 +220,18 @@ public class BsSearchLogCB extends EsAbstractConditionBean {
             doColumn("responseTime");
         }
 
-        public void columnQueryTime() {
-            doColumn("queryTime");
+        public void columnRoles() {
+            doColumn("roles");
         }
 
         public void columnSearchWord() {
             doColumn("searchWord");
         }
 
+        public void columnUser() {
+            doColumn("user");
+        }
+
         public void columnUserAgent() {
             doColumn("userAgent");
         }
@@ -240,10 +244,6 @@ public class BsSearchLogCB extends EsAbstractConditionBean {
             doColumn("userSessionId");
         }
 
-        public void columnLanguages() {
-            doColumn("languages");
-        }
-
         public void columnVirtualHost() {
             doColumn("virtualHost");
         }
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 0c9f5d3a5448c3decc05471b40403f7a114f14bb..d2af393d4ea9f966745a7d22eafc7469b674a402 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
@@ -25,9 +25,9 @@ import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuil
 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.DateRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -108,22 +108,20 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setQueryRequestedAt_DateRange() {
-        setQueryRequestedAt_DateRange(null);
+    public void setDocId_Terms() {
+        setDocId_Terms(null);
     }
 
-    public void setQueryRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda) {
-        setQueryRequestedAt_DateRange("queryRequestedAt", opLambda, null);
+    public void setDocId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setDocId_Terms("docId", opLambda, null);
     }
 
-    public void setQueryRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
-            OperatorCall<BsClickLogCA> aggsLambda) {
-        setQueryRequestedAt_DateRange("queryRequestedAt", opLambda, aggsLambda);
+    public void setDocId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        setDocId_Terms("docId", opLambda, aggsLambda);
     }
 
-    public void setQueryRequestedAt_DateRange(String name, ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
-            OperatorCall<BsClickLogCA> aggsLambda) {
-        DateRangeAggregationBuilder builder = regDateRangeA(name, "queryRequestedAt");
+    public void setDocId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -134,22 +132,22 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setQueryRequestedAt_DateHistogram() {
-        setQueryRequestedAt_DateHistogram(null);
+    public void setDocId_SignificantTerms() {
+        setDocId_SignificantTerms(null);
     }
 
-    public void setQueryRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda) {
-        setQueryRequestedAt_DateHistogram("queryRequestedAt", opLambda, null);
+    public void setDocId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setDocId_SignificantTerms("docId", opLambda, null);
     }
 
-    public void setQueryRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
+    public void setDocId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        setQueryRequestedAt_DateHistogram("queryRequestedAt", opLambda, aggsLambda);
+        setDocId_SignificantTerms("docId", opLambda, aggsLambda);
     }
 
-    public void setQueryRequestedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
+    public void setDocId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        DateHistogramAggregationBuilder builder = regDateHistogramA(name, "queryRequestedAt");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -160,51 +158,74 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setQueryRequestedAt_Count() {
-        setQueryRequestedAt_Count(null);
+    public void setDocId_IpRange() {
+        setDocId_IpRange(null);
     }
 
-    public void setQueryRequestedAt_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setQueryRequestedAt_Count("queryRequestedAt", opLambda);
+    public void setDocId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setDocId_IpRange("docId", opLambda, null);
     }
 
-    public void setQueryRequestedAt_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "queryRequestedAt");
+    public void setDocId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        setDocId_IpRange("docId", opLambda, aggsLambda);
+    }
+
+    public void setDocId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            ClickLogCA ca = new ClickLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setQueryRequestedAt_Cardinality() {
-        setQueryRequestedAt_Cardinality(null);
+    public void setDocId_Count() {
+        setDocId_Count(null);
     }
 
-    public void setQueryRequestedAt_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setQueryRequestedAt_Cardinality("queryRequestedAt", opLambda);
+    public void setDocId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setDocId_Count("docId", opLambda);
     }
 
-    public void setQueryRequestedAt_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryRequestedAt");
+    public void setDocId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryRequestedAt_Missing() {
-        setQueryRequestedAt_Missing(null);
+    public void setDocId_Cardinality() {
+        setDocId_Cardinality(null);
     }
 
-    public void setQueryRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setQueryRequestedAt_Missing("queryRequestedAt", opLambda, null);
+    public void setDocId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setDocId_Cardinality("docId", opLambda);
     }
 
-    public void setQueryRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        setQueryRequestedAt_Missing("queryRequestedAt", opLambda, aggsLambda);
+    public void setDocId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "docId");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setQueryRequestedAt_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsClickLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "queryRequestedAt");
+    public void setDocId_Missing() {
+        setDocId_Missing(null);
+    }
+
+    public void setDocId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setDocId_Missing("docId", opLambda, null);
+    }
+
+    public void setDocId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        setDocId_Missing("docId", opLambda, aggsLambda);
+    }
+
+    public void setDocId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -215,21 +236,141 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setRequestedAt_DateRange() {
-        setRequestedAt_DateRange(null);
+    public void setOrder_Avg() {
+        setOrder_Avg(null);
     }
 
-    public void setRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda) {
-        setRequestedAt_DateRange("requestedAt", opLambda, null);
+    public void setOrder_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        setOrder_Avg("order", opLambda);
     }
 
-    public void setRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        setRequestedAt_DateRange("requestedAt", opLambda, aggsLambda);
+    public void setOrder_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "order");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setRequestedAt_DateRange(String name, ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
+    public void setOrder_Max() {
+        setOrder_Max(null);
+    }
+
+    public void setOrder_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        setOrder_Max("order", opLambda);
+    }
+
+    public void setOrder_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "order");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setOrder_Min() {
+        setOrder_Min(null);
+    }
+
+    public void setOrder_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        setOrder_Min("order", opLambda);
+    }
+
+    public void setOrder_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "order");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setOrder_Sum() {
+        setOrder_Sum(null);
+    }
+
+    public void setOrder_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        setOrder_Sum("order", opLambda);
+    }
+
+    public void setOrder_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "order");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setOrder_ExtendedStats() {
+        setOrder_ExtendedStats(null);
+    }
+
+    public void setOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        setOrder_ExtendedStats("order", opLambda);
+    }
+
+    public void setOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "order");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setOrder_Stats() {
+        setOrder_Stats(null);
+    }
+
+    public void setOrder_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        setOrder_Stats("order", opLambda);
+    }
+
+    public void setOrder_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "order");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setOrder_Percentiles() {
+        setOrder_Percentiles(null);
+    }
+
+    public void setOrder_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        setOrder_Percentiles("order", opLambda);
+    }
+
+    public void setOrder_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "order");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setOrder_PercentileRanks(double[] values) {
+        setOrder_PercentileRanks(values, null);
+    }
+
+    public void setOrder_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setOrder_PercentileRanks("order", values, opLambda);
+    }
+
+    public void setOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "order", values);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setOrder_Histogram() {
+        setOrder_Histogram(null);
+    }
+
+    public void setOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
+        setOrder_Histogram("order", opLambda, null);
+    }
+
+    public void setOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        setOrder_Histogram("order", opLambda, aggsLambda);
+    }
+
+    public void setOrder_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        DateRangeAggregationBuilder builder = regDateRangeA(name, "requestedAt");
+        HistogramAggregationBuilder builder = regHistogramA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -240,22 +381,20 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setRequestedAt_DateHistogram() {
-        setRequestedAt_DateHistogram(null);
+    public void setOrder_Range() {
+        setOrder_Range(null);
     }
 
-    public void setRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda) {
-        setRequestedAt_DateHistogram("requestedAt", opLambda, null);
+    public void setOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
+        setOrder_Range("order", opLambda, null);
     }
 
-    public void setRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
-            OperatorCall<BsClickLogCA> aggsLambda) {
-        setRequestedAt_DateHistogram("requestedAt", opLambda, aggsLambda);
+    public void setOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        setOrder_Range("order", opLambda, aggsLambda);
     }
 
-    public void setRequestedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
-            OperatorCall<BsClickLogCA> aggsLambda) {
-        DateHistogramAggregationBuilder builder = regDateHistogramA(name, "requestedAt");
+    public void setOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -266,51 +405,50 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setRequestedAt_Count() {
-        setRequestedAt_Count(null);
+    public void setOrder_Count() {
+        setOrder_Count(null);
     }
 
-    public void setRequestedAt_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setRequestedAt_Count("requestedAt", opLambda);
+    public void setOrder_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setOrder_Count("order", opLambda);
     }
 
-    public void setRequestedAt_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "requestedAt");
+    public void setOrder_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRequestedAt_Cardinality() {
-        setRequestedAt_Cardinality(null);
+    public void setOrder_Cardinality() {
+        setOrder_Cardinality(null);
     }
 
-    public void setRequestedAt_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setRequestedAt_Cardinality("requestedAt", opLambda);
+    public void setOrder_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setOrder_Cardinality("order", opLambda);
     }
 
-    public void setRequestedAt_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "requestedAt");
+    public void setOrder_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRequestedAt_Missing() {
-        setRequestedAt_Missing(null);
+    public void setOrder_Missing() {
+        setOrder_Missing(null);
     }
 
-    public void setRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setRequestedAt_Missing("requestedAt", opLambda, null);
+    public void setOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setOrder_Missing("order", opLambda, null);
     }
 
-    public void setRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        setRequestedAt_Missing("requestedAt", opLambda, aggsLambda);
+    public void setOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        setOrder_Missing("order", opLambda, aggsLambda);
     }
 
-    public void setRequestedAt_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsClickLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "requestedAt");
+    public void setOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -451,46 +589,22 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDocId_Terms() {
-        setDocId_Terms(null);
-    }
-
-    public void setDocId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setDocId_Terms("docId", opLambda, null);
-    }
-
-    public void setDocId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        setDocId_Terms("docId", opLambda, aggsLambda);
-    }
-
-    public void setDocId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "docId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            ClickLogCA ca = new ClickLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setDocId_SignificantTerms() {
-        setDocId_SignificantTerms(null);
+    public void setQueryRequestedAt_DateRange() {
+        setQueryRequestedAt_DateRange(null);
     }
 
-    public void setDocId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setDocId_SignificantTerms("docId", opLambda, null);
+    public void setQueryRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda) {
+        setQueryRequestedAt_DateRange("queryRequestedAt", opLambda, null);
     }
 
-    public void setDocId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setQueryRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        setDocId_SignificantTerms("docId", opLambda, aggsLambda);
+        setQueryRequestedAt_DateRange("queryRequestedAt", opLambda, aggsLambda);
     }
 
-    public void setDocId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setQueryRequestedAt_DateRange(String name, ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "docId");
+        DateRangeAggregationBuilder builder = regDateRangeA(name, "queryRequestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -501,20 +615,22 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDocId_IpRange() {
-        setDocId_IpRange(null);
+    public void setQueryRequestedAt_DateHistogram() {
+        setQueryRequestedAt_DateHistogram(null);
     }
 
-    public void setDocId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setDocId_IpRange("docId", opLambda, null);
+    public void setQueryRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda) {
+        setQueryRequestedAt_DateHistogram("queryRequestedAt", opLambda, null);
     }
 
-    public void setDocId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        setDocId_IpRange("docId", opLambda, aggsLambda);
+    public void setQueryRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        setQueryRequestedAt_DateHistogram("queryRequestedAt", opLambda, aggsLambda);
     }
 
-    public void setDocId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "docId");
+    public void setQueryRequestedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        DateHistogramAggregationBuilder builder = regDateHistogramA(name, "queryRequestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -525,75 +641,51 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDocId_Count() {
-        setDocId_Count(null);
-    }
-
-    public void setDocId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setDocId_Count("docId", opLambda);
-    }
-
-    public void setDocId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "docId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDocId_Cardinality() {
-        setDocId_Cardinality(null);
+    public void setQueryRequestedAt_Count() {
+        setQueryRequestedAt_Count(null);
     }
 
-    public void setDocId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setDocId_Cardinality("docId", opLambda);
+    public void setQueryRequestedAt_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setQueryRequestedAt_Count("queryRequestedAt", opLambda);
     }
 
-    public void setDocId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "docId");
+    public void setQueryRequestedAt_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "queryRequestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDocId_Missing() {
-        setDocId_Missing(null);
-    }
-
-    public void setDocId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setDocId_Missing("docId", opLambda, null);
+    public void setQueryRequestedAt_Cardinality() {
+        setQueryRequestedAt_Cardinality(null);
     }
 
-    public void setDocId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        setDocId_Missing("docId", opLambda, aggsLambda);
+    public void setQueryRequestedAt_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setQueryRequestedAt_Cardinality("queryRequestedAt", opLambda);
     }
 
-    public void setDocId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "docId");
+    public void setQueryRequestedAt_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryRequestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            ClickLogCA ca = new ClickLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setUserSessionId_Terms() {
-        setUserSessionId_Terms(null);
+    public void setQueryRequestedAt_Missing() {
+        setQueryRequestedAt_Missing(null);
     }
 
-    public void setUserSessionId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setUserSessionId_Terms("userSessionId", opLambda, null);
+    public void setQueryRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setQueryRequestedAt_Missing("queryRequestedAt", opLambda, null);
     }
 
-    public void setUserSessionId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        setUserSessionId_Terms("userSessionId", opLambda, aggsLambda);
+    public void setQueryRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        setQueryRequestedAt_Missing("queryRequestedAt", opLambda, aggsLambda);
     }
 
-    public void setUserSessionId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+    public void setQueryRequestedAt_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "userSessionId");
+        MissingAggregationBuilder builder = regMissingA(name, "queryRequestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -604,22 +696,21 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUserSessionId_SignificantTerms() {
-        setUserSessionId_SignificantTerms(null);
+    public void setRequestedAt_DateRange() {
+        setRequestedAt_DateRange(null);
     }
 
-    public void setUserSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setUserSessionId_SignificantTerms("userSessionId", opLambda, null);
+    public void setRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda) {
+        setRequestedAt_DateRange("requestedAt", opLambda, null);
     }
 
-    public void setUserSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsClickLogCA> aggsLambda) {
-        setUserSessionId_SignificantTerms("userSessionId", opLambda, aggsLambda);
+    public void setRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        setRequestedAt_DateRange("requestedAt", opLambda, aggsLambda);
     }
 
-    public void setUserSessionId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setRequestedAt_DateRange(String name, ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "userSessionId");
+        DateRangeAggregationBuilder builder = regDateRangeA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -630,21 +721,22 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUserSessionId_IpRange() {
-        setUserSessionId_IpRange(null);
+    public void setRequestedAt_DateHistogram() {
+        setRequestedAt_DateHistogram(null);
     }
 
-    public void setUserSessionId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setUserSessionId_IpRange("userSessionId", opLambda, null);
+    public void setRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda) {
+        setRequestedAt_DateHistogram("requestedAt", opLambda, null);
     }
 
-    public void setUserSessionId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        setUserSessionId_IpRange("userSessionId", opLambda, aggsLambda);
+    public void setRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        setRequestedAt_DateHistogram("requestedAt", opLambda, aggsLambda);
     }
 
-    public void setUserSessionId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setRequestedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "userSessionId");
+        DateHistogramAggregationBuilder builder = regDateHistogramA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -655,51 +747,51 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUserSessionId_Count() {
-        setUserSessionId_Count(null);
+    public void setRequestedAt_Count() {
+        setRequestedAt_Count(null);
     }
 
-    public void setUserSessionId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setUserSessionId_Count("userSessionId", opLambda);
+    public void setRequestedAt_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setRequestedAt_Count("requestedAt", opLambda);
     }
 
-    public void setUserSessionId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "userSessionId");
+    public void setRequestedAt_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUserSessionId_Cardinality() {
-        setUserSessionId_Cardinality(null);
+    public void setRequestedAt_Cardinality() {
+        setRequestedAt_Cardinality(null);
     }
 
-    public void setUserSessionId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setUserSessionId_Cardinality("userSessionId", opLambda);
+    public void setRequestedAt_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setRequestedAt_Cardinality("requestedAt", opLambda);
     }
 
-    public void setUserSessionId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "userSessionId");
+    public void setRequestedAt_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUserSessionId_Missing() {
-        setUserSessionId_Missing(null);
+    public void setRequestedAt_Missing() {
+        setRequestedAt_Missing(null);
     }
 
-    public void setUserSessionId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setUserSessionId_Missing("userSessionId", opLambda, null);
+    public void setRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setRequestedAt_Missing("requestedAt", opLambda, null);
     }
 
-    public void setUserSessionId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        setUserSessionId_Missing("userSessionId", opLambda, aggsLambda);
+    public void setRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        setRequestedAt_Missing("requestedAt", opLambda, aggsLambda);
     }
 
-    public void setUserSessionId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setRequestedAt_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "userSessionId");
+        MissingAggregationBuilder builder = regMissingA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -838,141 +930,47 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setOrder_Avg() {
-        setOrder_Avg(null);
-    }
-
-    public void setOrder_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        setOrder_Avg("order", opLambda);
-    }
-
-    public void setOrder_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        AvgAggregationBuilder builder = regAvgA(name, "order");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setOrder_Max() {
-        setOrder_Max(null);
-    }
-
-    public void setOrder_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        setOrder_Max("order", opLambda);
-    }
-
-    public void setOrder_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        MaxAggregationBuilder builder = regMaxA(name, "order");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setOrder_Min() {
-        setOrder_Min(null);
-    }
-
-    public void setOrder_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        setOrder_Min("order", opLambda);
-    }
-
-    public void setOrder_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        MinAggregationBuilder builder = regMinA(name, "order");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setOrder_Sum() {
-        setOrder_Sum(null);
-    }
-
-    public void setOrder_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        setOrder_Sum("order", opLambda);
-    }
-
-    public void setOrder_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        SumAggregationBuilder builder = regSumA(name, "order");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setOrder_ExtendedStats() {
-        setOrder_ExtendedStats(null);
-    }
-
-    public void setOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        setOrder_ExtendedStats("order", opLambda);
-    }
-
-    public void setOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "order");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setOrder_Stats() {
-        setOrder_Stats(null);
-    }
-
-    public void setOrder_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        setOrder_Stats("order", opLambda);
-    }
-
-    public void setOrder_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        StatsAggregationBuilder builder = regStatsA(name, "order");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUserSessionId_Terms() {
+        setUserSessionId_Terms(null);
     }
 
-    public void setOrder_Percentiles() {
-        setOrder_Percentiles(null);
+    public void setUserSessionId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setUserSessionId_Terms("userSessionId", opLambda, null);
     }
 
-    public void setOrder_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        setOrder_Percentiles("order", opLambda);
+    public void setUserSessionId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        setUserSessionId_Terms("userSessionId", opLambda, aggsLambda);
     }
 
-    public void setOrder_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        PercentilesAggregationBuilder builder = regPercentilesA(name, "order");
+    public void setUserSessionId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-    }
-
-    public void setOrder_PercentileRanks() {
-        setOrder_PercentileRanks(null);
-    }
-
-    public void setOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setOrder_PercentileRanks("order", opLambda);
-    }
-
-    public void setOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "order");
-        if (opLambda != null) {
-            opLambda.callback(builder);
+        if (aggsLambda != null) {
+            ClickLogCA ca = new ClickLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
         }
     }
 
-    public void setOrder_Histogram() {
-        setOrder_Histogram(null);
+    public void setUserSessionId_SignificantTerms() {
+        setUserSessionId_SignificantTerms(null);
     }
 
-    public void setOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
-        setOrder_Histogram("order", opLambda, null);
+    public void setUserSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setUserSessionId_SignificantTerms("userSessionId", opLambda, null);
     }
 
-    public void setOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        setOrder_Histogram("order", opLambda, aggsLambda);
+    public void setUserSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        setUserSessionId_SignificantTerms("userSessionId", opLambda, aggsLambda);
     }
 
-    public void setOrder_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+    public void setUserSessionId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        HistogramAggregationBuilder builder = regHistogramA(name, "order");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -983,20 +981,21 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setOrder_Range() {
-        setOrder_Range(null);
+    public void setUserSessionId_IpRange() {
+        setUserSessionId_IpRange(null);
     }
 
-    public void setOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
-        setOrder_Range("order", opLambda, null);
+    public void setUserSessionId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setUserSessionId_IpRange("userSessionId", opLambda, null);
     }
 
-    public void setOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        setOrder_Range("order", opLambda, aggsLambda);
+    public void setUserSessionId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        setUserSessionId_IpRange("userSessionId", opLambda, aggsLambda);
     }
 
-    public void setOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        RangeAggregationBuilder builder = regRangeA(name, "order");
+    public void setUserSessionId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1007,50 +1006,51 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setOrder_Count() {
-        setOrder_Count(null);
+    public void setUserSessionId_Count() {
+        setUserSessionId_Count(null);
     }
 
-    public void setOrder_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setOrder_Count("order", opLambda);
+    public void setUserSessionId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setUserSessionId_Count("userSessionId", opLambda);
     }
 
-    public void setOrder_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "order");
+    public void setUserSessionId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOrder_Cardinality() {
-        setOrder_Cardinality(null);
+    public void setUserSessionId_Cardinality() {
+        setUserSessionId_Cardinality(null);
     }
 
-    public void setOrder_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setOrder_Cardinality("order", opLambda);
+    public void setUserSessionId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setUserSessionId_Cardinality("userSessionId", opLambda);
     }
 
-    public void setOrder_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "order");
+    public void setUserSessionId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOrder_Missing() {
-        setOrder_Missing(null);
+    public void setUserSessionId_Missing() {
+        setUserSessionId_Missing(null);
     }
 
-    public void setOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setOrder_Missing("order", opLambda, null);
+    public void setUserSessionId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setUserSessionId_Missing("userSessionId", opLambda, null);
     }
 
-    public void setOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        setOrder_Missing("order", opLambda, aggsLambda);
+    public void setUserSessionId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        setUserSessionId_Missing("userSessionId", opLambda, aggsLambda);
     }
 
-    public void setOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "order");
+    public void setUserSessionId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "userSessionId");
         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 077d52c833233e9a98510afe6130715952754f2d..1b30ed2fd1abe00352426f6e636f84d617e0fc6c 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.range.DateRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -204,136 +204,6 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUrl_Terms() {
-        setUrl_Terms(null);
-    }
-
-    public void setUrl_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setUrl_Terms("url", opLambda, null);
-    }
-
-    public void setUrl_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        setUrl_Terms("url", opLambda, aggsLambda);
-    }
-
-    public void setUrl_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "url");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            FavoriteLogCA ca = new FavoriteLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setUrl_SignificantTerms() {
-        setUrl_SignificantTerms(null);
-    }
-
-    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setUrl_SignificantTerms("url", opLambda, null);
-    }
-
-    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        setUrl_SignificantTerms("url", opLambda, aggsLambda);
-    }
-
-    public void setUrl_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "url");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            FavoriteLogCA ca = new FavoriteLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setUrl_IpRange() {
-        setUrl_IpRange(null);
-    }
-
-    public void setUrl_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setUrl_IpRange("url", opLambda, null);
-    }
-
-    public void setUrl_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        setUrl_IpRange("url", opLambda, aggsLambda);
-    }
-
-    public void setUrl_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "url");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            FavoriteLogCA ca = new FavoriteLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setUrl_Count() {
-        setUrl_Count(null);
-    }
-
-    public void setUrl_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setUrl_Count("url", opLambda);
-    }
-
-    public void setUrl_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "url");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Cardinality() {
-        setUrl_Cardinality(null);
-    }
-
-    public void setUrl_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setUrl_Cardinality("url", opLambda);
-    }
-
-    public void setUrl_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "url");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Missing() {
-        setUrl_Missing(null);
-    }
-
-    public void setUrl_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setUrl_Missing("url", opLambda, null);
-    }
-
-    public void setUrl_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        setUrl_Missing("url", opLambda, aggsLambda);
-    }
-
-    public void setUrl_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "url");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            FavoriteLogCA ca = new FavoriteLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
     public void setDocId_Terms() {
         setDocId_Terms(null);
     }
@@ -595,6 +465,136 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         }
     }
 
+    public void setUrl_Terms() {
+        setUrl_Terms(null);
+    }
+
+    public void setUrl_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setUrl_Terms("url", opLambda, null);
+    }
+
+    public void setUrl_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        setUrl_Terms("url", opLambda, aggsLambda);
+    }
+
+    public void setUrl_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "url");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            FavoriteLogCA ca = new FavoriteLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setUrl_SignificantTerms() {
+        setUrl_SignificantTerms(null);
+    }
+
+    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setUrl_SignificantTerms("url", opLambda, null);
+    }
+
+    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        setUrl_SignificantTerms("url", opLambda, aggsLambda);
+    }
+
+    public void setUrl_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "url");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            FavoriteLogCA ca = new FavoriteLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setUrl_IpRange() {
+        setUrl_IpRange(null);
+    }
+
+    public void setUrl_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setUrl_IpRange("url", opLambda, null);
+    }
+
+    public void setUrl_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        setUrl_IpRange("url", opLambda, aggsLambda);
+    }
+
+    public void setUrl_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "url");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            FavoriteLogCA ca = new FavoriteLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setUrl_Count() {
+        setUrl_Count(null);
+    }
+
+    public void setUrl_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setUrl_Count("url", opLambda);
+    }
+
+    public void setUrl_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "url");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_Cardinality() {
+        setUrl_Cardinality(null);
+    }
+
+    public void setUrl_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setUrl_Cardinality("url", opLambda);
+    }
+
+    public void setUrl_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "url");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_Missing() {
+        setUrl_Missing(null);
+    }
+
+    public void setUrl_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setUrl_Missing("url", opLambda, null);
+    }
+
+    public void setUrl_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        setUrl_Missing("url", opLambda, aggsLambda);
+    }
+
+    public void setUrl_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "url");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            FavoriteLogCA ca = new FavoriteLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
     public void setUserInfoId_Terms() {
         setUserInfoId_Terms(null);
     }
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 b84af8f3951dd50a07426e1235a17b308c437134..b14f4c626e235192dfcdacc99ea4bf148aa51e17 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
@@ -25,9 +25,9 @@ import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuil
 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.DateRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -239,20 +239,20 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUser_Terms() {
-        setUser_Terms(null);
+    public void setClientIp_Terms() {
+        setClientIp_Terms(null);
     }
 
-    public void setUser_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setUser_Terms("user", opLambda, null);
+    public void setClientIp_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setClientIp_Terms("clientIp", opLambda, null);
     }
 
-    public void setUser_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setUser_Terms("user", opLambda, aggsLambda);
+    public void setClientIp_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setClientIp_Terms("clientIp", opLambda, aggsLambda);
     }
 
-    public void setUser_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "user");
+    public void setClientIp_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "clientIp");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -263,22 +263,22 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUser_SignificantTerms() {
-        setUser_SignificantTerms(null);
+    public void setClientIp_SignificantTerms() {
+        setClientIp_SignificantTerms(null);
     }
 
-    public void setUser_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setUser_SignificantTerms("user", opLambda, null);
+    public void setClientIp_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setClientIp_SignificantTerms("clientIp", opLambda, null);
     }
 
-    public void setUser_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setClientIp_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        setUser_SignificantTerms("user", opLambda, aggsLambda);
+        setClientIp_SignificantTerms("clientIp", opLambda, aggsLambda);
     }
 
-    public void setUser_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setClientIp_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "user");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "clientIp");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -289,20 +289,21 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUser_IpRange() {
-        setUser_IpRange(null);
+    public void setClientIp_IpRange() {
+        setClientIp_IpRange(null);
     }
 
-    public void setUser_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setUser_IpRange("user", opLambda, null);
+    public void setClientIp_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setClientIp_IpRange("clientIp", opLambda, null);
     }
 
-    public void setUser_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setUser_IpRange("user", opLambda, aggsLambda);
+    public void setClientIp_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setClientIp_IpRange("clientIp", opLambda, aggsLambda);
     }
 
-    public void setUser_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "user");
+    public void setClientIp_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "clientIp");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -313,50 +314,51 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUser_Count() {
-        setUser_Count(null);
+    public void setClientIp_Count() {
+        setClientIp_Count(null);
     }
 
-    public void setUser_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setUser_Count("user", opLambda);
+    public void setClientIp_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setClientIp_Count("clientIp", opLambda);
     }
 
-    public void setUser_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "user");
+    public void setClientIp_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "clientIp");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_Cardinality() {
-        setUser_Cardinality(null);
+    public void setClientIp_Cardinality() {
+        setClientIp_Cardinality(null);
     }
 
-    public void setUser_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setUser_Cardinality("user", opLambda);
+    public void setClientIp_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setClientIp_Cardinality("clientIp", opLambda);
     }
 
-    public void setUser_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "user");
+    public void setClientIp_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "clientIp");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_Missing() {
-        setUser_Missing(null);
+    public void setClientIp_Missing() {
+        setClientIp_Missing(null);
     }
 
-    public void setUser_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setUser_Missing("user", opLambda, null);
+    public void setClientIp_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setClientIp_Missing("clientIp", opLambda, null);
     }
 
-    public void setUser_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setUser_Missing("user", opLambda, aggsLambda);
+    public void setClientIp_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setClientIp_Missing("clientIp", opLambda, aggsLambda);
     }
 
-    public void setUser_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "user");
+    public void setClientIp_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "clientIp");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -367,150 +369,141 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setRoles_Terms() {
-        setRoles_Terms(null);
-    }
-
-    public void setRoles_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setRoles_Terms("roles", opLambda, null);
+    public void setHitCount_Avg() {
+        setHitCount_Avg(null);
     }
 
-    public void setRoles_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setRoles_Terms("roles", opLambda, aggsLambda);
+    public void setHitCount_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        setHitCount_Avg("hitCount", opLambda);
     }
 
-    public void setRoles_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "roles");
+    public void setHitCount_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            SearchLogCA ca = new SearchLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setRoles_SignificantTerms() {
-        setRoles_SignificantTerms(null);
     }
 
-    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setRoles_SignificantTerms("roles", opLambda, null);
+    public void setHitCount_Max() {
+        setHitCount_Max(null);
     }
 
-    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        setRoles_SignificantTerms("roles", opLambda, aggsLambda);
+    public void setHitCount_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        setHitCount_Max("hitCount", opLambda);
     }
 
-    public void setRoles_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roles");
+    public void setHitCount_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            SearchLogCA ca = new SearchLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setRoles_IpRange() {
-        setRoles_IpRange(null);
+    public void setHitCount_Min() {
+        setHitCount_Min(null);
     }
 
-    public void setRoles_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setRoles_IpRange("roles", opLambda, null);
+    public void setHitCount_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        setHitCount_Min("hitCount", opLambda);
     }
 
-    public void setRoles_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setRoles_IpRange("roles", opLambda, aggsLambda);
+    public void setHitCount_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "hitCount");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setRoles_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "roles");
+    public void setHitCount_Sum() {
+        setHitCount_Sum(null);
+    }
+
+    public void setHitCount_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        setHitCount_Sum("hitCount", opLambda);
+    }
+
+    public void setHitCount_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            SearchLogCA ca = new SearchLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setRoles_Count() {
-        setRoles_Count(null);
+    public void setHitCount_ExtendedStats() {
+        setHitCount_ExtendedStats(null);
     }
 
-    public void setRoles_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setRoles_Count("roles", opLambda);
+    public void setHitCount_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        setHitCount_ExtendedStats("hitCount", opLambda);
     }
 
-    public void setRoles_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "roles");
+    public void setHitCount_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_Cardinality() {
-        setRoles_Cardinality(null);
+    public void setHitCount_Stats() {
+        setHitCount_Stats(null);
     }
 
-    public void setRoles_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setRoles_Cardinality("roles", opLambda);
+    public void setHitCount_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        setHitCount_Stats("hitCount", opLambda);
     }
 
-    public void setRoles_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "roles");
+    public void setHitCount_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_Missing() {
-        setRoles_Missing(null);
+    public void setHitCount_Percentiles() {
+        setHitCount_Percentiles(null);
     }
 
-    public void setRoles_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setRoles_Missing("roles", opLambda, null);
+    public void setHitCount_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        setHitCount_Percentiles("hitCount", opLambda);
     }
 
-    public void setRoles_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setRoles_Missing("roles", opLambda, aggsLambda);
+    public void setHitCount_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "hitCount");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setRoles_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "roles");
+    public void setHitCount_PercentileRanks(double[] values) {
+        setHitCount_PercentileRanks(values, null);
+    }
+
+    public void setHitCount_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setHitCount_PercentileRanks("hitCount", values, opLambda);
+    }
+
+    public void setHitCount_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "hitCount", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            SearchLogCA ca = new SearchLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setQueryId_Terms() {
-        setQueryId_Terms(null);
+    public void setHitCount_Histogram() {
+        setHitCount_Histogram(null);
     }
 
-    public void setQueryId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setQueryId_Terms("queryId", opLambda, null);
+    public void setHitCount_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
+        setHitCount_Histogram("hitCount", opLambda, null);
     }
 
-    public void setQueryId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setQueryId_Terms("queryId", opLambda, aggsLambda);
+    public void setHitCount_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setHitCount_Histogram("hitCount", opLambda, aggsLambda);
     }
 
-    public void setQueryId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "queryId");
+    public void setHitCount_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -521,22 +514,20 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setQueryId_SignificantTerms() {
-        setQueryId_SignificantTerms(null);
+    public void setHitCount_Range() {
+        setHitCount_Range(null);
     }
 
-    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setQueryId_SignificantTerms("queryId", opLambda, null);
+    public void setHitCount_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
+        setHitCount_Range("hitCount", opLambda, null);
     }
 
-    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        setQueryId_SignificantTerms("queryId", opLambda, aggsLambda);
+    public void setHitCount_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setHitCount_Range("hitCount", opLambda, aggsLambda);
     }
 
-    public void setQueryId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "queryId");
+    public void setHitCount_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -547,76 +538,51 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setQueryId_IpRange() {
-        setQueryId_IpRange(null);
-    }
-
-    public void setQueryId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setQueryId_IpRange("queryId", opLambda, null);
-    }
-
-    public void setQueryId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setQueryId_IpRange("queryId", opLambda, aggsLambda);
-    }
-
-    public void setQueryId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "queryId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            SearchLogCA ca = new SearchLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setQueryId_Count() {
-        setQueryId_Count(null);
+    public void setHitCount_Count() {
+        setHitCount_Count(null);
     }
 
-    public void setQueryId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setQueryId_Count("queryId", opLambda);
+    public void setHitCount_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setHitCount_Count("hitCount", opLambda);
     }
 
-    public void setQueryId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "queryId");
+    public void setHitCount_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_Cardinality() {
-        setQueryId_Cardinality(null);
+    public void setHitCount_Cardinality() {
+        setHitCount_Cardinality(null);
     }
 
-    public void setQueryId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setQueryId_Cardinality("queryId", opLambda);
+    public void setHitCount_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setHitCount_Cardinality("hitCount", opLambda);
     }
 
-    public void setQueryId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryId");
+    public void setHitCount_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_Missing() {
-        setQueryId_Missing(null);
+    public void setHitCount_Missing() {
+        setHitCount_Missing(null);
     }
 
-    public void setQueryId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setQueryId_Missing("queryId", opLambda, null);
+    public void setHitCount_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setHitCount_Missing("hitCount", opLambda, null);
     }
 
-    public void setQueryId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setQueryId_Missing("queryId", opLambda, aggsLambda);
+    public void setHitCount_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setHitCount_Missing("hitCount", opLambda, aggsLambda);
     }
 
-    public void setQueryId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setHitCount_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "queryId");
+        MissingAggregationBuilder builder = regMissingA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -627,20 +593,21 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setClientIp_Terms() {
-        setClientIp_Terms(null);
+    public void setLanguages_Terms() {
+        setLanguages_Terms(null);
     }
 
-    public void setClientIp_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setClientIp_Terms("clientIp", opLambda, null);
+    public void setLanguages_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setLanguages_Terms("languages", opLambda, null);
     }
 
-    public void setClientIp_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setClientIp_Terms("clientIp", opLambda, aggsLambda);
+    public void setLanguages_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setLanguages_Terms("languages", opLambda, aggsLambda);
     }
 
-    public void setClientIp_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "clientIp");
+    public void setLanguages_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "languages");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -651,22 +618,22 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setClientIp_SignificantTerms() {
-        setClientIp_SignificantTerms(null);
+    public void setLanguages_SignificantTerms() {
+        setLanguages_SignificantTerms(null);
     }
 
-    public void setClientIp_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setClientIp_SignificantTerms("clientIp", opLambda, null);
+    public void setLanguages_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setLanguages_SignificantTerms("languages", opLambda, null);
     }
 
-    public void setClientIp_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setLanguages_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        setClientIp_SignificantTerms("clientIp", opLambda, aggsLambda);
+        setLanguages_SignificantTerms("languages", opLambda, aggsLambda);
     }
 
-    public void setClientIp_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setLanguages_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "clientIp");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "languages");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -677,21 +644,21 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setClientIp_IpRange() {
-        setClientIp_IpRange(null);
+    public void setLanguages_IpRange() {
+        setLanguages_IpRange(null);
     }
 
-    public void setClientIp_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setClientIp_IpRange("clientIp", opLambda, null);
+    public void setLanguages_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setLanguages_IpRange("languages", opLambda, null);
     }
 
-    public void setClientIp_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setClientIp_IpRange("clientIp", opLambda, aggsLambda);
+    public void setLanguages_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setLanguages_IpRange("languages", opLambda, aggsLambda);
     }
 
-    public void setClientIp_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setLanguages_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "clientIp");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "languages");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -702,51 +669,51 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setClientIp_Count() {
-        setClientIp_Count(null);
+    public void setLanguages_Count() {
+        setLanguages_Count(null);
     }
 
-    public void setClientIp_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setClientIp_Count("clientIp", opLambda);
+    public void setLanguages_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setLanguages_Count("languages", opLambda);
     }
 
-    public void setClientIp_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "clientIp");
+    public void setLanguages_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "languages");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setClientIp_Cardinality() {
-        setClientIp_Cardinality(null);
+    public void setLanguages_Cardinality() {
+        setLanguages_Cardinality(null);
     }
 
-    public void setClientIp_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setClientIp_Cardinality("clientIp", opLambda);
+    public void setLanguages_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setLanguages_Cardinality("languages", opLambda);
     }
 
-    public void setClientIp_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "clientIp");
+    public void setLanguages_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "languages");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setClientIp_Missing() {
-        setClientIp_Missing(null);
+    public void setLanguages_Missing() {
+        setLanguages_Missing(null);
     }
 
-    public void setClientIp_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setClientIp_Missing("clientIp", opLambda, null);
+    public void setLanguages_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setLanguages_Missing("languages", opLambda, null);
     }
 
-    public void setClientIp_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setClientIp_Missing("clientIp", opLambda, aggsLambda);
+    public void setLanguages_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setLanguages_Missing("languages", opLambda, aggsLambda);
     }
 
-    public void setClientIp_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setLanguages_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "clientIp");
+        MissingAggregationBuilder builder = regMissingA(name, "languages");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -757,141 +724,46 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setHitCount_Avg() {
-        setHitCount_Avg(null);
-    }
-
-    public void setHitCount_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        setHitCount_Avg("hitCount", opLambda);
-    }
-
-    public void setHitCount_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        AvgAggregationBuilder builder = regAvgA(name, "hitCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHitCount_Max() {
-        setHitCount_Max(null);
-    }
-
-    public void setHitCount_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        setHitCount_Max("hitCount", opLambda);
-    }
-
-    public void setHitCount_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        MaxAggregationBuilder builder = regMaxA(name, "hitCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHitCount_Min() {
-        setHitCount_Min(null);
-    }
-
-    public void setHitCount_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        setHitCount_Min("hitCount", opLambda);
-    }
-
-    public void setHitCount_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        MinAggregationBuilder builder = regMinA(name, "hitCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHitCount_Sum() {
-        setHitCount_Sum(null);
-    }
-
-    public void setHitCount_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        setHitCount_Sum("hitCount", opLambda);
-    }
-
-    public void setHitCount_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        SumAggregationBuilder builder = regSumA(name, "hitCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHitCount_ExtendedStats() {
-        setHitCount_ExtendedStats(null);
-    }
-
-    public void setHitCount_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        setHitCount_ExtendedStats("hitCount", opLambda);
-    }
-
-    public void setHitCount_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "hitCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHitCount_Stats() {
-        setHitCount_Stats(null);
-    }
-
-    public void setHitCount_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        setHitCount_Stats("hitCount", opLambda);
-    }
-
-    public void setHitCount_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        StatsAggregationBuilder builder = regStatsA(name, "hitCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryId_Terms() {
+        setQueryId_Terms(null);
     }
 
-    public void setHitCount_Percentiles() {
-        setHitCount_Percentiles(null);
+    public void setQueryId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setQueryId_Terms("queryId", opLambda, null);
     }
 
-    public void setHitCount_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        setHitCount_Percentiles("hitCount", opLambda);
+    public void setQueryId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setQueryId_Terms("queryId", opLambda, aggsLambda);
     }
 
-    public void setHitCount_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        PercentilesAggregationBuilder builder = regPercentilesA(name, "hitCount");
+    public void setQueryId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-    }
-
-    public void setHitCount_PercentileRanks() {
-        setHitCount_PercentileRanks(null);
-    }
-
-    public void setHitCount_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setHitCount_PercentileRanks("hitCount", opLambda);
-    }
-
-    public void setHitCount_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "hitCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
+        if (aggsLambda != null) {
+            SearchLogCA ca = new SearchLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
         }
     }
 
-    public void setHitCount_Histogram() {
-        setHitCount_Histogram(null);
+    public void setQueryId_SignificantTerms() {
+        setQueryId_SignificantTerms(null);
     }
 
-    public void setHitCount_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
-        setHitCount_Histogram("hitCount", opLambda, null);
+    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setQueryId_SignificantTerms("queryId", opLambda, null);
     }
 
-    public void setHitCount_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setHitCount_Histogram("hitCount", opLambda, aggsLambda);
+    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        setQueryId_SignificantTerms("queryId", opLambda, aggsLambda);
     }
 
-    public void setHitCount_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+    public void setQueryId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        HistogramAggregationBuilder builder = regHistogramA(name, "hitCount");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -902,20 +774,21 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setHitCount_Range() {
-        setHitCount_Range(null);
+    public void setQueryId_IpRange() {
+        setQueryId_IpRange(null);
     }
 
-    public void setHitCount_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
-        setHitCount_Range("hitCount", opLambda, null);
+    public void setQueryId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setQueryId_IpRange("queryId", opLambda, null);
     }
 
-    public void setHitCount_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setHitCount_Range("hitCount", opLambda, aggsLambda);
+    public void setQueryId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setQueryId_IpRange("queryId", opLambda, aggsLambda);
     }
 
-    public void setHitCount_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        RangeAggregationBuilder builder = regRangeA(name, "hitCount");
+    public void setQueryId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -925,52 +798,52 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
             ca.getAggregationBuilderList().forEach(builder::subAggregation);
         }
     }
-
-    public void setHitCount_Count() {
-        setHitCount_Count(null);
+
+    public void setQueryId_Count() {
+        setQueryId_Count(null);
     }
 
-    public void setHitCount_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setHitCount_Count("hitCount", opLambda);
+    public void setQueryId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setQueryId_Count("queryId", opLambda);
     }
 
-    public void setHitCount_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "hitCount");
+    public void setQueryId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHitCount_Cardinality() {
-        setHitCount_Cardinality(null);
+    public void setQueryId_Cardinality() {
+        setQueryId_Cardinality(null);
     }
 
-    public void setHitCount_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setHitCount_Cardinality("hitCount", opLambda);
+    public void setQueryId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setQueryId_Cardinality("queryId", opLambda);
     }
 
-    public void setHitCount_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "hitCount");
+    public void setQueryId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHitCount_Missing() {
-        setHitCount_Missing(null);
+    public void setQueryId_Missing() {
+        setQueryId_Missing(null);
     }
 
-    public void setHitCount_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setHitCount_Missing("hitCount", opLambda, null);
+    public void setQueryId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setQueryId_Missing("queryId", opLambda, null);
     }
 
-    public void setHitCount_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setHitCount_Missing("hitCount", opLambda, aggsLambda);
+    public void setQueryId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setQueryId_Missing("queryId", opLambda, aggsLambda);
     }
 
-    public void setHitCount_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setQueryId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "hitCount");
+        MissingAggregationBuilder builder = regMissingA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1086,16 +959,16 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setQueryOffset_PercentileRanks() {
-        setQueryOffset_PercentileRanks(null);
+    public void setQueryOffset_PercentileRanks(double[] values) {
+        setQueryOffset_PercentileRanks(values, null);
     }
 
-    public void setQueryOffset_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setQueryOffset_PercentileRanks("queryOffset", opLambda);
+    public void setQueryOffset_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setQueryOffset_PercentileRanks("queryOffset", values, opLambda);
     }
 
-    public void setQueryOffset_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "queryOffset");
+    public void setQueryOffset_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "queryOffset", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1304,43 +1177,269 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryPageSize_Percentiles("queryPageSize", opLambda);
     }
 
-    public void setQueryPageSize_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        PercentilesAggregationBuilder builder = regPercentilesA(name, "queryPageSize");
+    public void setQueryPageSize_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "queryPageSize");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryPageSize_PercentileRanks(double[] values) {
+        setQueryPageSize_PercentileRanks(values, null);
+    }
+
+    public void setQueryPageSize_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setQueryPageSize_PercentileRanks("queryPageSize", values, opLambda);
+    }
+
+    public void setQueryPageSize_PercentileRanks(String name, double[] values,
+            ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "queryPageSize", values);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryPageSize_Histogram() {
+        setQueryPageSize_Histogram(null);
+    }
+
+    public void setQueryPageSize_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
+        setQueryPageSize_Histogram("queryPageSize", opLambda, null);
+    }
+
+    public void setQueryPageSize_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setQueryPageSize_Histogram("queryPageSize", opLambda, aggsLambda);
+    }
+
+    public void setQueryPageSize_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "queryPageSize");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            SearchLogCA ca = new SearchLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setQueryPageSize_Range() {
+        setQueryPageSize_Range(null);
+    }
+
+    public void setQueryPageSize_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
+        setQueryPageSize_Range("queryPageSize", opLambda, null);
+    }
+
+    public void setQueryPageSize_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setQueryPageSize_Range("queryPageSize", opLambda, aggsLambda);
+    }
+
+    public void setQueryPageSize_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "queryPageSize");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            SearchLogCA ca = new SearchLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setQueryPageSize_Count() {
+        setQueryPageSize_Count(null);
+    }
+
+    public void setQueryPageSize_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setQueryPageSize_Count("queryPageSize", opLambda);
+    }
+
+    public void setQueryPageSize_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "queryPageSize");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryPageSize_Cardinality() {
+        setQueryPageSize_Cardinality(null);
+    }
+
+    public void setQueryPageSize_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setQueryPageSize_Cardinality("queryPageSize", opLambda);
+    }
+
+    public void setQueryPageSize_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryPageSize");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryPageSize_Missing() {
+        setQueryPageSize_Missing(null);
+    }
+
+    public void setQueryPageSize_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setQueryPageSize_Missing("queryPageSize", opLambda, null);
+    }
+
+    public void setQueryPageSize_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setQueryPageSize_Missing("queryPageSize", opLambda, aggsLambda);
+    }
+
+    public void setQueryPageSize_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "queryPageSize");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            SearchLogCA ca = new SearchLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setQueryTime_Avg() {
+        setQueryTime_Avg(null);
+    }
+
+    public void setQueryTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        setQueryTime_Avg("queryTime", opLambda);
+    }
+
+    public void setQueryTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "queryTime");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryTime_Max() {
+        setQueryTime_Max(null);
+    }
+
+    public void setQueryTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        setQueryTime_Max("queryTime", opLambda);
+    }
+
+    public void setQueryTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "queryTime");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryTime_Min() {
+        setQueryTime_Min(null);
+    }
+
+    public void setQueryTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        setQueryTime_Min("queryTime", opLambda);
+    }
+
+    public void setQueryTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "queryTime");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryTime_Sum() {
+        setQueryTime_Sum(null);
+    }
+
+    public void setQueryTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        setQueryTime_Sum("queryTime", opLambda);
+    }
+
+    public void setQueryTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "queryTime");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryTime_ExtendedStats() {
+        setQueryTime_ExtendedStats(null);
+    }
+
+    public void setQueryTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        setQueryTime_ExtendedStats("queryTime", opLambda);
+    }
+
+    public void setQueryTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "queryTime");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryTime_Stats() {
+        setQueryTime_Stats(null);
+    }
+
+    public void setQueryTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        setQueryTime_Stats("queryTime", opLambda);
+    }
+
+    public void setQueryTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "queryTime");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryTime_Percentiles() {
+        setQueryTime_Percentiles(null);
+    }
+
+    public void setQueryTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        setQueryTime_Percentiles("queryTime", opLambda);
+    }
+
+    public void setQueryTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryPageSize_PercentileRanks() {
-        setQueryPageSize_PercentileRanks(null);
+    public void setQueryTime_PercentileRanks(double[] values) {
+        setQueryTime_PercentileRanks(values, null);
     }
 
-    public void setQueryPageSize_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setQueryPageSize_PercentileRanks("queryPageSize", opLambda);
+    public void setQueryTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setQueryTime_PercentileRanks("queryTime", values, opLambda);
     }
 
-    public void setQueryPageSize_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "queryPageSize");
+    public void setQueryTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "queryTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryPageSize_Histogram() {
-        setQueryPageSize_Histogram(null);
+    public void setQueryTime_Histogram() {
+        setQueryTime_Histogram(null);
     }
 
-    public void setQueryPageSize_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
-        setQueryPageSize_Histogram("queryPageSize", opLambda, null);
+    public void setQueryTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
+        setQueryTime_Histogram("queryTime", opLambda, null);
     }
 
-    public void setQueryPageSize_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setQueryPageSize_Histogram("queryPageSize", opLambda, aggsLambda);
+    public void setQueryTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setQueryTime_Histogram("queryTime", opLambda, aggsLambda);
     }
 
-    public void setQueryPageSize_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+    public void setQueryTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        HistogramAggregationBuilder builder = regHistogramA(name, "queryPageSize");
+        HistogramAggregationBuilder builder = regHistogramA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1351,21 +1450,21 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setQueryPageSize_Range() {
-        setQueryPageSize_Range(null);
+    public void setQueryTime_Range() {
+        setQueryTime_Range(null);
     }
 
-    public void setQueryPageSize_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
-        setQueryPageSize_Range("queryPageSize", opLambda, null);
+    public void setQueryTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
+        setQueryTime_Range("queryTime", opLambda, null);
     }
 
-    public void setQueryPageSize_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setQueryPageSize_Range("queryPageSize", opLambda, aggsLambda);
+    public void setQueryTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setQueryTime_Range("queryTime", opLambda, aggsLambda);
     }
 
-    public void setQueryPageSize_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+    public void setQueryTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        RangeAggregationBuilder builder = regRangeA(name, "queryPageSize");
+        RangeAggregationBuilder builder = regRangeA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1376,51 +1475,51 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setQueryPageSize_Count() {
-        setQueryPageSize_Count(null);
+    public void setQueryTime_Count() {
+        setQueryTime_Count(null);
     }
 
-    public void setQueryPageSize_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setQueryPageSize_Count("queryPageSize", opLambda);
+    public void setQueryTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setQueryTime_Count("queryTime", opLambda);
     }
 
-    public void setQueryPageSize_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "queryPageSize");
+    public void setQueryTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryPageSize_Cardinality() {
-        setQueryPageSize_Cardinality(null);
+    public void setQueryTime_Cardinality() {
+        setQueryTime_Cardinality(null);
     }
 
-    public void setQueryPageSize_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setQueryPageSize_Cardinality("queryPageSize", opLambda);
+    public void setQueryTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setQueryTime_Cardinality("queryTime", opLambda);
     }
 
-    public void setQueryPageSize_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryPageSize");
+    public void setQueryTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryPageSize_Missing() {
-        setQueryPageSize_Missing(null);
+    public void setQueryTime_Missing() {
+        setQueryTime_Missing(null);
     }
 
-    public void setQueryPageSize_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setQueryPageSize_Missing("queryPageSize", opLambda, null);
+    public void setQueryTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setQueryTime_Missing("queryTime", opLambda, null);
     }
 
-    public void setQueryPageSize_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setQueryPageSize_Missing("queryPageSize", opLambda, aggsLambda);
+    public void setQueryTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setQueryTime_Missing("queryTime", opLambda, aggsLambda);
     }
 
-    public void setQueryPageSize_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setQueryTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "queryPageSize");
+        MissingAggregationBuilder builder = regMissingA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1772,16 +1871,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setResponseTime_PercentileRanks() {
-        setResponseTime_PercentileRanks(null);
+    public void setResponseTime_PercentileRanks(double[] values) {
+        setResponseTime_PercentileRanks(values, null);
     }
 
-    public void setResponseTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setResponseTime_PercentileRanks("responseTime", opLambda);
+    public void setResponseTime_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setResponseTime_PercentileRanks("responseTime", values, opLambda);
     }
 
-    public void setResponseTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "responseTime");
+    public void setResponseTime_PercentileRanks(String name, double[] values,
+            ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "responseTime", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1892,141 +1992,177 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setQueryTime_Avg() {
-        setQueryTime_Avg(null);
-    }
-
-    public void setQueryTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        setQueryTime_Avg("queryTime", opLambda);
-    }
-
-    public void setQueryTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        AvgAggregationBuilder builder = regAvgA(name, "queryTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRoles_Terms() {
+        setRoles_Terms(null);
     }
 
-    public void setQueryTime_Max() {
-        setQueryTime_Max(null);
+    public void setRoles_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setRoles_Terms("roles", opLambda, null);
     }
 
-    public void setQueryTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        setQueryTime_Max("queryTime", opLambda);
+    public void setRoles_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setRoles_Terms("roles", opLambda, aggsLambda);
     }
 
-    public void setQueryTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        MaxAggregationBuilder builder = regMaxA(name, "queryTime");
+    public void setRoles_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            SearchLogCA ca = new SearchLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setQueryTime_Min() {
-        setQueryTime_Min(null);
+    public void setRoles_SignificantTerms() {
+        setRoles_SignificantTerms(null);
     }
 
-    public void setQueryTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        setQueryTime_Min("queryTime", opLambda);
+    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setRoles_SignificantTerms("roles", opLambda, null);
     }
 
-    public void setQueryTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        MinAggregationBuilder builder = regMinA(name, "queryTime");
+    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        setRoles_SignificantTerms("roles", opLambda, aggsLambda);
+    }
+
+    public void setRoles_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            SearchLogCA ca = new SearchLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setQueryTime_Sum() {
-        setQueryTime_Sum(null);
+    public void setRoles_IpRange() {
+        setRoles_IpRange(null);
     }
 
-    public void setQueryTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        setQueryTime_Sum("queryTime", opLambda);
+    public void setRoles_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setRoles_IpRange("roles", opLambda, null);
     }
 
-    public void setQueryTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        SumAggregationBuilder builder = regSumA(name, "queryTime");
+    public void setRoles_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setRoles_IpRange("roles", opLambda, aggsLambda);
+    }
+
+    public void setRoles_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            SearchLogCA ca = new SearchLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setQueryTime_ExtendedStats() {
-        setQueryTime_ExtendedStats(null);
+    public void setRoles_Count() {
+        setRoles_Count(null);
     }
 
-    public void setQueryTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        setQueryTime_ExtendedStats("queryTime", opLambda);
+    public void setRoles_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setRoles_Count("roles", opLambda);
     }
 
-    public void setQueryTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "queryTime");
+    public void setRoles_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_Stats() {
-        setQueryTime_Stats(null);
+    public void setRoles_Cardinality() {
+        setRoles_Cardinality(null);
     }
 
-    public void setQueryTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        setQueryTime_Stats("queryTime", opLambda);
+    public void setRoles_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setRoles_Cardinality("roles", opLambda);
     }
 
-    public void setQueryTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        StatsAggregationBuilder builder = regStatsA(name, "queryTime");
+    public void setRoles_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_Percentiles() {
-        setQueryTime_Percentiles(null);
+    public void setRoles_Missing() {
+        setRoles_Missing(null);
     }
 
-    public void setQueryTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        setQueryTime_Percentiles("queryTime", opLambda);
+    public void setRoles_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setRoles_Missing("roles", opLambda, null);
     }
 
-    public void setQueryTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        PercentilesAggregationBuilder builder = regPercentilesA(name, "queryTime");
+    public void setRoles_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setRoles_Missing("roles", opLambda, aggsLambda);
+    }
+
+    public void setRoles_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            SearchLogCA ca = new SearchLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setSearchWord_Terms() {
+        setSearchWord_Terms(null);
     }
 
-    public void setQueryTime_PercentileRanks() {
-        setQueryTime_PercentileRanks(null);
+    public void setSearchWord_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setSearchWord_Terms("searchWord", opLambda, null);
     }
 
-    public void setQueryTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setQueryTime_PercentileRanks("queryTime", opLambda);
+    public void setSearchWord_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setSearchWord_Terms("searchWord", opLambda, aggsLambda);
     }
 
-    public void setQueryTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "queryTime");
+    public void setSearchWord_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "searchWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            SearchLogCA ca = new SearchLogCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setQueryTime_Histogram() {
-        setQueryTime_Histogram(null);
+    public void setSearchWord_SignificantTerms() {
+        setSearchWord_SignificantTerms(null);
     }
 
-    public void setQueryTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
-        setQueryTime_Histogram("queryTime", opLambda, null);
+    public void setSearchWord_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setSearchWord_SignificantTerms("searchWord", opLambda, null);
     }
 
-    public void setQueryTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setQueryTime_Histogram("queryTime", opLambda, aggsLambda);
+    public void setSearchWord_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        setSearchWord_SignificantTerms("searchWord", opLambda, aggsLambda);
     }
 
-    public void setQueryTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+    public void setSearchWord_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        HistogramAggregationBuilder builder = regHistogramA(name, "queryTime");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "searchWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2037,21 +2173,21 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setQueryTime_Range() {
-        setQueryTime_Range(null);
+    public void setSearchWord_IpRange() {
+        setSearchWord_IpRange(null);
     }
 
-    public void setQueryTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
-        setQueryTime_Range("queryTime", opLambda, null);
+    public void setSearchWord_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setSearchWord_IpRange("searchWord", opLambda, null);
     }
 
-    public void setQueryTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setQueryTime_Range("queryTime", opLambda, aggsLambda);
+    public void setSearchWord_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setSearchWord_IpRange("searchWord", opLambda, aggsLambda);
     }
 
-    public void setQueryTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+    public void setSearchWord_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        RangeAggregationBuilder builder = regRangeA(name, "queryTime");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "searchWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2062,51 +2198,51 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setQueryTime_Count() {
-        setQueryTime_Count(null);
+    public void setSearchWord_Count() {
+        setSearchWord_Count(null);
     }
 
-    public void setQueryTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setQueryTime_Count("queryTime", opLambda);
+    public void setSearchWord_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setSearchWord_Count("searchWord", opLambda);
     }
 
-    public void setQueryTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "queryTime");
+    public void setSearchWord_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "searchWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_Cardinality() {
-        setQueryTime_Cardinality(null);
+    public void setSearchWord_Cardinality() {
+        setSearchWord_Cardinality(null);
     }
 
-    public void setQueryTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setQueryTime_Cardinality("queryTime", opLambda);
+    public void setSearchWord_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setSearchWord_Cardinality("searchWord", opLambda);
     }
 
-    public void setQueryTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryTime");
+    public void setSearchWord_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "searchWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_Missing() {
-        setQueryTime_Missing(null);
+    public void setSearchWord_Missing() {
+        setSearchWord_Missing(null);
     }
 
-    public void setQueryTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setQueryTime_Missing("queryTime", opLambda, null);
+    public void setSearchWord_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setSearchWord_Missing("searchWord", opLambda, null);
     }
 
-    public void setQueryTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setQueryTime_Missing("queryTime", opLambda, aggsLambda);
+    public void setSearchWord_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setSearchWord_Missing("searchWord", opLambda, aggsLambda);
     }
 
-    public void setQueryTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setSearchWord_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "queryTime");
+        MissingAggregationBuilder builder = regMissingA(name, "searchWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2117,21 +2253,20 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSearchWord_Terms() {
-        setSearchWord_Terms(null);
+    public void setUser_Terms() {
+        setUser_Terms(null);
     }
 
-    public void setSearchWord_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setSearchWord_Terms("searchWord", opLambda, null);
+    public void setUser_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setUser_Terms("user", opLambda, null);
     }
 
-    public void setSearchWord_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setSearchWord_Terms("searchWord", opLambda, aggsLambda);
+    public void setUser_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setUser_Terms("user", opLambda, aggsLambda);
     }
 
-    public void setSearchWord_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "searchWord");
+    public void setUser_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "user");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2142,22 +2277,22 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSearchWord_SignificantTerms() {
-        setSearchWord_SignificantTerms(null);
+    public void setUser_SignificantTerms() {
+        setUser_SignificantTerms(null);
     }
 
-    public void setSearchWord_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setSearchWord_SignificantTerms("searchWord", opLambda, null);
+    public void setUser_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setUser_SignificantTerms("user", opLambda, null);
     }
 
-    public void setSearchWord_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setUser_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        setSearchWord_SignificantTerms("searchWord", opLambda, aggsLambda);
+        setUser_SignificantTerms("user", opLambda, aggsLambda);
     }
 
-    public void setSearchWord_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setUser_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "searchWord");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "user");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2168,21 +2303,20 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSearchWord_IpRange() {
-        setSearchWord_IpRange(null);
+    public void setUser_IpRange() {
+        setUser_IpRange(null);
     }
 
-    public void setSearchWord_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setSearchWord_IpRange("searchWord", opLambda, null);
+    public void setUser_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setUser_IpRange("user", opLambda, null);
     }
 
-    public void setSearchWord_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setSearchWord_IpRange("searchWord", opLambda, aggsLambda);
+    public void setUser_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setUser_IpRange("user", opLambda, aggsLambda);
     }
 
-    public void setSearchWord_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "searchWord");
+    public void setUser_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "user");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2193,51 +2327,50 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSearchWord_Count() {
-        setSearchWord_Count(null);
+    public void setUser_Count() {
+        setUser_Count(null);
     }
 
-    public void setSearchWord_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setSearchWord_Count("searchWord", opLambda);
+    public void setUser_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setUser_Count("user", opLambda);
     }
 
-    public void setSearchWord_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "searchWord");
+    public void setUser_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "user");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSearchWord_Cardinality() {
-        setSearchWord_Cardinality(null);
+    public void setUser_Cardinality() {
+        setUser_Cardinality(null);
     }
 
-    public void setSearchWord_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setSearchWord_Cardinality("searchWord", opLambda);
+    public void setUser_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setUser_Cardinality("user", opLambda);
     }
 
-    public void setSearchWord_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "searchWord");
+    public void setUser_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "user");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSearchWord_Missing() {
-        setSearchWord_Missing(null);
+    public void setUser_Missing() {
+        setUser_Missing(null);
     }
 
-    public void setSearchWord_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setSearchWord_Missing("searchWord", opLambda, null);
+    public void setUser_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setUser_Missing("user", opLambda, null);
     }
 
-    public void setSearchWord_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setSearchWord_Missing("searchWord", opLambda, aggsLambda);
+    public void setUser_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        setUser_Missing("user", opLambda, aggsLambda);
     }
 
-    public void setSearchWord_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "searchWord");
+    public void setUser_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "user");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2641,137 +2774,6 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setLanguages_Terms() {
-        setLanguages_Terms(null);
-    }
-
-    public void setLanguages_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setLanguages_Terms("languages", opLambda, null);
-    }
-
-    public void setLanguages_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setLanguages_Terms("languages", opLambda, aggsLambda);
-    }
-
-    public void setLanguages_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "languages");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            SearchLogCA ca = new SearchLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setLanguages_SignificantTerms() {
-        setLanguages_SignificantTerms(null);
-    }
-
-    public void setLanguages_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setLanguages_SignificantTerms("languages", opLambda, null);
-    }
-
-    public void setLanguages_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        setLanguages_SignificantTerms("languages", opLambda, aggsLambda);
-    }
-
-    public void setLanguages_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "languages");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            SearchLogCA ca = new SearchLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setLanguages_IpRange() {
-        setLanguages_IpRange(null);
-    }
-
-    public void setLanguages_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setLanguages_IpRange("languages", opLambda, null);
-    }
-
-    public void setLanguages_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setLanguages_IpRange("languages", opLambda, aggsLambda);
-    }
-
-    public void setLanguages_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "languages");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            SearchLogCA ca = new SearchLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setLanguages_Count() {
-        setLanguages_Count(null);
-    }
-
-    public void setLanguages_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setLanguages_Count("languages", opLambda);
-    }
-
-    public void setLanguages_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "languages");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_Cardinality() {
-        setLanguages_Cardinality(null);
-    }
-
-    public void setLanguages_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setLanguages_Cardinality("languages", opLambda);
-    }
-
-    public void setLanguages_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "languages");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_Missing() {
-        setLanguages_Missing(null);
-    }
-
-    public void setLanguages_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setLanguages_Missing("languages", opLambda, null);
-    }
-
-    public void setLanguages_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        setLanguages_Missing("languages", opLambda, aggsLambda);
-    }
-
-    public void setLanguages_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "languages");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            SearchLogCA ca = new SearchLogCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
     public void setVirtualHost_Terms() {
         setVirtualHost_Terms(null);
     }
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 d086bf172089740e4090069851b379eb08850339..812c1cfead35a6ac11507c04b0d701ee92f86443 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
@@ -24,7 +24,7 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.DateRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
 import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
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 054ee23effd8bef6f995bd6b7ed596de71a76e9d..fd9d1349c0b828f24a77eea2de605cf329b6e542 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
@@ -185,360 +185,403 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setQueryRequestedAt_Equal(LocalDateTime queryRequestedAt) {
-        setQueryRequestedAt_Term(queryRequestedAt, null);
+    public void setDocId_Equal(String docId) {
+        setDocId_Term(docId, null);
     }
 
-    public void setQueryRequestedAt_Equal(LocalDateTime queryRequestedAt, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setQueryRequestedAt_Term(queryRequestedAt, opLambda);
+    public void setDocId_Equal(String docId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setDocId_Term(docId, opLambda);
     }
 
-    public void setQueryRequestedAt_Term(LocalDateTime queryRequestedAt) {
-        setQueryRequestedAt_Term(queryRequestedAt, null);
+    public void setDocId_Term(String docId) {
+        setDocId_Term(docId, null);
     }
 
-    public void setQueryRequestedAt_Term(LocalDateTime queryRequestedAt, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("queryRequestedAt", queryRequestedAt);
+    public void setDocId_Term(String docId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryRequestedAt_NotEqual(LocalDateTime queryRequestedAt) {
-        setQueryRequestedAt_NotTerm(queryRequestedAt, null);
+    public void setDocId_NotEqual(String docId) {
+        setDocId_NotTerm(docId, null);
     }
 
-    public void setQueryRequestedAt_NotTerm(LocalDateTime queryRequestedAt) {
-        setQueryRequestedAt_NotTerm(queryRequestedAt, null);
+    public void setDocId_NotTerm(String docId) {
+        setDocId_NotTerm(docId, null);
     }
 
-    public void setQueryRequestedAt_NotEqual(LocalDateTime queryRequestedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setQueryRequestedAt_NotTerm(queryRequestedAt, opLambda);
+    public void setDocId_NotEqual(String docId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setDocId_NotTerm(docId, opLambda);
     }
 
-    public void setQueryRequestedAt_NotTerm(LocalDateTime queryRequestedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setQueryRequestedAt_Term(queryRequestedAt), opLambda);
+    public void setDocId_NotTerm(String docId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setDocId_Term(docId), opLambda);
     }
 
-    public void setQueryRequestedAt_Terms(Collection<LocalDateTime> queryRequestedAtList) {
-        setQueryRequestedAt_Terms(queryRequestedAtList, null);
+    public void setDocId_Terms(Collection<String> docIdList) {
+        setDocId_Terms(docIdList, null);
     }
 
-    public void setQueryRequestedAt_Terms(Collection<LocalDateTime> queryRequestedAtList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("queryRequestedAt", queryRequestedAtList);
+    public void setDocId_Terms(Collection<String> docIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("docId", docIdList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryRequestedAt_InScope(Collection<LocalDateTime> queryRequestedAtList) {
-        setQueryRequestedAt_Terms(queryRequestedAtList, null);
+    public void setDocId_InScope(Collection<String> docIdList) {
+        setDocId_Terms(docIdList, null);
     }
 
-    public void setQueryRequestedAt_InScope(Collection<LocalDateTime> queryRequestedAtList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setQueryRequestedAt_Terms(queryRequestedAtList, opLambda);
+    public void setDocId_InScope(Collection<String> docIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setDocId_Terms(docIdList, opLambda);
     }
 
-    public void setQueryRequestedAt_Match(LocalDateTime queryRequestedAt) {
-        setQueryRequestedAt_Match(queryRequestedAt, null);
+    public void setDocId_Match(String docId) {
+        setDocId_Match(docId, null);
     }
 
-    public void setQueryRequestedAt_Match(LocalDateTime queryRequestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("queryRequestedAt", queryRequestedAt);
+    public void setDocId_Match(String docId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryRequestedAt_MatchPhrase(LocalDateTime queryRequestedAt) {
-        setQueryRequestedAt_MatchPhrase(queryRequestedAt, null);
+    public void setDocId_MatchPhrase(String docId) {
+        setDocId_MatchPhrase(docId, null);
     }
 
-    public void setQueryRequestedAt_MatchPhrase(LocalDateTime queryRequestedAt, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryRequestedAt", queryRequestedAt);
+    public void setDocId_MatchPhrase(String docId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryRequestedAt_MatchPhrasePrefix(LocalDateTime queryRequestedAt) {
-        setQueryRequestedAt_MatchPhrasePrefix(queryRequestedAt, null);
+    public void setDocId_MatchPhrasePrefix(String docId) {
+        setDocId_MatchPhrasePrefix(docId, null);
     }
 
-    public void setQueryRequestedAt_MatchPhrasePrefix(LocalDateTime queryRequestedAt,
-            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryRequestedAt", queryRequestedAt);
+    public void setDocId_MatchPhrasePrefix(String docId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryRequestedAt_Fuzzy(LocalDateTime queryRequestedAt) {
-        setQueryRequestedAt_Fuzzy(queryRequestedAt, null);
+    public void setDocId_Fuzzy(String docId) {
+        setDocId_Fuzzy(docId, null);
     }
 
-    public void setQueryRequestedAt_Fuzzy(LocalDateTime queryRequestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("queryRequestedAt", queryRequestedAt);
+    public void setDocId_Fuzzy(String docId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryRequestedAt_GreaterThan(LocalDateTime queryRequestedAt) {
-        setQueryRequestedAt_GreaterThan(queryRequestedAt, null);
+    public void setDocId_Prefix(String docId) {
+        setDocId_Prefix(docId, null);
     }
 
-    public void setQueryRequestedAt_GreaterThan(LocalDateTime queryRequestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = toRangeLocalDateTimeString(queryRequestedAt, "date_optional_time");
-        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_GREATER_THAN, _value);
+    public void setDocId_Prefix(String docId, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryRequestedAt_LessThan(LocalDateTime queryRequestedAt) {
-        setQueryRequestedAt_LessThan(queryRequestedAt, null);
+    public void setDocId_Wildcard(String docId) {
+        setDocId_Wildcard(docId, null);
     }
 
-    public void setQueryRequestedAt_LessThan(LocalDateTime queryRequestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = toRangeLocalDateTimeString(queryRequestedAt, "date_optional_time");
-        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_LESS_THAN, _value);
+    public void setDocId_Wildcard(String docId, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryRequestedAt_GreaterEqual(LocalDateTime queryRequestedAt) {
-        setQueryRequestedAt_GreaterEqual(queryRequestedAt, null);
+    public void setDocId_Regexp(String docId) {
+        setDocId_Regexp(docId, null);
     }
 
-    public void setQueryRequestedAt_GreaterEqual(LocalDateTime queryRequestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = toRangeLocalDateTimeString(queryRequestedAt, "date_optional_time");
-        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setDocId_Regexp(String docId, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryRequestedAt_LessEqual(LocalDateTime queryRequestedAt) {
-        setQueryRequestedAt_LessEqual(queryRequestedAt, null);
+    public void setDocId_SpanTerm(String docId) {
+        setDocId_SpanTerm("docId", null);
     }
 
-    public void setQueryRequestedAt_LessEqual(LocalDateTime queryRequestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = toRangeLocalDateTimeString(queryRequestedAt, "date_optional_time");
-        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setDocId_SpanTerm(String docId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryRequestedAt_Exists() {
-        setQueryRequestedAt_Exists(null);
+    public void setDocId_GreaterThan(String docId) {
+        setDocId_GreaterThan(docId, null);
     }
 
-    public void setQueryRequestedAt_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("queryRequestedAt");
+    public void setDocId_GreaterThan(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = docId;
+        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryRequestedAt_CommonTerms(LocalDateTime queryRequestedAt) {
-        setQueryRequestedAt_CommonTerms(queryRequestedAt, null);
+    public void setDocId_LessThan(String docId) {
+        setDocId_LessThan(docId, null);
     }
 
-    public void setQueryRequestedAt_CommonTerms(LocalDateTime queryRequestedAt, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("queryRequestedAt", queryRequestedAt);
+    public void setDocId_LessThan(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = docId;
+        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsClickLogCQ addOrderBy_QueryRequestedAt_Asc() {
-        regOBA("queryRequestedAt");
-        return this;
+    public void setDocId_GreaterEqual(String docId) {
+        setDocId_GreaterEqual(docId, null);
     }
 
-    public BsClickLogCQ addOrderBy_QueryRequestedAt_Desc() {
-        regOBD("queryRequestedAt");
-        return this;
+    public void setDocId_GreaterEqual(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = docId;
+        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setRequestedAt_Equal(LocalDateTime requestedAt) {
-        setRequestedAt_Term(requestedAt, null);
+    public void setDocId_LessEqual(String docId) {
+        setDocId_LessEqual(docId, null);
     }
 
-    public void setRequestedAt_Equal(LocalDateTime requestedAt, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setRequestedAt_Term(requestedAt, opLambda);
+    public void setDocId_LessEqual(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = docId;
+        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setRequestedAt_Term(LocalDateTime requestedAt) {
-        setRequestedAt_Term(requestedAt, null);
+    public void setDocId_Exists() {
+        setDocId_Exists(null);
     }
 
-    public void setRequestedAt_Term(LocalDateTime requestedAt, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("requestedAt", requestedAt);
+    public void setDocId_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRequestedAt_NotEqual(LocalDateTime requestedAt) {
-        setRequestedAt_NotTerm(requestedAt, null);
+    public void setDocId_CommonTerms(String docId) {
+        setDocId_CommonTerms(docId, null);
     }
 
-    public void setRequestedAt_NotTerm(LocalDateTime requestedAt) {
-        setRequestedAt_NotTerm(requestedAt, null);
+    public void setDocId_CommonTerms(String docId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("docId", docId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setRequestedAt_NotEqual(LocalDateTime requestedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setRequestedAt_NotTerm(requestedAt, opLambda);
+    public BsClickLogCQ addOrderBy_DocId_Asc() {
+        regOBA("docId");
+        return this;
     }
 
-    public void setRequestedAt_NotTerm(LocalDateTime requestedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setRequestedAt_Term(requestedAt), opLambda);
+    public BsClickLogCQ addOrderBy_DocId_Desc() {
+        regOBD("docId");
+        return this;
     }
 
-    public void setRequestedAt_Terms(Collection<LocalDateTime> requestedAtList) {
-        setRequestedAt_Terms(requestedAtList, null);
+    public void setOrder_Equal(Integer order) {
+        setOrder_Term(order, null);
     }
 
-    public void setRequestedAt_Terms(Collection<LocalDateTime> requestedAtList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("requestedAt", requestedAtList);
+    public void setOrder_Equal(Integer order, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setOrder_Term(order, opLambda);
+    }
+
+    public void setOrder_Term(Integer order) {
+        setOrder_Term(order, null);
+    }
+
+    public void setOrder_Term(Integer order, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("order", order);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRequestedAt_InScope(Collection<LocalDateTime> requestedAtList) {
-        setRequestedAt_Terms(requestedAtList, null);
+    public void setOrder_NotEqual(Integer order) {
+        setOrder_NotTerm(order, null);
     }
 
-    public void setRequestedAt_InScope(Collection<LocalDateTime> requestedAtList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setRequestedAt_Terms(requestedAtList, opLambda);
+    public void setOrder_NotTerm(Integer order) {
+        setOrder_NotTerm(order, null);
     }
 
-    public void setRequestedAt_Match(LocalDateTime requestedAt) {
-        setRequestedAt_Match(requestedAt, null);
+    public void setOrder_NotEqual(Integer order, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setOrder_NotTerm(order, opLambda);
     }
 
-    public void setRequestedAt_Match(LocalDateTime requestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("requestedAt", requestedAt);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setOrder_NotTerm(Integer order, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setOrder_Term(order), opLambda);
     }
 
-    public void setRequestedAt_MatchPhrase(LocalDateTime requestedAt) {
-        setRequestedAt_MatchPhrase(requestedAt, null);
+    public void setOrder_Terms(Collection<Integer> orderList) {
+        setOrder_Terms(orderList, null);
     }
 
-    public void setRequestedAt_MatchPhrase(LocalDateTime requestedAt, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("requestedAt", requestedAt);
+    public void setOrder_Terms(Collection<Integer> orderList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("order", orderList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRequestedAt_MatchPhrasePrefix(LocalDateTime requestedAt) {
-        setRequestedAt_MatchPhrasePrefix(requestedAt, null);
+    public void setOrder_InScope(Collection<Integer> orderList) {
+        setOrder_Terms(orderList, null);
     }
 
-    public void setRequestedAt_MatchPhrasePrefix(LocalDateTime requestedAt, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("requestedAt", requestedAt);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setOrder_InScope(Collection<Integer> orderList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setOrder_Terms(orderList, opLambda);
     }
 
-    public void setRequestedAt_Fuzzy(LocalDateTime requestedAt) {
-        setRequestedAt_Fuzzy(requestedAt, null);
+    public void setOrder_Match(Integer order) {
+        setOrder_Match(order, null);
     }
 
-    public void setRequestedAt_Fuzzy(LocalDateTime requestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("requestedAt", requestedAt);
+    public void setOrder_Match(Integer order, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("order", order);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRequestedAt_GreaterThan(LocalDateTime requestedAt) {
-        setRequestedAt_GreaterThan(requestedAt, null);
+    public void setOrder_MatchPhrase(Integer order) {
+        setOrder_MatchPhrase(order, null);
     }
 
-    public void setRequestedAt_GreaterThan(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
-        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_THAN, _value);
+    public void setOrder_MatchPhrase(Integer order, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("order", order);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRequestedAt_LessThan(LocalDateTime requestedAt) {
-        setRequestedAt_LessThan(requestedAt, null);
+    public void setOrder_MatchPhrasePrefix(Integer order) {
+        setOrder_MatchPhrasePrefix(order, null);
     }
 
-    public void setRequestedAt_LessThan(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
-        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_THAN, _value);
+    public void setOrder_MatchPhrasePrefix(Integer order, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("order", order);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRequestedAt_GreaterEqual(LocalDateTime requestedAt) {
-        setRequestedAt_GreaterEqual(requestedAt, null);
+    public void setOrder_Fuzzy(Integer order) {
+        setOrder_Fuzzy(order, null);
     }
 
-    public void setRequestedAt_GreaterEqual(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
-        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setOrder_Fuzzy(Integer order, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("order", order);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRequestedAt_LessEqual(LocalDateTime requestedAt) {
-        setRequestedAt_LessEqual(requestedAt, null);
+    public void setOrder_GreaterThan(Integer order) {
+        setOrder_GreaterThan(order, null);
     }
 
-    public void setRequestedAt_LessEqual(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
-        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setOrder_GreaterThan(Integer order, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = order;
+        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRequestedAt_Exists() {
-        setRequestedAt_Exists(null);
+    public void setOrder_LessThan(Integer order) {
+        setOrder_LessThan(order, null);
     }
 
-    public void setRequestedAt_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("requestedAt");
+    public void setOrder_LessThan(Integer order, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = order;
+        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRequestedAt_CommonTerms(LocalDateTime requestedAt) {
-        setRequestedAt_CommonTerms(requestedAt, null);
+    public void setOrder_GreaterEqual(Integer order) {
+        setOrder_GreaterEqual(order, null);
     }
 
-    public void setRequestedAt_CommonTerms(LocalDateTime requestedAt, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("requestedAt", requestedAt);
+    public void setOrder_GreaterEqual(Integer order, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = order;
+        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsClickLogCQ addOrderBy_RequestedAt_Asc() {
-        regOBA("requestedAt");
+    public void setOrder_LessEqual(Integer order) {
+        setOrder_LessEqual(order, null);
+    }
+
+    public void setOrder_LessEqual(Integer order, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = order;
+        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setOrder_Exists() {
+        setOrder_Exists(null);
+    }
+
+    public void setOrder_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("order");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setOrder_CommonTerms(Integer order) {
+        setOrder_CommonTerms(order, null);
+    }
+
+    public void setOrder_CommonTerms(Integer order, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("order", order);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsClickLogCQ addOrderBy_Order_Asc() {
+        regOBA("order");
         return this;
     }
 
-    public BsClickLogCQ addOrderBy_RequestedAt_Desc() {
-        regOBD("requestedAt");
+    public BsClickLogCQ addOrderBy_Order_Desc() {
+        regOBD("order");
         return this;
     }
 
@@ -764,447 +807,360 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setDocId_Equal(String docId) {
-        setDocId_Term(docId, null);
-    }
-
-    public void setDocId_Equal(String docId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setDocId_Term(docId, opLambda);
-    }
-
-    public void setDocId_Term(String docId) {
-        setDocId_Term(docId, null);
-    }
-
-    public void setDocId_Term(String docId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("docId", docId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDocId_NotEqual(String docId) {
-        setDocId_NotTerm(docId, null);
-    }
-
-    public void setDocId_NotTerm(String docId) {
-        setDocId_NotTerm(docId, null);
-    }
-
-    public void setDocId_NotEqual(String docId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setDocId_NotTerm(docId, opLambda);
+    public void setQueryRequestedAt_Equal(LocalDateTime queryRequestedAt) {
+        setQueryRequestedAt_Term(queryRequestedAt, null);
     }
 
-    public void setDocId_NotTerm(String docId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setDocId_Term(docId), opLambda);
+    public void setQueryRequestedAt_Equal(LocalDateTime queryRequestedAt, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setQueryRequestedAt_Term(queryRequestedAt, opLambda);
     }
 
-    public void setDocId_Terms(Collection<String> docIdList) {
-        setDocId_Terms(docIdList, null);
+    public void setQueryRequestedAt_Term(LocalDateTime queryRequestedAt) {
+        setQueryRequestedAt_Term(queryRequestedAt, null);
     }
 
-    public void setDocId_Terms(Collection<String> docIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("docId", docIdList);
+    public void setQueryRequestedAt_Term(LocalDateTime queryRequestedAt, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("queryRequestedAt", queryRequestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDocId_InScope(Collection<String> docIdList) {
-        setDocId_Terms(docIdList, null);
-    }
-
-    public void setDocId_InScope(Collection<String> docIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setDocId_Terms(docIdList, opLambda);
-    }
-
-    public void setDocId_Match(String docId) {
-        setDocId_Match(docId, null);
+    public void setQueryRequestedAt_NotEqual(LocalDateTime queryRequestedAt) {
+        setQueryRequestedAt_NotTerm(queryRequestedAt, null);
     }
 
-    public void setDocId_Match(String docId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("docId", docId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryRequestedAt_NotTerm(LocalDateTime queryRequestedAt) {
+        setQueryRequestedAt_NotTerm(queryRequestedAt, null);
     }
 
-    public void setDocId_MatchPhrase(String docId) {
-        setDocId_MatchPhrase(docId, null);
+    public void setQueryRequestedAt_NotEqual(LocalDateTime queryRequestedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setQueryRequestedAt_NotTerm(queryRequestedAt, opLambda);
     }
 
-    public void setDocId_MatchPhrase(String docId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("docId", docId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryRequestedAt_NotTerm(LocalDateTime queryRequestedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setQueryRequestedAt_Term(queryRequestedAt), opLambda);
     }
 
-    public void setDocId_MatchPhrasePrefix(String docId) {
-        setDocId_MatchPhrasePrefix(docId, null);
+    public void setQueryRequestedAt_Terms(Collection<LocalDateTime> queryRequestedAtList) {
+        setQueryRequestedAt_Terms(queryRequestedAtList, null);
     }
 
-    public void setDocId_MatchPhrasePrefix(String docId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("docId", docId);
+    public void setQueryRequestedAt_Terms(Collection<LocalDateTime> queryRequestedAtList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("queryRequestedAt", queryRequestedAtList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDocId_Fuzzy(String docId) {
-        setDocId_Fuzzy(docId, null);
+    public void setQueryRequestedAt_InScope(Collection<LocalDateTime> queryRequestedAtList) {
+        setQueryRequestedAt_Terms(queryRequestedAtList, null);
     }
 
-    public void setDocId_Fuzzy(String docId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("docId", docId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryRequestedAt_InScope(Collection<LocalDateTime> queryRequestedAtList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setQueryRequestedAt_Terms(queryRequestedAtList, opLambda);
     }
 
-    public void setDocId_Prefix(String docId) {
-        setDocId_Prefix(docId, null);
+    public void setQueryRequestedAt_Match(LocalDateTime queryRequestedAt) {
+        setQueryRequestedAt_Match(queryRequestedAt, null);
     }
 
-    public void setDocId_Prefix(String docId, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("docId", docId);
+    public void setQueryRequestedAt_Match(LocalDateTime queryRequestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("queryRequestedAt", queryRequestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDocId_Wildcard(String docId) {
-        setDocId_Wildcard(docId, null);
+    public void setQueryRequestedAt_MatchPhrase(LocalDateTime queryRequestedAt) {
+        setQueryRequestedAt_MatchPhrase(queryRequestedAt, null);
     }
 
-    public void setDocId_Wildcard(String docId, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("docId", docId);
+    public void setQueryRequestedAt_MatchPhrase(LocalDateTime queryRequestedAt, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryRequestedAt", queryRequestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDocId_Regexp(String docId) {
-        setDocId_Regexp(docId, null);
+    public void setQueryRequestedAt_MatchPhrasePrefix(LocalDateTime queryRequestedAt) {
+        setQueryRequestedAt_MatchPhrasePrefix(queryRequestedAt, null);
     }
 
-    public void setDocId_Regexp(String docId, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("docId", docId);
+    public void setQueryRequestedAt_MatchPhrasePrefix(LocalDateTime queryRequestedAt,
+            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryRequestedAt", queryRequestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDocId_SpanTerm(String docId) {
-        setDocId_SpanTerm("docId", null);
+    public void setQueryRequestedAt_Fuzzy(LocalDateTime queryRequestedAt) {
+        setQueryRequestedAt_Fuzzy(queryRequestedAt, null);
     }
 
-    public void setDocId_SpanTerm(String docId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("docId", docId);
+    public void setQueryRequestedAt_Fuzzy(LocalDateTime queryRequestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("queryRequestedAt", queryRequestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDocId_GreaterThan(String docId) {
-        setDocId_GreaterThan(docId, null);
+    public void setQueryRequestedAt_GreaterThan(LocalDateTime queryRequestedAt) {
+        setQueryRequestedAt_GreaterThan(queryRequestedAt, null);
     }
 
-    public void setDocId_GreaterThan(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = docId;
-        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_GREATER_THAN, _value);
+    public void setQueryRequestedAt_GreaterThan(LocalDateTime queryRequestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = toRangeLocalDateTimeString(queryRequestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDocId_LessThan(String docId) {
-        setDocId_LessThan(docId, null);
+    public void setQueryRequestedAt_LessThan(LocalDateTime queryRequestedAt) {
+        setQueryRequestedAt_LessThan(queryRequestedAt, null);
     }
 
-    public void setDocId_LessThan(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = docId;
-        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_LESS_THAN, _value);
+    public void setQueryRequestedAt_LessThan(LocalDateTime queryRequestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = toRangeLocalDateTimeString(queryRequestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDocId_GreaterEqual(String docId) {
-        setDocId_GreaterEqual(docId, null);
+    public void setQueryRequestedAt_GreaterEqual(LocalDateTime queryRequestedAt) {
+        setQueryRequestedAt_GreaterEqual(queryRequestedAt, null);
     }
 
-    public void setDocId_GreaterEqual(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = docId;
-        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setQueryRequestedAt_GreaterEqual(LocalDateTime queryRequestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = toRangeLocalDateTimeString(queryRequestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDocId_LessEqual(String docId) {
-        setDocId_LessEqual(docId, null);
+    public void setQueryRequestedAt_LessEqual(LocalDateTime queryRequestedAt) {
+        setQueryRequestedAt_LessEqual(queryRequestedAt, null);
     }
 
-    public void setDocId_LessEqual(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = docId;
-        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setQueryRequestedAt_LessEqual(LocalDateTime queryRequestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = toRangeLocalDateTimeString(queryRequestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDocId_Exists() {
-        setDocId_Exists(null);
+    public void setQueryRequestedAt_Exists() {
+        setQueryRequestedAt_Exists(null);
     }
 
-    public void setDocId_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("docId");
+    public void setQueryRequestedAt_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("queryRequestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDocId_CommonTerms(String docId) {
-        setDocId_CommonTerms(docId, null);
+    public void setQueryRequestedAt_CommonTerms(LocalDateTime queryRequestedAt) {
+        setQueryRequestedAt_CommonTerms(queryRequestedAt, null);
     }
 
-    public void setDocId_CommonTerms(String docId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("docId", docId);
+    public void setQueryRequestedAt_CommonTerms(LocalDateTime queryRequestedAt, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("queryRequestedAt", queryRequestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsClickLogCQ addOrderBy_DocId_Asc() {
-        regOBA("docId");
+    public BsClickLogCQ addOrderBy_QueryRequestedAt_Asc() {
+        regOBA("queryRequestedAt");
         return this;
     }
 
-    public BsClickLogCQ addOrderBy_DocId_Desc() {
-        regOBD("docId");
+    public BsClickLogCQ addOrderBy_QueryRequestedAt_Desc() {
+        regOBD("queryRequestedAt");
         return this;
     }
 
-    public void setUserSessionId_Equal(String userSessionId) {
-        setUserSessionId_Term(userSessionId, null);
-    }
-
-    public void setUserSessionId_Equal(String userSessionId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setUserSessionId_Term(userSessionId, opLambda);
-    }
-
-    public void setUserSessionId_Term(String userSessionId) {
-        setUserSessionId_Term(userSessionId, null);
-    }
-
-    public void setUserSessionId_Term(String userSessionId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("userSessionId", userSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserSessionId_NotEqual(String userSessionId) {
-        setUserSessionId_NotTerm(userSessionId, null);
-    }
-
-    public void setUserSessionId_NotTerm(String userSessionId) {
-        setUserSessionId_NotTerm(userSessionId, null);
-    }
-
-    public void setUserSessionId_NotEqual(String userSessionId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setUserSessionId_NotTerm(userSessionId, opLambda);
+    public void setRequestedAt_Equal(LocalDateTime requestedAt) {
+        setRequestedAt_Term(requestedAt, null);
     }
 
-    public void setUserSessionId_NotTerm(String userSessionId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setUserSessionId_Term(userSessionId), opLambda);
+    public void setRequestedAt_Equal(LocalDateTime requestedAt, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setRequestedAt_Term(requestedAt, opLambda);
     }
 
-    public void setUserSessionId_Terms(Collection<String> userSessionIdList) {
-        setUserSessionId_Terms(userSessionIdList, null);
+    public void setRequestedAt_Term(LocalDateTime requestedAt) {
+        setRequestedAt_Term(requestedAt, null);
     }
 
-    public void setUserSessionId_Terms(Collection<String> userSessionIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("userSessionId", userSessionIdList);
+    public void setRequestedAt_Term(LocalDateTime requestedAt, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("requestedAt", requestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUserSessionId_InScope(Collection<String> userSessionIdList) {
-        setUserSessionId_Terms(userSessionIdList, null);
-    }
-
-    public void setUserSessionId_InScope(Collection<String> userSessionIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setUserSessionId_Terms(userSessionIdList, opLambda);
-    }
-
-    public void setUserSessionId_Match(String userSessionId) {
-        setUserSessionId_Match(userSessionId, null);
+    public void setRequestedAt_NotEqual(LocalDateTime requestedAt) {
+        setRequestedAt_NotTerm(requestedAt, null);
     }
 
-    public void setUserSessionId_Match(String userSessionId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("userSessionId", userSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRequestedAt_NotTerm(LocalDateTime requestedAt) {
+        setRequestedAt_NotTerm(requestedAt, null);
     }
 
-    public void setUserSessionId_MatchPhrase(String userSessionId) {
-        setUserSessionId_MatchPhrase(userSessionId, null);
+    public void setRequestedAt_NotEqual(LocalDateTime requestedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setRequestedAt_NotTerm(requestedAt, opLambda);
     }
 
-    public void setUserSessionId_MatchPhrase(String userSessionId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("userSessionId", userSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRequestedAt_NotTerm(LocalDateTime requestedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setRequestedAt_Term(requestedAt), opLambda);
     }
 
-    public void setUserSessionId_MatchPhrasePrefix(String userSessionId) {
-        setUserSessionId_MatchPhrasePrefix(userSessionId, null);
+    public void setRequestedAt_Terms(Collection<LocalDateTime> requestedAtList) {
+        setRequestedAt_Terms(requestedAtList, null);
     }
 
-    public void setUserSessionId_MatchPhrasePrefix(String userSessionId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("userSessionId", userSessionId);
+    public void setRequestedAt_Terms(Collection<LocalDateTime> requestedAtList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("requestedAt", requestedAtList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUserSessionId_Fuzzy(String userSessionId) {
-        setUserSessionId_Fuzzy(userSessionId, null);
+    public void setRequestedAt_InScope(Collection<LocalDateTime> requestedAtList) {
+        setRequestedAt_Terms(requestedAtList, null);
     }
 
-    public void setUserSessionId_Fuzzy(String userSessionId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("userSessionId", userSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRequestedAt_InScope(Collection<LocalDateTime> requestedAtList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setRequestedAt_Terms(requestedAtList, opLambda);
     }
 
-    public void setUserSessionId_Prefix(String userSessionId) {
-        setUserSessionId_Prefix(userSessionId, null);
+    public void setRequestedAt_Match(LocalDateTime requestedAt) {
+        setRequestedAt_Match(requestedAt, null);
     }
 
-    public void setUserSessionId_Prefix(String userSessionId, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("userSessionId", userSessionId);
+    public void setRequestedAt_Match(LocalDateTime requestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("requestedAt", requestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUserSessionId_Wildcard(String userSessionId) {
-        setUserSessionId_Wildcard(userSessionId, null);
+    public void setRequestedAt_MatchPhrase(LocalDateTime requestedAt) {
+        setRequestedAt_MatchPhrase(requestedAt, null);
     }
 
-    public void setUserSessionId_Wildcard(String userSessionId, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("userSessionId", userSessionId);
+    public void setRequestedAt_MatchPhrase(LocalDateTime requestedAt, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("requestedAt", requestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUserSessionId_Regexp(String userSessionId) {
-        setUserSessionId_Regexp(userSessionId, null);
+    public void setRequestedAt_MatchPhrasePrefix(LocalDateTime requestedAt) {
+        setRequestedAt_MatchPhrasePrefix(requestedAt, null);
     }
 
-    public void setUserSessionId_Regexp(String userSessionId, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("userSessionId", userSessionId);
+    public void setRequestedAt_MatchPhrasePrefix(LocalDateTime requestedAt, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("requestedAt", requestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUserSessionId_SpanTerm(String userSessionId) {
-        setUserSessionId_SpanTerm("userSessionId", null);
+    public void setRequestedAt_Fuzzy(LocalDateTime requestedAt) {
+        setRequestedAt_Fuzzy(requestedAt, null);
     }
 
-    public void setUserSessionId_SpanTerm(String userSessionId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("userSessionId", userSessionId);
+    public void setRequestedAt_Fuzzy(LocalDateTime requestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("requestedAt", requestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUserSessionId_GreaterThan(String userSessionId) {
-        setUserSessionId_GreaterThan(userSessionId, null);
+    public void setRequestedAt_GreaterThan(LocalDateTime requestedAt) {
+        setRequestedAt_GreaterThan(requestedAt, null);
     }
 
-    public void setUserSessionId_GreaterThan(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = userSessionId;
-        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_GREATER_THAN, _value);
+    public void setRequestedAt_GreaterThan(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUserSessionId_LessThan(String userSessionId) {
-        setUserSessionId_LessThan(userSessionId, null);
+    public void setRequestedAt_LessThan(LocalDateTime requestedAt) {
+        setRequestedAt_LessThan(requestedAt, null);
     }
 
-    public void setUserSessionId_LessThan(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = userSessionId;
-        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_LESS_THAN, _value);
+    public void setRequestedAt_LessThan(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUserSessionId_GreaterEqual(String userSessionId) {
-        setUserSessionId_GreaterEqual(userSessionId, null);
+    public void setRequestedAt_GreaterEqual(LocalDateTime requestedAt) {
+        setRequestedAt_GreaterEqual(requestedAt, null);
     }
 
-    public void setUserSessionId_GreaterEqual(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = userSessionId;
-        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setRequestedAt_GreaterEqual(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUserSessionId_LessEqual(String userSessionId) {
-        setUserSessionId_LessEqual(userSessionId, null);
+    public void setRequestedAt_LessEqual(LocalDateTime requestedAt) {
+        setRequestedAt_LessEqual(requestedAt, null);
     }
 
-    public void setUserSessionId_LessEqual(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = userSessionId;
-        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setRequestedAt_LessEqual(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUserSessionId_Exists() {
-        setUserSessionId_Exists(null);
+    public void setRequestedAt_Exists() {
+        setRequestedAt_Exists(null);
     }
 
-    public void setUserSessionId_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("userSessionId");
+    public void setRequestedAt_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUserSessionId_CommonTerms(String userSessionId) {
-        setUserSessionId_CommonTerms(userSessionId, null);
+    public void setRequestedAt_CommonTerms(LocalDateTime requestedAt) {
+        setRequestedAt_CommonTerms(requestedAt, null);
     }
 
-    public void setUserSessionId_CommonTerms(String userSessionId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("userSessionId", userSessionId);
+    public void setRequestedAt_CommonTerms(LocalDateTime requestedAt, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("requestedAt", requestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsClickLogCQ addOrderBy_UserSessionId_Asc() {
-        regOBA("userSessionId");
+    public BsClickLogCQ addOrderBy_RequestedAt_Asc() {
+        regOBA("requestedAt");
         return this;
     }
 
-    public BsClickLogCQ addOrderBy_UserSessionId_Desc() {
-        regOBD("userSessionId");
+    public BsClickLogCQ addOrderBy_RequestedAt_Desc() {
+        regOBD("requestedAt");
         return this;
     }
 
@@ -1430,181 +1386,225 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setOrder_Equal(Integer order) {
-        setOrder_Term(order, null);
+    public void setUserSessionId_Equal(String userSessionId) {
+        setUserSessionId_Term(userSessionId, null);
     }
 
-    public void setOrder_Equal(Integer order, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setOrder_Term(order, opLambda);
+    public void setUserSessionId_Equal(String userSessionId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setUserSessionId_Term(userSessionId, opLambda);
     }
 
-    public void setOrder_Term(Integer order) {
-        setOrder_Term(order, null);
+    public void setUserSessionId_Term(String userSessionId) {
+        setUserSessionId_Term(userSessionId, null);
     }
 
-    public void setOrder_Term(Integer order, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("order", order);
+    public void setUserSessionId_Term(String userSessionId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOrder_NotEqual(Integer order) {
-        setOrder_NotTerm(order, null);
+    public void setUserSessionId_NotEqual(String userSessionId) {
+        setUserSessionId_NotTerm(userSessionId, null);
     }
 
-    public void setOrder_NotTerm(Integer order) {
-        setOrder_NotTerm(order, null);
+    public void setUserSessionId_NotTerm(String userSessionId) {
+        setUserSessionId_NotTerm(userSessionId, null);
     }
 
-    public void setOrder_NotEqual(Integer order, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setOrder_NotTerm(order, opLambda);
+    public void setUserSessionId_NotEqual(String userSessionId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUserSessionId_NotTerm(userSessionId, opLambda);
     }
 
-    public void setOrder_NotTerm(Integer order, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setOrder_Term(order), opLambda);
+    public void setUserSessionId_NotTerm(String userSessionId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUserSessionId_Term(userSessionId), opLambda);
     }
 
-    public void setOrder_Terms(Collection<Integer> orderList) {
-        setOrder_Terms(orderList, null);
+    public void setUserSessionId_Terms(Collection<String> userSessionIdList) {
+        setUserSessionId_Terms(userSessionIdList, null);
     }
 
-    public void setOrder_Terms(Collection<Integer> orderList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("order", orderList);
+    public void setUserSessionId_Terms(Collection<String> userSessionIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("userSessionId", userSessionIdList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOrder_InScope(Collection<Integer> orderList) {
-        setOrder_Terms(orderList, null);
+    public void setUserSessionId_InScope(Collection<String> userSessionIdList) {
+        setUserSessionId_Terms(userSessionIdList, null);
     }
 
-    public void setOrder_InScope(Collection<Integer> orderList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setOrder_Terms(orderList, opLambda);
+    public void setUserSessionId_InScope(Collection<String> userSessionIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setUserSessionId_Terms(userSessionIdList, opLambda);
     }
 
-    public void setOrder_Match(Integer order) {
-        setOrder_Match(order, null);
+    public void setUserSessionId_Match(String userSessionId) {
+        setUserSessionId_Match(userSessionId, null);
     }
 
-    public void setOrder_Match(Integer order, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("order", order);
+    public void setUserSessionId_Match(String userSessionId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOrder_MatchPhrase(Integer order) {
-        setOrder_MatchPhrase(order, null);
+    public void setUserSessionId_MatchPhrase(String userSessionId) {
+        setUserSessionId_MatchPhrase(userSessionId, null);
     }
 
-    public void setOrder_MatchPhrase(Integer order, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("order", order);
+    public void setUserSessionId_MatchPhrase(String userSessionId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOrder_MatchPhrasePrefix(Integer order) {
-        setOrder_MatchPhrasePrefix(order, null);
+    public void setUserSessionId_MatchPhrasePrefix(String userSessionId) {
+        setUserSessionId_MatchPhrasePrefix(userSessionId, null);
     }
 
-    public void setOrder_MatchPhrasePrefix(Integer order, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("order", order);
+    public void setUserSessionId_MatchPhrasePrefix(String userSessionId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOrder_Fuzzy(Integer order) {
-        setOrder_Fuzzy(order, null);
+    public void setUserSessionId_Fuzzy(String userSessionId) {
+        setUserSessionId_Fuzzy(userSessionId, null);
     }
 
-    public void setOrder_Fuzzy(Integer order, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("order", order);
+    public void setUserSessionId_Fuzzy(String userSessionId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOrder_GreaterThan(Integer order) {
-        setOrder_GreaterThan(order, null);
+    public void setUserSessionId_Prefix(String userSessionId) {
+        setUserSessionId_Prefix(userSessionId, null);
     }
 
-    public void setOrder_GreaterThan(Integer order, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = order;
-        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_GREATER_THAN, _value);
+    public void setUserSessionId_Prefix(String userSessionId, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOrder_LessThan(Integer order) {
-        setOrder_LessThan(order, null);
+    public void setUserSessionId_Wildcard(String userSessionId) {
+        setUserSessionId_Wildcard(userSessionId, null);
     }
 
-    public void setOrder_LessThan(Integer order, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = order;
-        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_LESS_THAN, _value);
+    public void setUserSessionId_Wildcard(String userSessionId, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOrder_GreaterEqual(Integer order) {
-        setOrder_GreaterEqual(order, null);
+    public void setUserSessionId_Regexp(String userSessionId) {
+        setUserSessionId_Regexp(userSessionId, null);
     }
 
-    public void setOrder_GreaterEqual(Integer order, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = order;
-        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setUserSessionId_Regexp(String userSessionId, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOrder_LessEqual(Integer order) {
-        setOrder_LessEqual(order, null);
+    public void setUserSessionId_SpanTerm(String userSessionId) {
+        setUserSessionId_SpanTerm("userSessionId", null);
     }
 
-    public void setOrder_LessEqual(Integer order, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = order;
-        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setUserSessionId_SpanTerm(String userSessionId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOrder_Exists() {
-        setOrder_Exists(null);
+    public void setUserSessionId_GreaterThan(String userSessionId) {
+        setUserSessionId_GreaterThan(userSessionId, null);
     }
 
-    public void setOrder_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("order");
+    public void setUserSessionId_GreaterThan(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = userSessionId;
+        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOrder_CommonTerms(Integer order) {
-        setOrder_CommonTerms(order, null);
+    public void setUserSessionId_LessThan(String userSessionId) {
+        setUserSessionId_LessThan(userSessionId, null);
     }
 
-    public void setOrder_CommonTerms(Integer order, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("order", order);
+    public void setUserSessionId_LessThan(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = userSessionId;
+        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsClickLogCQ addOrderBy_Order_Asc() {
-        regOBA("order");
+    public void setUserSessionId_GreaterEqual(String userSessionId) {
+        setUserSessionId_GreaterEqual(userSessionId, null);
+    }
+
+    public void setUserSessionId_GreaterEqual(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = userSessionId;
+        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserSessionId_LessEqual(String userSessionId) {
+        setUserSessionId_LessEqual(userSessionId, null);
+    }
+
+    public void setUserSessionId_LessEqual(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = userSessionId;
+        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserSessionId_Exists() {
+        setUserSessionId_Exists(null);
+    }
+
+    public void setUserSessionId_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("userSessionId");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserSessionId_CommonTerms(String userSessionId) {
+        setUserSessionId_CommonTerms(userSessionId, null);
+    }
+
+    public void setUserSessionId_CommonTerms(String userSessionId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("userSessionId", userSessionId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsClickLogCQ addOrderBy_UserSessionId_Asc() {
+        regOBA("userSessionId");
         return this;
     }
 
-    public BsClickLogCQ addOrderBy_Order_Desc() {
-        regOBD("order");
+    public BsClickLogCQ addOrderBy_UserSessionId_Desc() {
+        regOBD("userSessionId");
         return this;
     }
 
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 53e796fa40ab4cc25a730cca6c2b856f09361c66..aa35874fd1edde24e0f1656045375be89f6afd67 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
@@ -364,228 +364,6 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setUrl_Equal(String url) {
-        setUrl_Term(url, null);
-    }
-
-    public void setUrl_Equal(String url, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setUrl_Term(url, opLambda);
-    }
-
-    public void setUrl_Term(String url) {
-        setUrl_Term(url, null);
-    }
-
-    public void setUrl_Term(String url, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_NotEqual(String url) {
-        setUrl_NotTerm(url, null);
-    }
-
-    public void setUrl_NotTerm(String url) {
-        setUrl_NotTerm(url, null);
-    }
-
-    public void setUrl_NotEqual(String url, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setUrl_NotTerm(url, opLambda);
-    }
-
-    public void setUrl_NotTerm(String url, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setUrl_Term(url), opLambda);
-    }
-
-    public void setUrl_Terms(Collection<String> urlList) {
-        setUrl_Terms(urlList, null);
-    }
-
-    public void setUrl_Terms(Collection<String> urlList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("url", urlList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_InScope(Collection<String> urlList) {
-        setUrl_Terms(urlList, null);
-    }
-
-    public void setUrl_InScope(Collection<String> urlList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setUrl_Terms(urlList, opLambda);
-    }
-
-    public void setUrl_Match(String url) {
-        setUrl_Match(url, null);
-    }
-
-    public void setUrl_Match(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_MatchPhrase(String url) {
-        setUrl_MatchPhrase(url, null);
-    }
-
-    public void setUrl_MatchPhrase(String url, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_MatchPhrasePrefix(String url) {
-        setUrl_MatchPhrasePrefix(url, null);
-    }
-
-    public void setUrl_MatchPhrasePrefix(String url, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Fuzzy(String url) {
-        setUrl_Fuzzy(url, null);
-    }
-
-    public void setUrl_Fuzzy(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Prefix(String url) {
-        setUrl_Prefix(url, null);
-    }
-
-    public void setUrl_Prefix(String url, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Wildcard(String url) {
-        setUrl_Wildcard(url, null);
-    }
-
-    public void setUrl_Wildcard(String url, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Regexp(String url) {
-        setUrl_Regexp(url, null);
-    }
-
-    public void setUrl_Regexp(String url, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    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) {
-        final Object _value = url;
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_LessThan(String url) {
-        setUrl_LessThan(url, null);
-    }
-
-    public void setUrl_LessThan(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = url;
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_GreaterEqual(String url) {
-        setUrl_GreaterEqual(url, null);
-    }
-
-    public void setUrl_GreaterEqual(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = url;
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_LessEqual(String url) {
-        setUrl_LessEqual(url, null);
-    }
-
-    public void setUrl_LessEqual(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = url;
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Exists() {
-        setUrl_Exists(null);
-    }
-
-    public void setUrl_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("url");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_CommonTerms(String url) {
-        setUrl_CommonTerms(url, null);
-    }
-
-    public void setUrl_CommonTerms(String url, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsFavoriteLogCQ addOrderBy_Url_Asc() {
-        regOBA("url");
-        return this;
-    }
-
-    public BsFavoriteLogCQ addOrderBy_Url_Desc() {
-        regOBD("url");
-        return this;
-    }
-
     public void setDocId_Equal(String docId) {
         setDocId_Term(docId, null);
     }
@@ -1030,6 +808,228 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         return this;
     }
 
+    public void setUrl_Equal(String url) {
+        setUrl_Term(url, null);
+    }
+
+    public void setUrl_Equal(String url, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setUrl_Term(url, opLambda);
+    }
+
+    public void setUrl_Term(String url) {
+        setUrl_Term(url, null);
+    }
+
+    public void setUrl_Term(String url, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("url", url);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_NotEqual(String url) {
+        setUrl_NotTerm(url, null);
+    }
+
+    public void setUrl_NotTerm(String url) {
+        setUrl_NotTerm(url, null);
+    }
+
+    public void setUrl_NotEqual(String url, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUrl_NotTerm(url, opLambda);
+    }
+
+    public void setUrl_NotTerm(String url, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUrl_Term(url), opLambda);
+    }
+
+    public void setUrl_Terms(Collection<String> urlList) {
+        setUrl_Terms(urlList, null);
+    }
+
+    public void setUrl_Terms(Collection<String> urlList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("url", urlList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_InScope(Collection<String> urlList) {
+        setUrl_Terms(urlList, null);
+    }
+
+    public void setUrl_InScope(Collection<String> urlList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setUrl_Terms(urlList, opLambda);
+    }
+
+    public void setUrl_Match(String url) {
+        setUrl_Match(url, null);
+    }
+
+    public void setUrl_Match(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("url", url);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_MatchPhrase(String url) {
+        setUrl_MatchPhrase(url, null);
+    }
+
+    public void setUrl_MatchPhrase(String url, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("url", url);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_MatchPhrasePrefix(String url) {
+        setUrl_MatchPhrasePrefix(url, null);
+    }
+
+    public void setUrl_MatchPhrasePrefix(String url, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("url", url);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_Fuzzy(String url) {
+        setUrl_Fuzzy(url, null);
+    }
+
+    public void setUrl_Fuzzy(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("url", url);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_Prefix(String url) {
+        setUrl_Prefix(url, null);
+    }
+
+    public void setUrl_Prefix(String url, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("url", url);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_Wildcard(String url) {
+        setUrl_Wildcard(url, null);
+    }
+
+    public void setUrl_Wildcard(String url, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("url", url);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_Regexp(String url) {
+        setUrl_Regexp(url, null);
+    }
+
+    public void setUrl_Regexp(String url, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("url", url);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    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) {
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_LessThan(String url) {
+        setUrl_LessThan(url, null);
+    }
+
+    public void setUrl_LessThan(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_GreaterEqual(String url) {
+        setUrl_GreaterEqual(url, null);
+    }
+
+    public void setUrl_GreaterEqual(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_LessEqual(String url) {
+        setUrl_LessEqual(url, null);
+    }
+
+    public void setUrl_LessEqual(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_Exists() {
+        setUrl_Exists(null);
+    }
+
+    public void setUrl_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("url");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUrl_CommonTerms(String url) {
+        setUrl_CommonTerms(url, null);
+    }
+
+    public void setUrl_CommonTerms(String url, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("url", url);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsFavoriteLogCQ addOrderBy_Url_Asc() {
+        regOBA("url");
+        return this;
+    }
+
+    public BsFavoriteLogCQ addOrderBy_Url_Desc() {
+        regOBD("url");
+        return this;
+    }
+
     public void setUserInfoId_Equal(String userInfoId) {
         setUserInfoId_Term(userInfoId, null);
     }
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 45860b4f3586474cdf081c23f86a4af2a32959a0..44b1271776f7bf19e59029724afa1f3633ff1de0 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
@@ -407,1069 +407,847 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setUser_Equal(String user) {
-        setUser_Term(user, null);
+    public void setClientIp_Equal(String clientIp) {
+        setClientIp_Term(clientIp, null);
     }
 
-    public void setUser_Equal(String user, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setUser_Term(user, opLambda);
+    public void setClientIp_Equal(String clientIp, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setClientIp_Term(clientIp, opLambda);
     }
 
-    public void setUser_Term(String user) {
-        setUser_Term(user, null);
+    public void setClientIp_Term(String clientIp) {
+        setClientIp_Term(clientIp, null);
     }
 
-    public void setUser_Term(String user, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("user", user);
+    public void setClientIp_Term(String clientIp, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("clientIp", clientIp);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_NotEqual(String user) {
-        setUser_NotTerm(user, null);
+    public void setClientIp_NotEqual(String clientIp) {
+        setClientIp_NotTerm(clientIp, null);
     }
 
-    public void setUser_NotTerm(String user) {
-        setUser_NotTerm(user, null);
+    public void setClientIp_NotTerm(String clientIp) {
+        setClientIp_NotTerm(clientIp, null);
     }
 
-    public void setUser_NotEqual(String user, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setUser_NotTerm(user, opLambda);
+    public void setClientIp_NotEqual(String clientIp, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setClientIp_NotTerm(clientIp, opLambda);
     }
 
-    public void setUser_NotTerm(String user, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setUser_Term(user), opLambda);
+    public void setClientIp_NotTerm(String clientIp, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setClientIp_Term(clientIp), opLambda);
     }
 
-    public void setUser_Terms(Collection<String> userList) {
-        setUser_Terms(userList, null);
+    public void setClientIp_Terms(Collection<String> clientIpList) {
+        setClientIp_Terms(clientIpList, null);
     }
 
-    public void setUser_Terms(Collection<String> userList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("user", userList);
+    public void setClientIp_Terms(Collection<String> clientIpList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("clientIp", clientIpList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_InScope(Collection<String> userList) {
-        setUser_Terms(userList, null);
+    public void setClientIp_InScope(Collection<String> clientIpList) {
+        setClientIp_Terms(clientIpList, null);
     }
 
-    public void setUser_InScope(Collection<String> userList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setUser_Terms(userList, opLambda);
+    public void setClientIp_InScope(Collection<String> clientIpList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setClientIp_Terms(clientIpList, opLambda);
     }
 
-    public void setUser_Match(String user) {
-        setUser_Match(user, null);
+    public void setClientIp_Match(String clientIp) {
+        setClientIp_Match(clientIp, null);
     }
 
-    public void setUser_Match(String user, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("user", user);
+    public void setClientIp_Match(String clientIp, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("clientIp", clientIp);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_MatchPhrase(String user) {
-        setUser_MatchPhrase(user, null);
+    public void setClientIp_MatchPhrase(String clientIp) {
+        setClientIp_MatchPhrase(clientIp, null);
     }
 
-    public void setUser_MatchPhrase(String user, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("user", user);
+    public void setClientIp_MatchPhrase(String clientIp, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("clientIp", clientIp);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_MatchPhrasePrefix(String user) {
-        setUser_MatchPhrasePrefix(user, null);
+    public void setClientIp_MatchPhrasePrefix(String clientIp) {
+        setClientIp_MatchPhrasePrefix(clientIp, null);
     }
 
-    public void setUser_MatchPhrasePrefix(String user, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("user", user);
+    public void setClientIp_MatchPhrasePrefix(String clientIp, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("clientIp", clientIp);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_Fuzzy(String user) {
-        setUser_Fuzzy(user, null);
+    public void setClientIp_Fuzzy(String clientIp) {
+        setClientIp_Fuzzy(clientIp, null);
     }
 
-    public void setUser_Fuzzy(String user, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("user", user);
+    public void setClientIp_Fuzzy(String clientIp, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("clientIp", clientIp);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_Prefix(String user) {
-        setUser_Prefix(user, null);
+    public void setClientIp_Prefix(String clientIp) {
+        setClientIp_Prefix(clientIp, null);
     }
 
-    public void setUser_Prefix(String user, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("user", user);
+    public void setClientIp_Prefix(String clientIp, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("clientIp", clientIp);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_Wildcard(String user) {
-        setUser_Wildcard(user, null);
+    public void setClientIp_Wildcard(String clientIp) {
+        setClientIp_Wildcard(clientIp, null);
     }
 
-    public void setUser_Wildcard(String user, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("user", user);
+    public void setClientIp_Wildcard(String clientIp, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("clientIp", clientIp);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_Regexp(String user) {
-        setUser_Regexp(user, null);
+    public void setClientIp_Regexp(String clientIp) {
+        setClientIp_Regexp(clientIp, null);
     }
 
-    public void setUser_Regexp(String user, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("user", user);
+    public void setClientIp_Regexp(String clientIp, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("clientIp", clientIp);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_SpanTerm(String user) {
-        setUser_SpanTerm("user", null);
+    public void setClientIp_SpanTerm(String clientIp) {
+        setClientIp_SpanTerm("clientIp", null);
     }
 
-    public void setUser_SpanTerm(String user, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("user", user);
+    public void setClientIp_SpanTerm(String clientIp, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("clientIp", clientIp);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_GreaterThan(String user) {
-        setUser_GreaterThan(user, null);
+    public void setClientIp_GreaterThan(String clientIp) {
+        setClientIp_GreaterThan(clientIp, null);
     }
 
-    public void setUser_GreaterThan(String user, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = user;
-        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_GREATER_THAN, _value);
+    public void setClientIp_GreaterThan(String clientIp, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = clientIp;
+        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_LessThan(String user) {
-        setUser_LessThan(user, null);
+    public void setClientIp_LessThan(String clientIp) {
+        setClientIp_LessThan(clientIp, null);
     }
 
-    public void setUser_LessThan(String user, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = user;
-        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_LESS_THAN, _value);
+    public void setClientIp_LessThan(String clientIp, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = clientIp;
+        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_GreaterEqual(String user) {
-        setUser_GreaterEqual(user, null);
+    public void setClientIp_GreaterEqual(String clientIp) {
+        setClientIp_GreaterEqual(clientIp, null);
     }
 
-    public void setUser_GreaterEqual(String user, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = user;
-        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setClientIp_GreaterEqual(String clientIp, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = clientIp;
+        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_LessEqual(String user) {
-        setUser_LessEqual(user, null);
+    public void setClientIp_LessEqual(String clientIp) {
+        setClientIp_LessEqual(clientIp, null);
     }
 
-    public void setUser_LessEqual(String user, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = user;
-        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setClientIp_LessEqual(String clientIp, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = clientIp;
+        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_Exists() {
-        setUser_Exists(null);
+    public void setClientIp_Exists() {
+        setClientIp_Exists(null);
     }
 
-    public void setUser_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("user");
+    public void setClientIp_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("clientIp");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUser_CommonTerms(String user) {
-        setUser_CommonTerms(user, null);
+    public void setClientIp_CommonTerms(String clientIp) {
+        setClientIp_CommonTerms(clientIp, null);
     }
 
-    public void setUser_CommonTerms(String user, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("user", user);
+    public void setClientIp_CommonTerms(String clientIp, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("clientIp", clientIp);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsSearchLogCQ addOrderBy_User_Asc() {
-        regOBA("user");
+    public BsSearchLogCQ addOrderBy_ClientIp_Asc() {
+        regOBA("clientIp");
         return this;
     }
 
-    public BsSearchLogCQ addOrderBy_User_Desc() {
-        regOBD("user");
+    public BsSearchLogCQ addOrderBy_ClientIp_Desc() {
+        regOBD("clientIp");
         return this;
     }
 
-    public void setRoles_Equal(String roles) {
-        setRoles_Term(roles, null);
+    public void setHitCount_Equal(Long hitCount) {
+        setHitCount_Term(hitCount, null);
     }
 
-    public void setRoles_Equal(String roles, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setRoles_Term(roles, opLambda);
+    public void setHitCount_Equal(Long hitCount, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setHitCount_Term(hitCount, opLambda);
     }
 
-    public void setRoles_Term(String roles) {
-        setRoles_Term(roles, null);
+    public void setHitCount_Term(Long hitCount) {
+        setHitCount_Term(hitCount, null);
     }
 
-    public void setRoles_Term(String roles, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("roles", roles);
+    public void setHitCount_Term(Long hitCount, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("hitCount", hitCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_NotEqual(String roles) {
-        setRoles_NotTerm(roles, null);
+    public void setHitCount_NotEqual(Long hitCount) {
+        setHitCount_NotTerm(hitCount, null);
     }
 
-    public void setRoles_NotTerm(String roles) {
-        setRoles_NotTerm(roles, null);
+    public void setHitCount_NotTerm(Long hitCount) {
+        setHitCount_NotTerm(hitCount, null);
     }
 
-    public void setRoles_NotEqual(String roles, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setRoles_NotTerm(roles, opLambda);
+    public void setHitCount_NotEqual(Long hitCount, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setHitCount_NotTerm(hitCount, opLambda);
     }
 
-    public void setRoles_NotTerm(String roles, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setRoles_Term(roles), opLambda);
+    public void setHitCount_NotTerm(Long hitCount, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setHitCount_Term(hitCount), opLambda);
     }
 
-    public void setRoles_Terms(Collection<String> rolesList) {
-        setRoles_Terms(rolesList, null);
+    public void setHitCount_Terms(Collection<Long> hitCountList) {
+        setHitCount_Terms(hitCountList, null);
     }
 
-    public void setRoles_Terms(Collection<String> rolesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("roles", rolesList);
+    public void setHitCount_Terms(Collection<Long> hitCountList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("hitCount", hitCountList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_InScope(Collection<String> rolesList) {
-        setRoles_Terms(rolesList, null);
+    public void setHitCount_InScope(Collection<Long> hitCountList) {
+        setHitCount_Terms(hitCountList, null);
     }
 
-    public void setRoles_InScope(Collection<String> rolesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setRoles_Terms(rolesList, opLambda);
+    public void setHitCount_InScope(Collection<Long> hitCountList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setHitCount_Terms(hitCountList, opLambda);
     }
 
-    public void setRoles_Match(String roles) {
-        setRoles_Match(roles, null);
+    public void setHitCount_Match(Long hitCount) {
+        setHitCount_Match(hitCount, null);
     }
 
-    public void setRoles_Match(String roles, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("roles", roles);
+    public void setHitCount_Match(Long hitCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("hitCount", hitCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_MatchPhrase(String roles) {
-        setRoles_MatchPhrase(roles, null);
+    public void setHitCount_MatchPhrase(Long hitCount) {
+        setHitCount_MatchPhrase(hitCount, null);
     }
 
-    public void setRoles_MatchPhrase(String roles, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("roles", roles);
+    public void setHitCount_MatchPhrase(Long hitCount, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("hitCount", hitCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_MatchPhrasePrefix(String roles) {
-        setRoles_MatchPhrasePrefix(roles, null);
+    public void setHitCount_MatchPhrasePrefix(Long hitCount) {
+        setHitCount_MatchPhrasePrefix(hitCount, null);
     }
 
-    public void setRoles_MatchPhrasePrefix(String roles, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("roles", roles);
+    public void setHitCount_MatchPhrasePrefix(Long hitCount, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("hitCount", hitCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_Fuzzy(String roles) {
-        setRoles_Fuzzy(roles, null);
+    public void setHitCount_Fuzzy(Long hitCount) {
+        setHitCount_Fuzzy(hitCount, null);
     }
 
-    public void setRoles_Fuzzy(String roles, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("roles", roles);
+    public void setHitCount_Fuzzy(Long hitCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("hitCount", hitCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_Prefix(String roles) {
-        setRoles_Prefix(roles, null);
-    }
-
-    public void setRoles_Prefix(String roles, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("roles", roles);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoles_Wildcard(String roles) {
-        setRoles_Wildcard(roles, null);
+    public void setHitCount_GreaterThan(Long hitCount) {
+        setHitCount_GreaterThan(hitCount, null);
     }
 
-    public void setRoles_Wildcard(String roles, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("roles", roles);
+    public void setHitCount_GreaterThan(Long hitCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = hitCount;
+        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_Regexp(String roles) {
-        setRoles_Regexp(roles, null);
+    public void setHitCount_LessThan(Long hitCount) {
+        setHitCount_LessThan(hitCount, null);
     }
 
-    public void setRoles_Regexp(String roles, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("roles", roles);
+    public void setHitCount_LessThan(Long hitCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = hitCount;
+        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_SpanTerm(String roles) {
-        setRoles_SpanTerm("roles", null);
+    public void setHitCount_GreaterEqual(Long hitCount) {
+        setHitCount_GreaterEqual(hitCount, null);
     }
 
-    public void setRoles_SpanTerm(String roles, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("roles", roles);
+    public void setHitCount_GreaterEqual(Long hitCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = hitCount;
+        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_GreaterThan(String roles) {
-        setRoles_GreaterThan(roles, null);
+    public void setHitCount_LessEqual(Long hitCount) {
+        setHitCount_LessEqual(hitCount, null);
     }
 
-    public void setRoles_GreaterThan(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = roles;
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_THAN, _value);
+    public void setHitCount_LessEqual(Long hitCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = hitCount;
+        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_LessThan(String roles) {
-        setRoles_LessThan(roles, null);
+    public void setHitCount_Exists() {
+        setHitCount_Exists(null);
     }
 
-    public void setRoles_LessThan(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = roles;
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_THAN, _value);
+    public void setHitCount_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_GreaterEqual(String roles) {
-        setRoles_GreaterEqual(roles, null);
+    public void setHitCount_CommonTerms(Long hitCount) {
+        setHitCount_CommonTerms(hitCount, null);
     }
 
-    public void setRoles_GreaterEqual(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = roles;
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setHitCount_CommonTerms(Long hitCount, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("hitCount", hitCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_LessEqual(String roles) {
-        setRoles_LessEqual(roles, null);
+    public BsSearchLogCQ addOrderBy_HitCount_Asc() {
+        regOBA("hitCount");
+        return this;
     }
 
-    public void setRoles_LessEqual(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = roles;
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public BsSearchLogCQ addOrderBy_HitCount_Desc() {
+        regOBD("hitCount");
+        return this;
     }
 
-    public void setRoles_Exists() {
-        setRoles_Exists(null);
+    public void setLanguages_Equal(String languages) {
+        setLanguages_Term(languages, null);
     }
 
-    public void setRoles_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("roles");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setLanguages_Equal(String languages, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setLanguages_Term(languages, opLambda);
     }
 
-    public void setRoles_CommonTerms(String roles) {
-        setRoles_CommonTerms(roles, null);
+    public void setLanguages_Term(String languages) {
+        setLanguages_Term(languages, null);
     }
 
-    public void setRoles_CommonTerms(String roles, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("roles", roles);
+    public void setLanguages_Term(String languages, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("languages", languages);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsSearchLogCQ addOrderBy_Roles_Asc() {
-        regOBA("roles");
-        return this;
+    public void setLanguages_NotEqual(String languages) {
+        setLanguages_NotTerm(languages, null);
     }
 
-    public BsSearchLogCQ addOrderBy_Roles_Desc() {
-        regOBD("roles");
-        return this;
+    public void setLanguages_NotTerm(String languages) {
+        setLanguages_NotTerm(languages, null);
     }
 
-    public void setQueryId_Equal(String queryId) {
-        setQueryId_Term(queryId, null);
+    public void setLanguages_NotEqual(String languages, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setLanguages_NotTerm(languages, opLambda);
     }
 
-    public void setQueryId_Equal(String queryId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setQueryId_Term(queryId, opLambda);
+    public void setLanguages_NotTerm(String languages, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setLanguages_Term(languages), opLambda);
     }
 
-    public void setQueryId_Term(String queryId) {
-        setQueryId_Term(queryId, null);
+    public void setLanguages_Terms(Collection<String> languagesList) {
+        setLanguages_Terms(languagesList, null);
     }
 
-    public void setQueryId_Term(String queryId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("queryId", queryId);
+    public void setLanguages_Terms(Collection<String> languagesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("languages", languagesList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_NotEqual(String queryId) {
-        setQueryId_NotTerm(queryId, null);
-    }
-
-    public void setQueryId_NotTerm(String queryId) {
-        setQueryId_NotTerm(queryId, null);
-    }
-
-    public void setQueryId_NotEqual(String queryId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setQueryId_NotTerm(queryId, opLambda);
+    public void setLanguages_InScope(Collection<String> languagesList) {
+        setLanguages_Terms(languagesList, null);
     }
 
-    public void setQueryId_NotTerm(String queryId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setQueryId_Term(queryId), opLambda);
+    public void setLanguages_InScope(Collection<String> languagesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setLanguages_Terms(languagesList, opLambda);
     }
 
-    public void setQueryId_Terms(Collection<String> queryIdList) {
-        setQueryId_Terms(queryIdList, null);
+    public void setLanguages_Match(String languages) {
+        setLanguages_Match(languages, null);
     }
 
-    public void setQueryId_Terms(Collection<String> queryIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("queryId", queryIdList);
+    public void setLanguages_Match(String languages, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("languages", languages);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_InScope(Collection<String> queryIdList) {
-        setQueryId_Terms(queryIdList, null);
+    public void setLanguages_MatchPhrase(String languages) {
+        setLanguages_MatchPhrase(languages, null);
     }
 
-    public void setQueryId_InScope(Collection<String> queryIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setQueryId_Terms(queryIdList, opLambda);
+    public void setLanguages_MatchPhrase(String languages, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("languages", languages);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setQueryId_Match(String queryId) {
-        setQueryId_Match(queryId, null);
+    public void setLanguages_MatchPhrasePrefix(String languages) {
+        setLanguages_MatchPhrasePrefix(languages, null);
     }
 
-    public void setQueryId_Match(String queryId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("queryId", queryId);
+    public void setLanguages_MatchPhrasePrefix(String languages, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("languages", languages);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_MatchPhrase(String queryId) {
-        setQueryId_MatchPhrase(queryId, null);
+    public void setLanguages_Fuzzy(String languages) {
+        setLanguages_Fuzzy(languages, null);
     }
 
-    public void setQueryId_MatchPhrase(String queryId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryId", queryId);
+    public void setLanguages_Fuzzy(String languages, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("languages", languages);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_MatchPhrasePrefix(String queryId) {
-        setQueryId_MatchPhrasePrefix(queryId, null);
+    public void setLanguages_Prefix(String languages) {
+        setLanguages_Prefix(languages, null);
     }
 
-    public void setQueryId_MatchPhrasePrefix(String queryId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryId", queryId);
+    public void setLanguages_Prefix(String languages, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("languages", languages);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_Fuzzy(String queryId) {
-        setQueryId_Fuzzy(queryId, null);
+    public void setLanguages_Wildcard(String languages) {
+        setLanguages_Wildcard(languages, null);
     }
 
-    public void setQueryId_Fuzzy(String queryId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("queryId", queryId);
+    public void setLanguages_Wildcard(String languages, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("languages", languages);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_Prefix(String queryId) {
-        setQueryId_Prefix(queryId, null);
+    public void setLanguages_Regexp(String languages) {
+        setLanguages_Regexp(languages, null);
     }
 
-    public void setQueryId_Prefix(String queryId, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("queryId", queryId);
+    public void setLanguages_Regexp(String languages, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("languages", languages);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_Wildcard(String queryId) {
-        setQueryId_Wildcard(queryId, null);
+    public void setLanguages_SpanTerm(String languages) {
+        setLanguages_SpanTerm("languages", null);
     }
 
-    public void setQueryId_Wildcard(String queryId, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("queryId", queryId);
+    public void setLanguages_SpanTerm(String languages, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("languages", languages);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_Regexp(String queryId) {
-        setQueryId_Regexp(queryId, null);
+    public void setLanguages_GreaterThan(String languages) {
+        setLanguages_GreaterThan(languages, null);
     }
 
-    public void setQueryId_Regexp(String queryId, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("queryId", queryId);
+    public void setLanguages_GreaterThan(String languages, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = languages;
+        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_SpanTerm(String queryId) {
-        setQueryId_SpanTerm("queryId", null);
+    public void setLanguages_LessThan(String languages) {
+        setLanguages_LessThan(languages, null);
     }
 
-    public void setQueryId_SpanTerm(String queryId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("queryId", queryId);
+    public void setLanguages_LessThan(String languages, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = languages;
+        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_GreaterThan(String queryId) {
-        setQueryId_GreaterThan(queryId, null);
+    public void setLanguages_GreaterEqual(String languages) {
+        setLanguages_GreaterEqual(languages, null);
     }
 
-    public void setQueryId_GreaterThan(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queryId;
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_THAN, _value);
+    public void setLanguages_GreaterEqual(String languages, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = languages;
+        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_LessThan(String queryId) {
-        setQueryId_LessThan(queryId, null);
+    public void setLanguages_LessEqual(String languages) {
+        setLanguages_LessEqual(languages, null);
     }
 
-    public void setQueryId_LessThan(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queryId;
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_THAN, _value);
+    public void setLanguages_LessEqual(String languages, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = languages;
+        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_GreaterEqual(String queryId) {
-        setQueryId_GreaterEqual(queryId, null);
+    public void setLanguages_Exists() {
+        setLanguages_Exists(null);
     }
 
-    public void setQueryId_GreaterEqual(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queryId;
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setLanguages_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("languages");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryId_LessEqual(String queryId) {
-        setQueryId_LessEqual(queryId, null);
-    }
-
-    public void setQueryId_LessEqual(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queryId;
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryId_Exists() {
-        setQueryId_Exists(null);
-    }
-
-    public void setQueryId_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("queryId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryId_CommonTerms(String queryId) {
-        setQueryId_CommonTerms(queryId, null);
+    public void setLanguages_CommonTerms(String languages) {
+        setLanguages_CommonTerms(languages, null);
     }
 
-    public void setQueryId_CommonTerms(String queryId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("queryId", queryId);
+    public void setLanguages_CommonTerms(String languages, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("languages", languages);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsSearchLogCQ addOrderBy_QueryId_Asc() {
-        regOBA("queryId");
+    public BsSearchLogCQ addOrderBy_Languages_Asc() {
+        regOBA("languages");
         return this;
     }
 
-    public BsSearchLogCQ addOrderBy_QueryId_Desc() {
-        regOBD("queryId");
+    public BsSearchLogCQ addOrderBy_Languages_Desc() {
+        regOBD("languages");
         return this;
     }
 
-    public void setClientIp_Equal(String clientIp) {
-        setClientIp_Term(clientIp, null);
-    }
-
-    public void setClientIp_Equal(String clientIp, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setClientIp_Term(clientIp, opLambda);
-    }
-
-    public void setClientIp_Term(String clientIp) {
-        setClientIp_Term(clientIp, null);
-    }
-
-    public void setClientIp_Term(String clientIp, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("clientIp", clientIp);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_NotEqual(String clientIp) {
-        setClientIp_NotTerm(clientIp, null);
-    }
-
-    public void setClientIp_NotTerm(String clientIp) {
-        setClientIp_NotTerm(clientIp, null);
-    }
-
-    public void setClientIp_NotEqual(String clientIp, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setClientIp_NotTerm(clientIp, opLambda);
-    }
-
-    public void setClientIp_NotTerm(String clientIp, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setClientIp_Term(clientIp), opLambda);
-    }
-
-    public void setClientIp_Terms(Collection<String> clientIpList) {
-        setClientIp_Terms(clientIpList, null);
-    }
-
-    public void setClientIp_Terms(Collection<String> clientIpList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("clientIp", clientIpList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_InScope(Collection<String> clientIpList) {
-        setClientIp_Terms(clientIpList, null);
-    }
-
-    public void setClientIp_InScope(Collection<String> clientIpList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setClientIp_Terms(clientIpList, opLambda);
-    }
-
-    public void setClientIp_Match(String clientIp) {
-        setClientIp_Match(clientIp, null);
-    }
-
-    public void setClientIp_Match(String clientIp, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("clientIp", clientIp);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_MatchPhrase(String clientIp) {
-        setClientIp_MatchPhrase(clientIp, null);
-    }
-
-    public void setClientIp_MatchPhrase(String clientIp, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("clientIp", clientIp);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_MatchPhrasePrefix(String clientIp) {
-        setClientIp_MatchPhrasePrefix(clientIp, null);
-    }
-
-    public void setClientIp_MatchPhrasePrefix(String clientIp, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("clientIp", clientIp);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_Fuzzy(String clientIp) {
-        setClientIp_Fuzzy(clientIp, null);
-    }
-
-    public void setClientIp_Fuzzy(String clientIp, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("clientIp", clientIp);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_Prefix(String clientIp) {
-        setClientIp_Prefix(clientIp, null);
-    }
-
-    public void setClientIp_Prefix(String clientIp, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("clientIp", clientIp);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_Wildcard(String clientIp) {
-        setClientIp_Wildcard(clientIp, null);
-    }
-
-    public void setClientIp_Wildcard(String clientIp, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("clientIp", clientIp);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_Regexp(String clientIp) {
-        setClientIp_Regexp(clientIp, null);
+    public void setQueryId_Equal(String queryId) {
+        setQueryId_Term(queryId, null);
     }
 
-    public void setClientIp_Regexp(String clientIp, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("clientIp", clientIp);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryId_Equal(String queryId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setQueryId_Term(queryId, opLambda);
     }
 
-    public void setClientIp_SpanTerm(String clientIp) {
-        setClientIp_SpanTerm("clientIp", null);
+    public void setQueryId_Term(String queryId) {
+        setQueryId_Term(queryId, null);
     }
 
-    public void setClientIp_SpanTerm(String clientIp, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("clientIp", clientIp);
+    public void setQueryId_Term(String queryId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setClientIp_GreaterThan(String clientIp) {
-        setClientIp_GreaterThan(clientIp, null);
+    public void setQueryId_NotEqual(String queryId) {
+        setQueryId_NotTerm(queryId, null);
     }
 
-    public void setClientIp_GreaterThan(String clientIp, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = clientIp;
-        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_GREATER_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryId_NotTerm(String queryId) {
+        setQueryId_NotTerm(queryId, null);
     }
 
-    public void setClientIp_LessThan(String clientIp) {
-        setClientIp_LessThan(clientIp, null);
+    public void setQueryId_NotEqual(String queryId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setQueryId_NotTerm(queryId, opLambda);
     }
 
-    public void setClientIp_LessThan(String clientIp, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = clientIp;
-        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_LESS_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryId_NotTerm(String queryId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setQueryId_Term(queryId), opLambda);
     }
 
-    public void setClientIp_GreaterEqual(String clientIp) {
-        setClientIp_GreaterEqual(clientIp, null);
+    public void setQueryId_Terms(Collection<String> queryIdList) {
+        setQueryId_Terms(queryIdList, null);
     }
 
-    public void setClientIp_GreaterEqual(String clientIp, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = clientIp;
-        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setQueryId_Terms(Collection<String> queryIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("queryId", queryIdList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setClientIp_LessEqual(String clientIp) {
-        setClientIp_LessEqual(clientIp, null);
+    public void setQueryId_InScope(Collection<String> queryIdList) {
+        setQueryId_Terms(queryIdList, null);
     }
 
-    public void setClientIp_LessEqual(String clientIp, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = clientIp;
-        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryId_InScope(Collection<String> queryIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setQueryId_Terms(queryIdList, opLambda);
     }
 
-    public void setClientIp_Exists() {
-        setClientIp_Exists(null);
+    public void setQueryId_Match(String queryId) {
+        setQueryId_Match(queryId, null);
     }
 
-    public void setClientIp_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("clientIp");
+    public void setQueryId_Match(String queryId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setClientIp_CommonTerms(String clientIp) {
-        setClientIp_CommonTerms(clientIp, null);
+    public void setQueryId_MatchPhrase(String queryId) {
+        setQueryId_MatchPhrase(queryId, null);
     }
 
-    public void setClientIp_CommonTerms(String clientIp, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("clientIp", clientIp);
+    public void setQueryId_MatchPhrase(String queryId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsSearchLogCQ addOrderBy_ClientIp_Asc() {
-        regOBA("clientIp");
-        return this;
-    }
-
-    public BsSearchLogCQ addOrderBy_ClientIp_Desc() {
-        regOBD("clientIp");
-        return this;
-    }
-
-    public void setHitCount_Equal(Long hitCount) {
-        setHitCount_Term(hitCount, null);
-    }
-
-    public void setHitCount_Equal(Long hitCount, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setHitCount_Term(hitCount, opLambda);
-    }
-
-    public void setHitCount_Term(Long hitCount) {
-        setHitCount_Term(hitCount, null);
+    public void setQueryId_MatchPhrasePrefix(String queryId) {
+        setQueryId_MatchPhrasePrefix(queryId, null);
     }
 
-    public void setHitCount_Term(Long hitCount, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("hitCount", hitCount);
+    public void setQueryId_MatchPhrasePrefix(String queryId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHitCount_NotEqual(Long hitCount) {
-        setHitCount_NotTerm(hitCount, null);
-    }
-
-    public void setHitCount_NotTerm(Long hitCount) {
-        setHitCount_NotTerm(hitCount, null);
-    }
-
-    public void setHitCount_NotEqual(Long hitCount, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setHitCount_NotTerm(hitCount, opLambda);
-    }
-
-    public void setHitCount_NotTerm(Long hitCount, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setHitCount_Term(hitCount), opLambda);
-    }
-
-    public void setHitCount_Terms(Collection<Long> hitCountList) {
-        setHitCount_Terms(hitCountList, null);
+    public void setQueryId_Fuzzy(String queryId) {
+        setQueryId_Fuzzy(queryId, null);
     }
 
-    public void setHitCount_Terms(Collection<Long> hitCountList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("hitCount", hitCountList);
+    public void setQueryId_Fuzzy(String queryId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHitCount_InScope(Collection<Long> hitCountList) {
-        setHitCount_Terms(hitCountList, null);
-    }
-
-    public void setHitCount_InScope(Collection<Long> hitCountList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setHitCount_Terms(hitCountList, opLambda);
-    }
-
-    public void setHitCount_Match(Long hitCount) {
-        setHitCount_Match(hitCount, null);
+    public void setQueryId_Prefix(String queryId) {
+        setQueryId_Prefix(queryId, null);
     }
 
-    public void setHitCount_Match(Long hitCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("hitCount", hitCount);
+    public void setQueryId_Prefix(String queryId, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHitCount_MatchPhrase(Long hitCount) {
-        setHitCount_MatchPhrase(hitCount, null);
+    public void setQueryId_Wildcard(String queryId) {
+        setQueryId_Wildcard(queryId, null);
     }
 
-    public void setHitCount_MatchPhrase(Long hitCount, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("hitCount", hitCount);
+    public void setQueryId_Wildcard(String queryId, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHitCount_MatchPhrasePrefix(Long hitCount) {
-        setHitCount_MatchPhrasePrefix(hitCount, null);
+    public void setQueryId_Regexp(String queryId) {
+        setQueryId_Regexp(queryId, null);
     }
 
-    public void setHitCount_MatchPhrasePrefix(Long hitCount, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("hitCount", hitCount);
+    public void setQueryId_Regexp(String queryId, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHitCount_Fuzzy(Long hitCount) {
-        setHitCount_Fuzzy(hitCount, null);
+    public void setQueryId_SpanTerm(String queryId) {
+        setQueryId_SpanTerm("queryId", null);
     }
 
-    public void setHitCount_Fuzzy(Long hitCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("hitCount", hitCount);
+    public void setQueryId_SpanTerm(String queryId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHitCount_GreaterThan(Long hitCount) {
-        setHitCount_GreaterThan(hitCount, null);
+    public void setQueryId_GreaterThan(String queryId) {
+        setQueryId_GreaterThan(queryId, null);
     }
 
-    public void setHitCount_GreaterThan(Long hitCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = hitCount;
-        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_GREATER_THAN, _value);
+    public void setQueryId_GreaterThan(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHitCount_LessThan(Long hitCount) {
-        setHitCount_LessThan(hitCount, null);
+    public void setQueryId_LessThan(String queryId) {
+        setQueryId_LessThan(queryId, null);
     }
 
-    public void setHitCount_LessThan(Long hitCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = hitCount;
-        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_LESS_THAN, _value);
+    public void setQueryId_LessThan(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHitCount_GreaterEqual(Long hitCount) {
-        setHitCount_GreaterEqual(hitCount, null);
+    public void setQueryId_GreaterEqual(String queryId) {
+        setQueryId_GreaterEqual(queryId, null);
     }
 
-    public void setHitCount_GreaterEqual(Long hitCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = hitCount;
-        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setQueryId_GreaterEqual(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHitCount_LessEqual(Long hitCount) {
-        setHitCount_LessEqual(hitCount, null);
+    public void setQueryId_LessEqual(String queryId) {
+        setQueryId_LessEqual(queryId, null);
     }
 
-    public void setHitCount_LessEqual(Long hitCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = hitCount;
-        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setQueryId_LessEqual(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHitCount_Exists() {
-        setHitCount_Exists(null);
+    public void setQueryId_Exists() {
+        setQueryId_Exists(null);
     }
 
-    public void setHitCount_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("hitCount");
+    public void setQueryId_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHitCount_CommonTerms(Long hitCount) {
-        setHitCount_CommonTerms(hitCount, null);
+    public void setQueryId_CommonTerms(String queryId) {
+        setQueryId_CommonTerms(queryId, null);
     }
 
-    public void setHitCount_CommonTerms(Long hitCount, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("hitCount", hitCount);
+    public void setQueryId_CommonTerms(String queryId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsSearchLogCQ addOrderBy_HitCount_Asc() {
-        regOBA("hitCount");
+    public BsSearchLogCQ addOrderBy_QueryId_Asc() {
+        regOBA("queryId");
         return this;
     }
 
-    public BsSearchLogCQ addOrderBy_HitCount_Desc() {
-        regOBD("hitCount");
+    public BsSearchLogCQ addOrderBy_QueryId_Desc() {
+        regOBD("queryId");
         return this;
     }
 
@@ -1701,131 +1479,309 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryPageSize_Terms(queryPageSizeList, null);
     }
 
-    public void setQueryPageSize_InScope(Collection<Integer> queryPageSizeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setQueryPageSize_Terms(queryPageSizeList, opLambda);
+    public void setQueryPageSize_InScope(Collection<Integer> queryPageSizeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setQueryPageSize_Terms(queryPageSizeList, opLambda);
+    }
+
+    public void setQueryPageSize_Match(Integer queryPageSize) {
+        setQueryPageSize_Match(queryPageSize, null);
+    }
+
+    public void setQueryPageSize_Match(Integer queryPageSize, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("queryPageSize", queryPageSize);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryPageSize_MatchPhrase(Integer queryPageSize) {
+        setQueryPageSize_MatchPhrase(queryPageSize, null);
+    }
+
+    public void setQueryPageSize_MatchPhrase(Integer queryPageSize, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryPageSize", queryPageSize);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryPageSize_MatchPhrasePrefix(Integer queryPageSize) {
+        setQueryPageSize_MatchPhrasePrefix(queryPageSize, null);
+    }
+
+    public void setQueryPageSize_MatchPhrasePrefix(Integer queryPageSize, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryPageSize", queryPageSize);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryPageSize_Fuzzy(Integer queryPageSize) {
+        setQueryPageSize_Fuzzy(queryPageSize, null);
+    }
+
+    public void setQueryPageSize_Fuzzy(Integer queryPageSize, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("queryPageSize", queryPageSize);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryPageSize_GreaterThan(Integer queryPageSize) {
+        setQueryPageSize_GreaterThan(queryPageSize, null);
+    }
+
+    public void setQueryPageSize_GreaterThan(Integer queryPageSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queryPageSize;
+        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryPageSize_LessThan(Integer queryPageSize) {
+        setQueryPageSize_LessThan(queryPageSize, null);
+    }
+
+    public void setQueryPageSize_LessThan(Integer queryPageSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queryPageSize;
+        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryPageSize_GreaterEqual(Integer queryPageSize) {
+        setQueryPageSize_GreaterEqual(queryPageSize, null);
+    }
+
+    public void setQueryPageSize_GreaterEqual(Integer queryPageSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queryPageSize;
+        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryPageSize_LessEqual(Integer queryPageSize) {
+        setQueryPageSize_LessEqual(queryPageSize, null);
+    }
+
+    public void setQueryPageSize_LessEqual(Integer queryPageSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queryPageSize;
+        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryPageSize_Exists() {
+        setQueryPageSize_Exists(null);
+    }
+
+    public void setQueryPageSize_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("queryPageSize");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryPageSize_CommonTerms(Integer queryPageSize) {
+        setQueryPageSize_CommonTerms(queryPageSize, null);
+    }
+
+    public void setQueryPageSize_CommonTerms(Integer queryPageSize, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("queryPageSize", queryPageSize);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsSearchLogCQ addOrderBy_QueryPageSize_Asc() {
+        regOBA("queryPageSize");
+        return this;
+    }
+
+    public BsSearchLogCQ addOrderBy_QueryPageSize_Desc() {
+        regOBD("queryPageSize");
+        return this;
+    }
+
+    public void setQueryTime_Equal(Long queryTime) {
+        setQueryTime_Term(queryTime, null);
+    }
+
+    public void setQueryTime_Equal(Long queryTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setQueryTime_Term(queryTime, opLambda);
+    }
+
+    public void setQueryTime_Term(Long queryTime) {
+        setQueryTime_Term(queryTime, null);
+    }
+
+    public void setQueryTime_Term(Long queryTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("queryTime", queryTime);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryTime_NotEqual(Long queryTime) {
+        setQueryTime_NotTerm(queryTime, null);
+    }
+
+    public void setQueryTime_NotTerm(Long queryTime) {
+        setQueryTime_NotTerm(queryTime, null);
+    }
+
+    public void setQueryTime_NotEqual(Long queryTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setQueryTime_NotTerm(queryTime, opLambda);
+    }
+
+    public void setQueryTime_NotTerm(Long queryTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setQueryTime_Term(queryTime), opLambda);
+    }
+
+    public void setQueryTime_Terms(Collection<Long> queryTimeList) {
+        setQueryTime_Terms(queryTimeList, null);
+    }
+
+    public void setQueryTime_Terms(Collection<Long> queryTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("queryTime", queryTimeList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setQueryTime_InScope(Collection<Long> queryTimeList) {
+        setQueryTime_Terms(queryTimeList, null);
+    }
+
+    public void setQueryTime_InScope(Collection<Long> queryTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setQueryTime_Terms(queryTimeList, opLambda);
     }
 
-    public void setQueryPageSize_Match(Integer queryPageSize) {
-        setQueryPageSize_Match(queryPageSize, null);
+    public void setQueryTime_Match(Long queryTime) {
+        setQueryTime_Match(queryTime, null);
     }
 
-    public void setQueryPageSize_Match(Integer queryPageSize, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("queryPageSize", queryPageSize);
+    public void setQueryTime_Match(Long queryTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("queryTime", queryTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryPageSize_MatchPhrase(Integer queryPageSize) {
-        setQueryPageSize_MatchPhrase(queryPageSize, null);
+    public void setQueryTime_MatchPhrase(Long queryTime) {
+        setQueryTime_MatchPhrase(queryTime, null);
     }
 
-    public void setQueryPageSize_MatchPhrase(Integer queryPageSize, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryPageSize", queryPageSize);
+    public void setQueryTime_MatchPhrase(Long queryTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryTime", queryTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryPageSize_MatchPhrasePrefix(Integer queryPageSize) {
-        setQueryPageSize_MatchPhrasePrefix(queryPageSize, null);
+    public void setQueryTime_MatchPhrasePrefix(Long queryTime) {
+        setQueryTime_MatchPhrasePrefix(queryTime, null);
     }
 
-    public void setQueryPageSize_MatchPhrasePrefix(Integer queryPageSize, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryPageSize", queryPageSize);
+    public void setQueryTime_MatchPhrasePrefix(Long queryTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryTime", queryTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryPageSize_Fuzzy(Integer queryPageSize) {
-        setQueryPageSize_Fuzzy(queryPageSize, null);
+    public void setQueryTime_Fuzzy(Long queryTime) {
+        setQueryTime_Fuzzy(queryTime, null);
     }
 
-    public void setQueryPageSize_Fuzzy(Integer queryPageSize, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("queryPageSize", queryPageSize);
+    public void setQueryTime_Fuzzy(Long queryTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("queryTime", queryTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryPageSize_GreaterThan(Integer queryPageSize) {
-        setQueryPageSize_GreaterThan(queryPageSize, null);
+    public void setQueryTime_GreaterThan(Long queryTime) {
+        setQueryTime_GreaterThan(queryTime, null);
     }
 
-    public void setQueryPageSize_GreaterThan(Integer queryPageSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queryPageSize;
-        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_GREATER_THAN, _value);
+    public void setQueryTime_GreaterThan(Long queryTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queryTime;
+        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryPageSize_LessThan(Integer queryPageSize) {
-        setQueryPageSize_LessThan(queryPageSize, null);
+    public void setQueryTime_LessThan(Long queryTime) {
+        setQueryTime_LessThan(queryTime, null);
     }
 
-    public void setQueryPageSize_LessThan(Integer queryPageSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queryPageSize;
-        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_LESS_THAN, _value);
+    public void setQueryTime_LessThan(Long queryTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queryTime;
+        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryPageSize_GreaterEqual(Integer queryPageSize) {
-        setQueryPageSize_GreaterEqual(queryPageSize, null);
+    public void setQueryTime_GreaterEqual(Long queryTime) {
+        setQueryTime_GreaterEqual(queryTime, null);
     }
 
-    public void setQueryPageSize_GreaterEqual(Integer queryPageSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queryPageSize;
-        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setQueryTime_GreaterEqual(Long queryTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queryTime;
+        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryPageSize_LessEqual(Integer queryPageSize) {
-        setQueryPageSize_LessEqual(queryPageSize, null);
+    public void setQueryTime_LessEqual(Long queryTime) {
+        setQueryTime_LessEqual(queryTime, null);
     }
 
-    public void setQueryPageSize_LessEqual(Integer queryPageSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queryPageSize;
-        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setQueryTime_LessEqual(Long queryTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = queryTime;
+        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryPageSize_Exists() {
-        setQueryPageSize_Exists(null);
+    public void setQueryTime_Exists() {
+        setQueryTime_Exists(null);
     }
 
-    public void setQueryPageSize_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("queryPageSize");
+    public void setQueryTime_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryPageSize_CommonTerms(Integer queryPageSize) {
-        setQueryPageSize_CommonTerms(queryPageSize, null);
+    public void setQueryTime_CommonTerms(Long queryTime) {
+        setQueryTime_CommonTerms(queryTime, null);
     }
 
-    public void setQueryPageSize_CommonTerms(Integer queryPageSize, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("queryPageSize", queryPageSize);
+    public void setQueryTime_CommonTerms(Long queryTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("queryTime", queryTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsSearchLogCQ addOrderBy_QueryPageSize_Asc() {
-        regOBA("queryPageSize");
+    public BsSearchLogCQ addOrderBy_QueryTime_Asc() {
+        regOBA("queryTime");
         return this;
     }
 
-    public BsSearchLogCQ addOrderBy_QueryPageSize_Desc() {
-        regOBD("queryPageSize");
+    public BsSearchLogCQ addOrderBy_QueryTime_Desc() {
+        regOBD("queryTime");
         return this;
     }
 
@@ -2407,181 +2363,225 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setQueryTime_Equal(Long queryTime) {
-        setQueryTime_Term(queryTime, null);
+    public void setRoles_Equal(String roles) {
+        setRoles_Term(roles, null);
     }
 
-    public void setQueryTime_Equal(Long queryTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setQueryTime_Term(queryTime, opLambda);
+    public void setRoles_Equal(String roles, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setRoles_Term(roles, opLambda);
     }
 
-    public void setQueryTime_Term(Long queryTime) {
-        setQueryTime_Term(queryTime, null);
+    public void setRoles_Term(String roles) {
+        setRoles_Term(roles, null);
     }
 
-    public void setQueryTime_Term(Long queryTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("queryTime", queryTime);
+    public void setRoles_Term(String roles, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_NotEqual(Long queryTime) {
-        setQueryTime_NotTerm(queryTime, null);
+    public void setRoles_NotEqual(String roles) {
+        setRoles_NotTerm(roles, null);
     }
 
-    public void setQueryTime_NotTerm(Long queryTime) {
-        setQueryTime_NotTerm(queryTime, null);
+    public void setRoles_NotTerm(String roles) {
+        setRoles_NotTerm(roles, null);
     }
 
-    public void setQueryTime_NotEqual(Long queryTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setQueryTime_NotTerm(queryTime, opLambda);
+    public void setRoles_NotEqual(String roles, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setRoles_NotTerm(roles, opLambda);
     }
 
-    public void setQueryTime_NotTerm(Long queryTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setQueryTime_Term(queryTime), opLambda);
+    public void setRoles_NotTerm(String roles, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setRoles_Term(roles), opLambda);
     }
 
-    public void setQueryTime_Terms(Collection<Long> queryTimeList) {
-        setQueryTime_Terms(queryTimeList, null);
+    public void setRoles_Terms(Collection<String> rolesList) {
+        setRoles_Terms(rolesList, null);
     }
 
-    public void setQueryTime_Terms(Collection<Long> queryTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("queryTime", queryTimeList);
+    public void setRoles_Terms(Collection<String> rolesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("roles", rolesList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_InScope(Collection<Long> queryTimeList) {
-        setQueryTime_Terms(queryTimeList, null);
+    public void setRoles_InScope(Collection<String> rolesList) {
+        setRoles_Terms(rolesList, null);
     }
 
-    public void setQueryTime_InScope(Collection<Long> queryTimeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setQueryTime_Terms(queryTimeList, opLambda);
+    public void setRoles_InScope(Collection<String> rolesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setRoles_Terms(rolesList, opLambda);
     }
 
-    public void setQueryTime_Match(Long queryTime) {
-        setQueryTime_Match(queryTime, null);
+    public void setRoles_Match(String roles) {
+        setRoles_Match(roles, null);
     }
 
-    public void setQueryTime_Match(Long queryTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("queryTime", queryTime);
+    public void setRoles_Match(String roles, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_MatchPhrase(Long queryTime) {
-        setQueryTime_MatchPhrase(queryTime, null);
+    public void setRoles_MatchPhrase(String roles) {
+        setRoles_MatchPhrase(roles, null);
     }
 
-    public void setQueryTime_MatchPhrase(Long queryTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryTime", queryTime);
+    public void setRoles_MatchPhrase(String roles, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_MatchPhrasePrefix(Long queryTime) {
-        setQueryTime_MatchPhrasePrefix(queryTime, null);
+    public void setRoles_MatchPhrasePrefix(String roles) {
+        setRoles_MatchPhrasePrefix(roles, null);
     }
 
-    public void setQueryTime_MatchPhrasePrefix(Long queryTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryTime", queryTime);
+    public void setRoles_MatchPhrasePrefix(String roles, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_Fuzzy(Long queryTime) {
-        setQueryTime_Fuzzy(queryTime, null);
+    public void setRoles_Fuzzy(String roles) {
+        setRoles_Fuzzy(roles, null);
     }
 
-    public void setQueryTime_Fuzzy(Long queryTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("queryTime", queryTime);
+    public void setRoles_Fuzzy(String roles, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_GreaterThan(Long queryTime) {
-        setQueryTime_GreaterThan(queryTime, null);
+    public void setRoles_Prefix(String roles) {
+        setRoles_Prefix(roles, null);
     }
 
-    public void setQueryTime_GreaterThan(Long queryTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queryTime;
-        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_GREATER_THAN, _value);
+    public void setRoles_Prefix(String roles, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_LessThan(Long queryTime) {
-        setQueryTime_LessThan(queryTime, null);
+    public void setRoles_Wildcard(String roles) {
+        setRoles_Wildcard(roles, null);
     }
 
-    public void setQueryTime_LessThan(Long queryTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queryTime;
-        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_LESS_THAN, _value);
+    public void setRoles_Wildcard(String roles, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_GreaterEqual(Long queryTime) {
-        setQueryTime_GreaterEqual(queryTime, null);
+    public void setRoles_Regexp(String roles) {
+        setRoles_Regexp(roles, null);
     }
 
-    public void setQueryTime_GreaterEqual(Long queryTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queryTime;
-        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setRoles_Regexp(String roles, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("roles", roles);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    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) {
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setRoles_LessThan(String roles) {
+        setRoles_LessThan(roles, null);
+    }
+
+    public void setRoles_LessThan(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setRoles_GreaterEqual(String roles) {
+        setRoles_GreaterEqual(roles, null);
+    }
+
+    public void setRoles_GreaterEqual(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_LessEqual(Long queryTime) {
-        setQueryTime_LessEqual(queryTime, null);
+    public void setRoles_LessEqual(String roles) {
+        setRoles_LessEqual(roles, null);
     }
 
-    public void setQueryTime_LessEqual(Long queryTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = queryTime;
-        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setRoles_LessEqual(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_Exists() {
-        setQueryTime_Exists(null);
+    public void setRoles_Exists() {
+        setRoles_Exists(null);
     }
 
-    public void setQueryTime_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("queryTime");
+    public void setRoles_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setQueryTime_CommonTerms(Long queryTime) {
-        setQueryTime_CommonTerms(queryTime, null);
+    public void setRoles_CommonTerms(String roles) {
+        setRoles_CommonTerms(roles, null);
     }
 
-    public void setQueryTime_CommonTerms(Long queryTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("queryTime", queryTime);
+    public void setRoles_CommonTerms(String roles, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsSearchLogCQ addOrderBy_QueryTime_Asc() {
-        regOBA("queryTime");
+    public BsSearchLogCQ addOrderBy_Roles_Asc() {
+        regOBA("roles");
         return this;
     }
 
-    public BsSearchLogCQ addOrderBy_QueryTime_Desc() {
-        regOBD("queryTime");
+    public BsSearchLogCQ addOrderBy_Roles_Desc() {
+        regOBD("roles");
         return this;
     }
 
@@ -2763,47 +2763,269 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public void setSearchWord_LessEqual(String searchWord) {
-        setSearchWord_LessEqual(searchWord, null);
+    public void setSearchWord_LessEqual(String searchWord) {
+        setSearchWord_LessEqual(searchWord, null);
+    }
+
+    public void setSearchWord_LessEqual(String searchWord, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = searchWord;
+        RangeQueryBuilder builder = regRangeQ("searchWord", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setSearchWord_Exists() {
+        setSearchWord_Exists(null);
+    }
+
+    public void setSearchWord_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("searchWord");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setSearchWord_CommonTerms(String searchWord) {
+        setSearchWord_CommonTerms(searchWord, null);
+    }
+
+    public void setSearchWord_CommonTerms(String searchWord, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("searchWord", searchWord);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsSearchLogCQ addOrderBy_SearchWord_Asc() {
+        regOBA("searchWord");
+        return this;
+    }
+
+    public BsSearchLogCQ addOrderBy_SearchWord_Desc() {
+        regOBD("searchWord");
+        return this;
+    }
+
+    public void setUser_Equal(String user) {
+        setUser_Term(user, null);
+    }
+
+    public void setUser_Equal(String user, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setUser_Term(user, opLambda);
+    }
+
+    public void setUser_Term(String user) {
+        setUser_Term(user, null);
+    }
+
+    public void setUser_Term(String user, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("user", user);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUser_NotEqual(String user) {
+        setUser_NotTerm(user, null);
+    }
+
+    public void setUser_NotTerm(String user) {
+        setUser_NotTerm(user, null);
+    }
+
+    public void setUser_NotEqual(String user, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUser_NotTerm(user, opLambda);
+    }
+
+    public void setUser_NotTerm(String user, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUser_Term(user), opLambda);
+    }
+
+    public void setUser_Terms(Collection<String> userList) {
+        setUser_Terms(userList, null);
+    }
+
+    public void setUser_Terms(Collection<String> userList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("user", userList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUser_InScope(Collection<String> userList) {
+        setUser_Terms(userList, null);
+    }
+
+    public void setUser_InScope(Collection<String> userList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setUser_Terms(userList, opLambda);
+    }
+
+    public void setUser_Match(String user) {
+        setUser_Match(user, null);
+    }
+
+    public void setUser_Match(String user, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("user", user);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUser_MatchPhrase(String user) {
+        setUser_MatchPhrase(user, null);
+    }
+
+    public void setUser_MatchPhrase(String user, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("user", user);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUser_MatchPhrasePrefix(String user) {
+        setUser_MatchPhrasePrefix(user, null);
+    }
+
+    public void setUser_MatchPhrasePrefix(String user, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("user", user);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUser_Fuzzy(String user) {
+        setUser_Fuzzy(user, null);
+    }
+
+    public void setUser_Fuzzy(String user, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("user", user);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUser_Prefix(String user) {
+        setUser_Prefix(user, null);
+    }
+
+    public void setUser_Prefix(String user, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("user", user);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUser_Wildcard(String user) {
+        setUser_Wildcard(user, null);
+    }
+
+    public void setUser_Wildcard(String user, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("user", user);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUser_Regexp(String user) {
+        setUser_Regexp(user, null);
+    }
+
+    public void setUser_Regexp(String user, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("user", user);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    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) {
+        final Object _value = user;
+        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUser_LessThan(String user) {
+        setUser_LessThan(user, null);
+    }
+
+    public void setUser_LessThan(String user, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = user;
+        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUser_GreaterEqual(String user) {
+        setUser_GreaterEqual(user, null);
+    }
+
+    public void setUser_GreaterEqual(String user, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = user;
+        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUser_LessEqual(String user) {
+        setUser_LessEqual(user, null);
     }
 
-    public void setSearchWord_LessEqual(String searchWord, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = searchWord;
-        RangeQueryBuilder builder = regRangeQ("searchWord", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setUser_LessEqual(String user, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = user;
+        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSearchWord_Exists() {
-        setSearchWord_Exists(null);
+    public void setUser_Exists() {
+        setUser_Exists(null);
     }
 
-    public void setSearchWord_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("searchWord");
+    public void setUser_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("user");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSearchWord_CommonTerms(String searchWord) {
-        setSearchWord_CommonTerms(searchWord, null);
+    public void setUser_CommonTerms(String user) {
+        setUser_CommonTerms(user, null);
     }
 
-    public void setSearchWord_CommonTerms(String searchWord, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("searchWord", searchWord);
+    public void setUser_CommonTerms(String user, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("user", user);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsSearchLogCQ addOrderBy_SearchWord_Asc() {
-        regOBA("searchWord");
+    public BsSearchLogCQ addOrderBy_User_Asc() {
+        regOBA("user");
         return this;
     }
 
-    public BsSearchLogCQ addOrderBy_SearchWord_Desc() {
-        regOBD("searchWord");
+    public BsSearchLogCQ addOrderBy_User_Desc() {
+        regOBD("user");
         return this;
     }
 
@@ -3473,228 +3695,6 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setLanguages_Equal(String languages) {
-        setLanguages_Term(languages, null);
-    }
-
-    public void setLanguages_Equal(String languages, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setLanguages_Term(languages, opLambda);
-    }
-
-    public void setLanguages_Term(String languages) {
-        setLanguages_Term(languages, null);
-    }
-
-    public void setLanguages_Term(String languages, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("languages", languages);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_NotEqual(String languages) {
-        setLanguages_NotTerm(languages, null);
-    }
-
-    public void setLanguages_NotTerm(String languages) {
-        setLanguages_NotTerm(languages, null);
-    }
-
-    public void setLanguages_NotEqual(String languages, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setLanguages_NotTerm(languages, opLambda);
-    }
-
-    public void setLanguages_NotTerm(String languages, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setLanguages_Term(languages), opLambda);
-    }
-
-    public void setLanguages_Terms(Collection<String> languagesList) {
-        setLanguages_Terms(languagesList, null);
-    }
-
-    public void setLanguages_Terms(Collection<String> languagesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("languages", languagesList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_InScope(Collection<String> languagesList) {
-        setLanguages_Terms(languagesList, null);
-    }
-
-    public void setLanguages_InScope(Collection<String> languagesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setLanguages_Terms(languagesList, opLambda);
-    }
-
-    public void setLanguages_Match(String languages) {
-        setLanguages_Match(languages, null);
-    }
-
-    public void setLanguages_Match(String languages, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("languages", languages);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_MatchPhrase(String languages) {
-        setLanguages_MatchPhrase(languages, null);
-    }
-
-    public void setLanguages_MatchPhrase(String languages, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("languages", languages);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_MatchPhrasePrefix(String languages) {
-        setLanguages_MatchPhrasePrefix(languages, null);
-    }
-
-    public void setLanguages_MatchPhrasePrefix(String languages, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("languages", languages);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_Fuzzy(String languages) {
-        setLanguages_Fuzzy(languages, null);
-    }
-
-    public void setLanguages_Fuzzy(String languages, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("languages", languages);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_Prefix(String languages) {
-        setLanguages_Prefix(languages, null);
-    }
-
-    public void setLanguages_Prefix(String languages, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("languages", languages);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_Wildcard(String languages) {
-        setLanguages_Wildcard(languages, null);
-    }
-
-    public void setLanguages_Wildcard(String languages, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("languages", languages);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_Regexp(String languages) {
-        setLanguages_Regexp(languages, null);
-    }
-
-    public void setLanguages_Regexp(String languages, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("languages", languages);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    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) {
-        final Object _value = languages;
-        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_GREATER_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_LessThan(String languages) {
-        setLanguages_LessThan(languages, null);
-    }
-
-    public void setLanguages_LessThan(String languages, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = languages;
-        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_LESS_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_GreaterEqual(String languages) {
-        setLanguages_GreaterEqual(languages, null);
-    }
-
-    public void setLanguages_GreaterEqual(String languages, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = languages;
-        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_GREATER_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_LessEqual(String languages) {
-        setLanguages_LessEqual(languages, null);
-    }
-
-    public void setLanguages_LessEqual(String languages, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = languages;
-        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_Exists() {
-        setLanguages_Exists(null);
-    }
-
-    public void setLanguages_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("languages");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLanguages_CommonTerms(String languages) {
-        setLanguages_CommonTerms(languages, null);
-    }
-
-    public void setLanguages_CommonTerms(String languages, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("languages", languages);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsSearchLogCQ addOrderBy_Languages_Asc() {
-        regOBA("languages");
-        return this;
-    }
-
-    public BsSearchLogCQ addOrderBy_Languages_Desc() {
-        regOBD("languages");
-        return this;
-    }
-
     public void setVirtualHost_Equal(String virtualHost) {
         setVirtualHost_Term(virtualHost, null);
     }
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 a8609fe5f55d41096f575e7c0acc6cb7c01a4f1a..578bfc70af318c2a4cc585fe0c3f7c7b0306872e 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
@@ -145,7 +145,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         final EsPagingResultBean<RESULT> list = new EsPagingResultBean<>(builder);
         final SearchHits searchHits = response.getHits();
         searchHits.forEach(hit -> {
-            final Map<String, Object> source = hit.getSource();
+            final Map<String, Object> source = hit.getSourceAsMap();
             final RESULT entity = createEntity(source, entityType);
             final DocMeta docMeta = ((EsAbstractEntity) entity).asDocMeta();
             docMeta.id(hit.getId());
@@ -157,7 +157,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         list.setAllRecordCount((int) searchHits.getTotalHits());
         list.setCurrentPageNumber(cb.getFetchPageNumber());
 
-        list.setTook(response.getTookInMillis());
+        list.setTook(response.getTook().getMillis());
         list.setTotalShards(response.getTotalShards());
         list.setSuccessfulShards(response.getSuccessfulShards());
         list.setFailedShards(response.getFailedShards());
@@ -183,7 +183,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
                 if (handler.isBreakCursor()) {
                     return;
                 }
-                final Map<String, Object> source = hit.getSource();
+                final Map<String, Object> source = hit.getSourceAsMap();
                 final RESULT entity = createEntity(source, entityType);
                 final DocMeta docMeta = ((EsAbstractEntity) entity).asDocMeta();
                 docMeta.id(hit.getId());
@@ -204,7 +204,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         delegateBulkRequest(cb, searchHits -> {
             List<RESULT> list = new ArrayList<>();
             searchHits.forEach(hit -> {
-                final Map<String, Object> source = hit.getSource();
+                final Map<String, Object> source = hit.getSourceAsMap();
                 final RESULT entity = createEntity(source, entityType);
                 final DocMeta docMeta = ((EsAbstractEntity) entity).asDocMeta();
                 docMeta.id(hit.getId());
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 77a1a54b3848c79a0f899614f0559cb6df284154..d8613281ea86c84b06dabe1108ce5847c6159368 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
@@ -29,9 +29,9 @@ import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuil
 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.DateRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -126,8 +126,8 @@ public abstract class EsAbstractConditionAggregation {
         return builder;
     }
 
-    protected PercentileRanksAggregationBuilder regPercentileRanksA(String name, String field) {
-        PercentileRanksAggregationBuilder builder = AggregationBuilders.percentileRanks(name).field(field);
+    protected PercentileRanksAggregationBuilder regPercentileRanksA(String name, String field, double[] values) {
+        PercentileRanksAggregationBuilder builder = AggregationBuilders.percentileRanks(name, values).field(field);
         regA(builder);
         return builder;
     }
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
index 33832aad09359af3d18130e54b06b6e75f75813f..7ab4a2499cb81802d4a559830fbf82e0f757af00 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
@@ -51,7 +51,7 @@ public abstract class BsGroupBhv extends EsAbstractBehavior<Group, GroupCB> {
 
     @Override
     protected String asEsIndex() {
-        return ".fess_user";
+        return ".fess_user.group";
     }
 
     @Override
@@ -73,8 +73,8 @@ public abstract class BsGroupBhv extends EsAbstractBehavior<Group, GroupCB> {
     protected <RESULT extends Group> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
-            result.setName(DfTypeUtil.toString(source.get("name")));
             result.setGidNumber(DfTypeUtil.toLong(source.get("gidNumber")));
+            result.setName(DfTypeUtil.toString(source.get("name")));
             return updateEntity(source, result);
         } catch (InstantiationException | IllegalAccessException e) {
             final String msg = "Cannot create a new instance: " + entityType.getName();
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
index fdfc32226c07c077ca3258e6d5ccf4c48b09e18e..04293c1c21f82d2b50305c2d9cd88104067153d4 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
@@ -51,7 +51,7 @@ public abstract class BsRoleBhv extends EsAbstractBehavior<Role, RoleCB> {
 
     @Override
     protected String asEsIndex() {
-        return ".fess_user";
+        return ".fess_user.role";
     }
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
index ad4710751d1b6f19e7917d10662274dbd1c35589..90190c7f02be7ea2fab6d25447b062a7b7fad82b 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
@@ -51,7 +51,7 @@ public abstract class BsUserBhv extends EsAbstractBehavior<User, UserCB> {
 
     @Override
     protected String asEsIndex() {
-        return ".fess_user";
+        return ".fess_user.user";
     }
 
     @Override
@@ -73,46 +73,46 @@ public abstract class BsUserBhv extends EsAbstractBehavior<User, UserCB> {
     protected <RESULT extends User> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
-            result.setName(DfTypeUtil.toString(source.get("name")));
-            result.setPassword(DfTypeUtil.toString(source.get("password")));
-            result.setSurname(DfTypeUtil.toString(source.get("surname")));
-            result.setGivenName(DfTypeUtil.toString(source.get("givenName")));
+            result.setBusinessCategory(DfTypeUtil.toString(source.get("businessCategory")));
+            result.setCarLicense(DfTypeUtil.toString(source.get("carLicense")));
+            result.setCity(DfTypeUtil.toString(source.get("city")));
+            result.setDepartmentNumber(DfTypeUtil.toString(source.get("departmentNumber")));
+            result.setDescription(DfTypeUtil.toString(source.get("description")));
+            result.setDestinationIndicator(DfTypeUtil.toString(source.get("destinationIndicator")));
+            result.setDisplayName(DfTypeUtil.toString(source.get("displayName")));
             result.setEmployeeNumber(DfTypeUtil.toString(source.get("employeeNumber")));
-            result.setMail(DfTypeUtil.toString(source.get("mail")));
-            result.setTelephoneNumber(DfTypeUtil.toString(source.get("telephoneNumber")));
+            result.setEmployeeType(DfTypeUtil.toString(source.get("employeeType")));
+            result.setFacsimileTelephoneNumber(DfTypeUtil.toString(source.get("facsimileTelephoneNumber")));
+            result.setGidNumber(DfTypeUtil.toLong(source.get("gidNumber")));
+            result.setGivenName(DfTypeUtil.toString(source.get("givenName")));
+            result.setGroups(toStringArray(source.get("groups")));
+            result.setHomeDirectory(DfTypeUtil.toString(source.get("homeDirectory")));
             result.setHomePhone(DfTypeUtil.toString(source.get("homePhone")));
             result.setHomePostalAddress(DfTypeUtil.toString(source.get("homePostalAddress")));
+            result.setInitials(DfTypeUtil.toString(source.get("initials")));
+            result.setInternationaliSDNNumber(DfTypeUtil.toString(source.get("internationaliSDNNumber")));
             result.setLabeledURI(DfTypeUtil.toString(source.get("labeledURI")));
-            result.setRoomNumber(DfTypeUtil.toString(source.get("roomNumber")));
-            result.setDescription(DfTypeUtil.toString(source.get("description")));
-            result.setTitle(DfTypeUtil.toString(source.get("title")));
+            result.setMail(DfTypeUtil.toString(source.get("mail")));
+            result.setMobile(DfTypeUtil.toString(source.get("mobile")));
+            result.setName(DfTypeUtil.toString(source.get("name")));
             result.setPager(DfTypeUtil.toString(source.get("pager")));
-            result.setStreet(DfTypeUtil.toString(source.get("street")));
-            result.setPostalCode(DfTypeUtil.toString(source.get("postalCode")));
+            result.setPassword(DfTypeUtil.toString(source.get("password")));
             result.setPhysicalDeliveryOfficeName(DfTypeUtil.toString(source.get("physicalDeliveryOfficeName")));
-            result.setDestinationIndicator(DfTypeUtil.toString(source.get("destinationIndicator")));
-            result.setInternationaliSDNNumber(DfTypeUtil.toString(source.get("internationaliSDNNumber")));
-            result.setState(DfTypeUtil.toString(source.get("state")));
-            result.setEmployeeType(DfTypeUtil.toString(source.get("employeeType")));
-            result.setFacsimileTelephoneNumber(DfTypeUtil.toString(source.get("facsimileTelephoneNumber")));
             result.setPostOfficeBox(DfTypeUtil.toString(source.get("postOfficeBox")));
-            result.setInitials(DfTypeUtil.toString(source.get("initials")));
-            result.setCarLicense(DfTypeUtil.toString(source.get("carLicense")));
-            result.setMobile(DfTypeUtil.toString(source.get("mobile")));
             result.setPostalAddress(DfTypeUtil.toString(source.get("postalAddress")));
-            result.setCity(DfTypeUtil.toString(source.get("city")));
-            result.setTeletexTerminalIdentifier(DfTypeUtil.toString(source.get("teletexTerminalIdentifier")));
-            result.setX121Address(DfTypeUtil.toString(source.get("x121Address")));
-            result.setBusinessCategory(DfTypeUtil.toString(source.get("businessCategory")));
-            result.setRegisteredAddress(DfTypeUtil.toString(source.get("registeredAddress")));
-            result.setDisplayName(DfTypeUtil.toString(source.get("displayName")));
+            result.setPostalCode(DfTypeUtil.toString(source.get("postalCode")));
             result.setPreferredLanguage(DfTypeUtil.toString(source.get("preferredLanguage")));
-            result.setDepartmentNumber(DfTypeUtil.toString(source.get("departmentNumber")));
-            result.setUidNumber(DfTypeUtil.toLong(source.get("uidNumber")));
-            result.setGidNumber(DfTypeUtil.toLong(source.get("gidNumber")));
-            result.setHomeDirectory(DfTypeUtil.toString(source.get("homeDirectory")));
-            result.setGroups(toStringArray(source.get("groups")));
+            result.setRegisteredAddress(DfTypeUtil.toString(source.get("registeredAddress")));
             result.setRoles(toStringArray(source.get("roles")));
+            result.setRoomNumber(DfTypeUtil.toString(source.get("roomNumber")));
+            result.setState(DfTypeUtil.toString(source.get("state")));
+            result.setStreet(DfTypeUtil.toString(source.get("street")));
+            result.setSurname(DfTypeUtil.toString(source.get("surname")));
+            result.setTelephoneNumber(DfTypeUtil.toString(source.get("telephoneNumber")));
+            result.setTeletexTerminalIdentifier(DfTypeUtil.toString(source.get("teletexTerminalIdentifier")));
+            result.setTitle(DfTypeUtil.toString(source.get("title")));
+            result.setUidNumber(DfTypeUtil.toLong(source.get("uidNumber")));
+            result.setX121Address(DfTypeUtil.toString(source.get("x121Address")));
             return updateEntity(source, result);
         } catch (InstantiationException | IllegalAccessException e) {
             final String msg = "Cannot create a new instance: " + entityType.getName();
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java b/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java
index 7ea5bf891cd59f1c83064e181adfa7400811aaa7..770b3de332d77c5a4ed98088729dfa2a2c1f199b 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java
@@ -37,12 +37,12 @@ public class BsGroup extends EsAbstractEntity {
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    /** name */
-    protected String name;
-
     /** gidNumber */
     protected Long gidNumber;
 
+    /** name */
+    protected String name;
+
     // [Referrers] *comment only
 
     // ===================================================================================
@@ -64,12 +64,12 @@ public class BsGroup extends EsAbstractEntity {
     @Override
     public Map<String, Object> toSource() {
         Map<String, Object> sourceMap = new HashMap<>();
-        if (name != null) {
-            addFieldToSource(sourceMap, "name", name);
-        }
         if (gidNumber != null) {
             addFieldToSource(sourceMap, "gidNumber", gidNumber);
         }
+        if (name != null) {
+            addFieldToSource(sourceMap, "name", name);
+        }
         return sourceMap;
     }
 
@@ -83,8 +83,8 @@ public class BsGroup extends EsAbstractEntity {
     @Override
     protected String doBuildColumnString(String dm) {
         StringBuilder sb = new StringBuilder();
-        sb.append(dm).append(name);
         sb.append(dm).append(gidNumber);
+        sb.append(dm).append(name);
         if (sb.length() > dm.length()) {
             sb.delete(0, dm.length());
         }
@@ -95,16 +95,6 @@ public class BsGroup extends EsAbstractEntity {
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
-    public String getName() {
-        checkSpecifiedProperty("name");
-        return convertEmptyToNull(name);
-    }
-
-    public void setName(String value) {
-        registerModifiedProperty("name");
-        this.name = value;
-    }
-
     public Long getGidNumber() {
         checkSpecifiedProperty("gidNumber");
         return gidNumber;
@@ -114,4 +104,14 @@ public class BsGroup extends EsAbstractEntity {
         registerModifiedProperty("gidNumber");
         this.gidNumber = value;
     }
+
+    public String getName() {
+        checkSpecifiedProperty("name");
+        return convertEmptyToNull(name);
+    }
+
+    public void setName(String value) {
+        registerModifiedProperty("name");
+        this.name = value;
+    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java b/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java
index 52b88dc41a654122286da2aec5310d36f4f2d69d..b9e58df57c23bb65048a8842e06854620dca150c 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java
@@ -37,26 +37,47 @@ public class BsUser extends EsAbstractEntity {
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    /** name */
-    protected String name;
+    /** businessCategory */
+    protected String businessCategory;
 
-    /** password */
-    protected String password;
+    /** carLicense */
+    protected String carLicense;
 
-    /** surname */
-    protected String surname;
+    /** city */
+    protected String city;
 
-    /** givenName */
-    protected String givenName;
+    /** departmentNumber */
+    protected String departmentNumber;
+
+    /** description */
+    protected String description;
+
+    /** destinationIndicator */
+    protected String destinationIndicator;
+
+    /** displayName */
+    protected String displayName;
 
     /** employeeNumber */
     protected String employeeNumber;
 
-    /** mail */
-    protected String mail;
+    /** employeeType */
+    protected String employeeType;
 
-    /** telephoneNumber */
-    protected String telephoneNumber;
+    /** facsimileTelephoneNumber */
+    protected String facsimileTelephoneNumber;
+
+    /** gidNumber */
+    protected Long gidNumber;
+
+    /** givenName */
+    protected String givenName;
+
+    /** groups */
+    protected String[] groups;
+
+    /** homeDirectory */
+    protected String homeDirectory;
 
     /** homePhone */
     protected String homePhone;
@@ -64,98 +85,77 @@ public class BsUser extends EsAbstractEntity {
     /** homePostalAddress */
     protected String homePostalAddress;
 
+    /** initials */
+    protected String initials;
+
+    /** internationaliSDNNumber */
+    protected String internationaliSDNNumber;
+
     /** labeledURI */
     protected String labeledURI;
 
-    /** roomNumber */
-    protected String roomNumber;
+    /** mail */
+    protected String mail;
 
-    /** description */
-    protected String description;
+    /** mobile */
+    protected String mobile;
 
-    /** title */
-    protected String title;
+    /** name */
+    protected String name;
 
     /** pager */
     protected String pager;
 
-    /** street */
-    protected String street;
-
-    /** postalCode */
-    protected String postalCode;
+    /** password */
+    protected String password;
 
     /** physicalDeliveryOfficeName */
     protected String physicalDeliveryOfficeName;
 
-    /** destinationIndicator */
-    protected String destinationIndicator;
-
-    /** internationaliSDNNumber */
-    protected String internationaliSDNNumber;
-
-    /** state */
-    protected String state;
-
-    /** employeeType */
-    protected String employeeType;
-
-    /** facsimileTelephoneNumber */
-    protected String facsimileTelephoneNumber;
-
     /** postOfficeBox */
     protected String postOfficeBox;
 
-    /** initials */
-    protected String initials;
-
-    /** carLicense */
-    protected String carLicense;
-
-    /** mobile */
-    protected String mobile;
-
     /** postalAddress */
     protected String postalAddress;
 
-    /** city */
-    protected String city;
-
-    /** teletexTerminalIdentifier */
-    protected String teletexTerminalIdentifier;
-
-    /** x121Address */
-    protected String x121Address;
+    /** postalCode */
+    protected String postalCode;
 
-    /** businessCategory */
-    protected String businessCategory;
+    /** preferredLanguage */
+    protected String preferredLanguage;
 
     /** registeredAddress */
     protected String registeredAddress;
 
-    /** displayName */
-    protected String displayName;
+    /** roles */
+    protected String[] roles;
 
-    /** preferredLanguage */
-    protected String preferredLanguage;
+    /** roomNumber */
+    protected String roomNumber;
 
-    /** departmentNumber */
-    protected String departmentNumber;
+    /** state */
+    protected String state;
 
-    /** uidNumber */
-    protected Long uidNumber;
+    /** street */
+    protected String street;
 
-    /** gidNumber */
-    protected Long gidNumber;
+    /** surname */
+    protected String surname;
 
-    /** homeDirectory */
-    protected String homeDirectory;
+    /** telephoneNumber */
+    protected String telephoneNumber;
 
-    /** groups */
-    protected String[] groups;
+    /** teletexTerminalIdentifier */
+    protected String teletexTerminalIdentifier;
 
-    /** roles */
-    protected String[] roles;
+    /** title */
+    protected String title;
+
+    /** uidNumber */
+    protected Long uidNumber;
+
+    /** x121Address */
+    protected String x121Address;
 
     // [Referrers] *comment only
 
@@ -178,26 +178,47 @@ public class BsUser extends EsAbstractEntity {
     @Override
     public Map<String, Object> toSource() {
         Map<String, Object> sourceMap = new HashMap<>();
-        if (name != null) {
-            addFieldToSource(sourceMap, "name", name);
+        if (businessCategory != null) {
+            addFieldToSource(sourceMap, "businessCategory", businessCategory);
         }
-        if (password != null) {
-            addFieldToSource(sourceMap, "password", password);
+        if (carLicense != null) {
+            addFieldToSource(sourceMap, "carLicense", carLicense);
         }
-        if (surname != null) {
-            addFieldToSource(sourceMap, "surname", surname);
+        if (city != null) {
+            addFieldToSource(sourceMap, "city", city);
         }
-        if (givenName != null) {
-            addFieldToSource(sourceMap, "givenName", givenName);
+        if (departmentNumber != null) {
+            addFieldToSource(sourceMap, "departmentNumber", departmentNumber);
+        }
+        if (description != null) {
+            addFieldToSource(sourceMap, "description", description);
+        }
+        if (destinationIndicator != null) {
+            addFieldToSource(sourceMap, "destinationIndicator", destinationIndicator);
+        }
+        if (displayName != null) {
+            addFieldToSource(sourceMap, "displayName", displayName);
         }
         if (employeeNumber != null) {
             addFieldToSource(sourceMap, "employeeNumber", employeeNumber);
         }
-        if (mail != null) {
-            addFieldToSource(sourceMap, "mail", mail);
+        if (employeeType != null) {
+            addFieldToSource(sourceMap, "employeeType", employeeType);
         }
-        if (telephoneNumber != null) {
-            addFieldToSource(sourceMap, "telephoneNumber", telephoneNumber);
+        if (facsimileTelephoneNumber != null) {
+            addFieldToSource(sourceMap, "facsimileTelephoneNumber", facsimileTelephoneNumber);
+        }
+        if (gidNumber != null) {
+            addFieldToSource(sourceMap, "gidNumber", gidNumber);
+        }
+        if (givenName != null) {
+            addFieldToSource(sourceMap, "givenName", givenName);
+        }
+        if (groups != null) {
+            addFieldToSource(sourceMap, "groups", groups);
+        }
+        if (homeDirectory != null) {
+            addFieldToSource(sourceMap, "homeDirectory", homeDirectory);
         }
         if (homePhone != null) {
             addFieldToSource(sourceMap, "homePhone", homePhone);
@@ -205,98 +226,77 @@ public class BsUser extends EsAbstractEntity {
         if (homePostalAddress != null) {
             addFieldToSource(sourceMap, "homePostalAddress", homePostalAddress);
         }
+        if (initials != null) {
+            addFieldToSource(sourceMap, "initials", initials);
+        }
+        if (internationaliSDNNumber != null) {
+            addFieldToSource(sourceMap, "internationaliSDNNumber", internationaliSDNNumber);
+        }
         if (labeledURI != null) {
             addFieldToSource(sourceMap, "labeledURI", labeledURI);
         }
-        if (roomNumber != null) {
-            addFieldToSource(sourceMap, "roomNumber", roomNumber);
+        if (mail != null) {
+            addFieldToSource(sourceMap, "mail", mail);
         }
-        if (description != null) {
-            addFieldToSource(sourceMap, "description", description);
+        if (mobile != null) {
+            addFieldToSource(sourceMap, "mobile", mobile);
         }
-        if (title != null) {
-            addFieldToSource(sourceMap, "title", title);
+        if (name != null) {
+            addFieldToSource(sourceMap, "name", name);
         }
         if (pager != null) {
             addFieldToSource(sourceMap, "pager", pager);
         }
-        if (street != null) {
-            addFieldToSource(sourceMap, "street", street);
-        }
-        if (postalCode != null) {
-            addFieldToSource(sourceMap, "postalCode", postalCode);
+        if (password != null) {
+            addFieldToSource(sourceMap, "password", password);
         }
         if (physicalDeliveryOfficeName != null) {
             addFieldToSource(sourceMap, "physicalDeliveryOfficeName", physicalDeliveryOfficeName);
         }
-        if (destinationIndicator != null) {
-            addFieldToSource(sourceMap, "destinationIndicator", destinationIndicator);
-        }
-        if (internationaliSDNNumber != null) {
-            addFieldToSource(sourceMap, "internationaliSDNNumber", internationaliSDNNumber);
-        }
-        if (state != null) {
-            addFieldToSource(sourceMap, "state", state);
-        }
-        if (employeeType != null) {
-            addFieldToSource(sourceMap, "employeeType", employeeType);
-        }
-        if (facsimileTelephoneNumber != null) {
-            addFieldToSource(sourceMap, "facsimileTelephoneNumber", facsimileTelephoneNumber);
-        }
         if (postOfficeBox != null) {
             addFieldToSource(sourceMap, "postOfficeBox", postOfficeBox);
         }
-        if (initials != null) {
-            addFieldToSource(sourceMap, "initials", initials);
-        }
-        if (carLicense != null) {
-            addFieldToSource(sourceMap, "carLicense", carLicense);
-        }
-        if (mobile != null) {
-            addFieldToSource(sourceMap, "mobile", mobile);
-        }
         if (postalAddress != null) {
             addFieldToSource(sourceMap, "postalAddress", postalAddress);
         }
-        if (city != null) {
-            addFieldToSource(sourceMap, "city", city);
-        }
-        if (teletexTerminalIdentifier != null) {
-            addFieldToSource(sourceMap, "teletexTerminalIdentifier", teletexTerminalIdentifier);
-        }
-        if (x121Address != null) {
-            addFieldToSource(sourceMap, "x121Address", x121Address);
+        if (postalCode != null) {
+            addFieldToSource(sourceMap, "postalCode", postalCode);
         }
-        if (businessCategory != null) {
-            addFieldToSource(sourceMap, "businessCategory", businessCategory);
+        if (preferredLanguage != null) {
+            addFieldToSource(sourceMap, "preferredLanguage", preferredLanguage);
         }
         if (registeredAddress != null) {
             addFieldToSource(sourceMap, "registeredAddress", registeredAddress);
         }
-        if (displayName != null) {
-            addFieldToSource(sourceMap, "displayName", displayName);
+        if (roles != null) {
+            addFieldToSource(sourceMap, "roles", roles);
         }
-        if (preferredLanguage != null) {
-            addFieldToSource(sourceMap, "preferredLanguage", preferredLanguage);
+        if (roomNumber != null) {
+            addFieldToSource(sourceMap, "roomNumber", roomNumber);
         }
-        if (departmentNumber != null) {
-            addFieldToSource(sourceMap, "departmentNumber", departmentNumber);
+        if (state != null) {
+            addFieldToSource(sourceMap, "state", state);
         }
-        if (uidNumber != null) {
-            addFieldToSource(sourceMap, "uidNumber", uidNumber);
+        if (street != null) {
+            addFieldToSource(sourceMap, "street", street);
         }
-        if (gidNumber != null) {
-            addFieldToSource(sourceMap, "gidNumber", gidNumber);
+        if (surname != null) {
+            addFieldToSource(sourceMap, "surname", surname);
         }
-        if (homeDirectory != null) {
-            addFieldToSource(sourceMap, "homeDirectory", homeDirectory);
+        if (telephoneNumber != null) {
+            addFieldToSource(sourceMap, "telephoneNumber", telephoneNumber);
         }
-        if (groups != null) {
-            addFieldToSource(sourceMap, "groups", groups);
+        if (teletexTerminalIdentifier != null) {
+            addFieldToSource(sourceMap, "teletexTerminalIdentifier", teletexTerminalIdentifier);
         }
-        if (roles != null) {
-            addFieldToSource(sourceMap, "roles", roles);
+        if (title != null) {
+            addFieldToSource(sourceMap, "title", title);
+        }
+        if (uidNumber != null) {
+            addFieldToSource(sourceMap, "uidNumber", uidNumber);
+        }
+        if (x121Address != null) {
+            addFieldToSource(sourceMap, "x121Address", x121Address);
         }
         return sourceMap;
     }
@@ -311,46 +311,46 @@ public class BsUser extends EsAbstractEntity {
     @Override
     protected String doBuildColumnString(String dm) {
         StringBuilder sb = new StringBuilder();
-        sb.append(dm).append(name);
-        sb.append(dm).append(password);
-        sb.append(dm).append(surname);
-        sb.append(dm).append(givenName);
+        sb.append(dm).append(businessCategory);
+        sb.append(dm).append(carLicense);
+        sb.append(dm).append(city);
+        sb.append(dm).append(departmentNumber);
+        sb.append(dm).append(description);
+        sb.append(dm).append(destinationIndicator);
+        sb.append(dm).append(displayName);
         sb.append(dm).append(employeeNumber);
-        sb.append(dm).append(mail);
-        sb.append(dm).append(telephoneNumber);
+        sb.append(dm).append(employeeType);
+        sb.append(dm).append(facsimileTelephoneNumber);
+        sb.append(dm).append(gidNumber);
+        sb.append(dm).append(givenName);
+        sb.append(dm).append(groups);
+        sb.append(dm).append(homeDirectory);
         sb.append(dm).append(homePhone);
         sb.append(dm).append(homePostalAddress);
+        sb.append(dm).append(initials);
+        sb.append(dm).append(internationaliSDNNumber);
         sb.append(dm).append(labeledURI);
-        sb.append(dm).append(roomNumber);
-        sb.append(dm).append(description);
-        sb.append(dm).append(title);
+        sb.append(dm).append(mail);
+        sb.append(dm).append(mobile);
+        sb.append(dm).append(name);
         sb.append(dm).append(pager);
-        sb.append(dm).append(street);
-        sb.append(dm).append(postalCode);
+        sb.append(dm).append(password);
         sb.append(dm).append(physicalDeliveryOfficeName);
-        sb.append(dm).append(destinationIndicator);
-        sb.append(dm).append(internationaliSDNNumber);
-        sb.append(dm).append(state);
-        sb.append(dm).append(employeeType);
-        sb.append(dm).append(facsimileTelephoneNumber);
         sb.append(dm).append(postOfficeBox);
-        sb.append(dm).append(initials);
-        sb.append(dm).append(carLicense);
-        sb.append(dm).append(mobile);
         sb.append(dm).append(postalAddress);
-        sb.append(dm).append(city);
-        sb.append(dm).append(teletexTerminalIdentifier);
-        sb.append(dm).append(x121Address);
-        sb.append(dm).append(businessCategory);
-        sb.append(dm).append(registeredAddress);
-        sb.append(dm).append(displayName);
+        sb.append(dm).append(postalCode);
         sb.append(dm).append(preferredLanguage);
-        sb.append(dm).append(departmentNumber);
-        sb.append(dm).append(uidNumber);
-        sb.append(dm).append(gidNumber);
-        sb.append(dm).append(homeDirectory);
-        sb.append(dm).append(groups);
+        sb.append(dm).append(registeredAddress);
         sb.append(dm).append(roles);
+        sb.append(dm).append(roomNumber);
+        sb.append(dm).append(state);
+        sb.append(dm).append(street);
+        sb.append(dm).append(surname);
+        sb.append(dm).append(telephoneNumber);
+        sb.append(dm).append(teletexTerminalIdentifier);
+        sb.append(dm).append(title);
+        sb.append(dm).append(uidNumber);
+        sb.append(dm).append(x121Address);
         if (sb.length() > dm.length()) {
             sb.delete(0, dm.length());
         }
@@ -361,184 +361,174 @@ public class BsUser extends EsAbstractEntity {
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
-    public String getName() {
-        checkSpecifiedProperty("name");
-        return convertEmptyToNull(name);
-    }
-
-    public void setName(String value) {
-        registerModifiedProperty("name");
-        this.name = value;
-    }
-
-    public String getPassword() {
-        checkSpecifiedProperty("password");
-        return convertEmptyToNull(password);
+    public String getBusinessCategory() {
+        checkSpecifiedProperty("businessCategory");
+        return convertEmptyToNull(businessCategory);
     }
 
-    public void setPassword(String value) {
-        registerModifiedProperty("password");
-        this.password = value;
+    public void setBusinessCategory(String value) {
+        registerModifiedProperty("businessCategory");
+        this.businessCategory = value;
     }
 
-    public String getSurname() {
-        checkSpecifiedProperty("surname");
-        return convertEmptyToNull(surname);
+    public String getCarLicense() {
+        checkSpecifiedProperty("carLicense");
+        return convertEmptyToNull(carLicense);
     }
 
-    public void setSurname(String value) {
-        registerModifiedProperty("surname");
-        this.surname = value;
+    public void setCarLicense(String value) {
+        registerModifiedProperty("carLicense");
+        this.carLicense = value;
     }
 
-    public String getGivenName() {
-        checkSpecifiedProperty("givenName");
-        return convertEmptyToNull(givenName);
+    public String getCity() {
+        checkSpecifiedProperty("city");
+        return convertEmptyToNull(city);
     }
 
-    public void setGivenName(String value) {
-        registerModifiedProperty("givenName");
-        this.givenName = value;
+    public void setCity(String value) {
+        registerModifiedProperty("city");
+        this.city = value;
     }
 
-    public String getEmployeeNumber() {
-        checkSpecifiedProperty("employeeNumber");
-        return convertEmptyToNull(employeeNumber);
+    public String getDepartmentNumber() {
+        checkSpecifiedProperty("departmentNumber");
+        return convertEmptyToNull(departmentNumber);
     }
 
-    public void setEmployeeNumber(String value) {
-        registerModifiedProperty("employeeNumber");
-        this.employeeNumber = value;
+    public void setDepartmentNumber(String value) {
+        registerModifiedProperty("departmentNumber");
+        this.departmentNumber = value;
     }
 
-    public String getMail() {
-        checkSpecifiedProperty("mail");
-        return convertEmptyToNull(mail);
+    public String getDescription() {
+        checkSpecifiedProperty("description");
+        return convertEmptyToNull(description);
     }
 
-    public void setMail(String value) {
-        registerModifiedProperty("mail");
-        this.mail = value;
+    public void setDescription(String value) {
+        registerModifiedProperty("description");
+        this.description = value;
     }
 
-    public String getTelephoneNumber() {
-        checkSpecifiedProperty("telephoneNumber");
-        return convertEmptyToNull(telephoneNumber);
+    public String getDestinationIndicator() {
+        checkSpecifiedProperty("destinationIndicator");
+        return convertEmptyToNull(destinationIndicator);
     }
 
-    public void setTelephoneNumber(String value) {
-        registerModifiedProperty("telephoneNumber");
-        this.telephoneNumber = value;
+    public void setDestinationIndicator(String value) {
+        registerModifiedProperty("destinationIndicator");
+        this.destinationIndicator = value;
     }
 
-    public String getHomePhone() {
-        checkSpecifiedProperty("homePhone");
-        return convertEmptyToNull(homePhone);
+    public String getDisplayName() {
+        checkSpecifiedProperty("displayName");
+        return convertEmptyToNull(displayName);
     }
 
-    public void setHomePhone(String value) {
-        registerModifiedProperty("homePhone");
-        this.homePhone = value;
+    public void setDisplayName(String value) {
+        registerModifiedProperty("displayName");
+        this.displayName = value;
     }
 
-    public String getHomePostalAddress() {
-        checkSpecifiedProperty("homePostalAddress");
-        return convertEmptyToNull(homePostalAddress);
+    public String getEmployeeNumber() {
+        checkSpecifiedProperty("employeeNumber");
+        return convertEmptyToNull(employeeNumber);
     }
 
-    public void setHomePostalAddress(String value) {
-        registerModifiedProperty("homePostalAddress");
-        this.homePostalAddress = value;
+    public void setEmployeeNumber(String value) {
+        registerModifiedProperty("employeeNumber");
+        this.employeeNumber = value;
     }
 
-    public String getLabeledURI() {
-        checkSpecifiedProperty("labeledURI");
-        return convertEmptyToNull(labeledURI);
+    public String getEmployeeType() {
+        checkSpecifiedProperty("employeeType");
+        return convertEmptyToNull(employeeType);
     }
 
-    public void setLabeledURI(String value) {
-        registerModifiedProperty("labeledURI");
-        this.labeledURI = value;
+    public void setEmployeeType(String value) {
+        registerModifiedProperty("employeeType");
+        this.employeeType = value;
     }
 
-    public String getRoomNumber() {
-        checkSpecifiedProperty("roomNumber");
-        return convertEmptyToNull(roomNumber);
+    public String getFacsimileTelephoneNumber() {
+        checkSpecifiedProperty("facsimileTelephoneNumber");
+        return convertEmptyToNull(facsimileTelephoneNumber);
     }
 
-    public void setRoomNumber(String value) {
-        registerModifiedProperty("roomNumber");
-        this.roomNumber = value;
+    public void setFacsimileTelephoneNumber(String value) {
+        registerModifiedProperty("facsimileTelephoneNumber");
+        this.facsimileTelephoneNumber = value;
     }
 
-    public String getDescription() {
-        checkSpecifiedProperty("description");
-        return convertEmptyToNull(description);
+    public Long getGidNumber() {
+        checkSpecifiedProperty("gidNumber");
+        return gidNumber;
     }
 
-    public void setDescription(String value) {
-        registerModifiedProperty("description");
-        this.description = value;
+    public void setGidNumber(Long value) {
+        registerModifiedProperty("gidNumber");
+        this.gidNumber = value;
     }
 
-    public String getTitle() {
-        checkSpecifiedProperty("title");
-        return convertEmptyToNull(title);
+    public String getGivenName() {
+        checkSpecifiedProperty("givenName");
+        return convertEmptyToNull(givenName);
     }
 
-    public void setTitle(String value) {
-        registerModifiedProperty("title");
-        this.title = value;
+    public void setGivenName(String value) {
+        registerModifiedProperty("givenName");
+        this.givenName = value;
     }
 
-    public String getPager() {
-        checkSpecifiedProperty("pager");
-        return convertEmptyToNull(pager);
+    public String[] getGroups() {
+        checkSpecifiedProperty("groups");
+        return groups;
     }
 
-    public void setPager(String value) {
-        registerModifiedProperty("pager");
-        this.pager = value;
+    public void setGroups(String[] value) {
+        registerModifiedProperty("groups");
+        this.groups = value;
     }
 
-    public String getStreet() {
-        checkSpecifiedProperty("street");
-        return convertEmptyToNull(street);
+    public String getHomeDirectory() {
+        checkSpecifiedProperty("homeDirectory");
+        return convertEmptyToNull(homeDirectory);
     }
 
-    public void setStreet(String value) {
-        registerModifiedProperty("street");
-        this.street = value;
+    public void setHomeDirectory(String value) {
+        registerModifiedProperty("homeDirectory");
+        this.homeDirectory = value;
     }
 
-    public String getPostalCode() {
-        checkSpecifiedProperty("postalCode");
-        return convertEmptyToNull(postalCode);
+    public String getHomePhone() {
+        checkSpecifiedProperty("homePhone");
+        return convertEmptyToNull(homePhone);
     }
 
-    public void setPostalCode(String value) {
-        registerModifiedProperty("postalCode");
-        this.postalCode = value;
+    public void setHomePhone(String value) {
+        registerModifiedProperty("homePhone");
+        this.homePhone = value;
     }
 
-    public String getPhysicalDeliveryOfficeName() {
-        checkSpecifiedProperty("physicalDeliveryOfficeName");
-        return convertEmptyToNull(physicalDeliveryOfficeName);
+    public String getHomePostalAddress() {
+        checkSpecifiedProperty("homePostalAddress");
+        return convertEmptyToNull(homePostalAddress);
     }
 
-    public void setPhysicalDeliveryOfficeName(String value) {
-        registerModifiedProperty("physicalDeliveryOfficeName");
-        this.physicalDeliveryOfficeName = value;
+    public void setHomePostalAddress(String value) {
+        registerModifiedProperty("homePostalAddress");
+        this.homePostalAddress = value;
     }
 
-    public String getDestinationIndicator() {
-        checkSpecifiedProperty("destinationIndicator");
-        return convertEmptyToNull(destinationIndicator);
+    public String getInitials() {
+        checkSpecifiedProperty("initials");
+        return convertEmptyToNull(initials);
     }
 
-    public void setDestinationIndicator(String value) {
-        registerModifiedProperty("destinationIndicator");
-        this.destinationIndicator = value;
+    public void setInitials(String value) {
+        registerModifiedProperty("initials");
+        this.initials = value;
     }
 
     public String getInternationaliSDNNumber() {
@@ -551,74 +541,84 @@ public class BsUser extends EsAbstractEntity {
         this.internationaliSDNNumber = value;
     }
 
-    public String getState() {
-        checkSpecifiedProperty("state");
-        return convertEmptyToNull(state);
+    public String getLabeledURI() {
+        checkSpecifiedProperty("labeledURI");
+        return convertEmptyToNull(labeledURI);
     }
 
-    public void setState(String value) {
-        registerModifiedProperty("state");
-        this.state = value;
+    public void setLabeledURI(String value) {
+        registerModifiedProperty("labeledURI");
+        this.labeledURI = value;
     }
 
-    public String getEmployeeType() {
-        checkSpecifiedProperty("employeeType");
-        return convertEmptyToNull(employeeType);
+    public String getMail() {
+        checkSpecifiedProperty("mail");
+        return convertEmptyToNull(mail);
     }
 
-    public void setEmployeeType(String value) {
-        registerModifiedProperty("employeeType");
-        this.employeeType = value;
+    public void setMail(String value) {
+        registerModifiedProperty("mail");
+        this.mail = value;
     }
 
-    public String getFacsimileTelephoneNumber() {
-        checkSpecifiedProperty("facsimileTelephoneNumber");
-        return convertEmptyToNull(facsimileTelephoneNumber);
+    public String getMobile() {
+        checkSpecifiedProperty("mobile");
+        return convertEmptyToNull(mobile);
     }
 
-    public void setFacsimileTelephoneNumber(String value) {
-        registerModifiedProperty("facsimileTelephoneNumber");
-        this.facsimileTelephoneNumber = value;
+    public void setMobile(String value) {
+        registerModifiedProperty("mobile");
+        this.mobile = value;
     }
 
-    public String getPostOfficeBox() {
-        checkSpecifiedProperty("postOfficeBox");
-        return convertEmptyToNull(postOfficeBox);
+    public String getName() {
+        checkSpecifiedProperty("name");
+        return convertEmptyToNull(name);
     }
 
-    public void setPostOfficeBox(String value) {
-        registerModifiedProperty("postOfficeBox");
-        this.postOfficeBox = value;
+    public void setName(String value) {
+        registerModifiedProperty("name");
+        this.name = value;
     }
 
-    public String getInitials() {
-        checkSpecifiedProperty("initials");
-        return convertEmptyToNull(initials);
+    public String getPager() {
+        checkSpecifiedProperty("pager");
+        return convertEmptyToNull(pager);
     }
 
-    public void setInitials(String value) {
-        registerModifiedProperty("initials");
-        this.initials = value;
+    public void setPager(String value) {
+        registerModifiedProperty("pager");
+        this.pager = value;
     }
 
-    public String getCarLicense() {
-        checkSpecifiedProperty("carLicense");
-        return convertEmptyToNull(carLicense);
+    public String getPassword() {
+        checkSpecifiedProperty("password");
+        return convertEmptyToNull(password);
     }
 
-    public void setCarLicense(String value) {
-        registerModifiedProperty("carLicense");
-        this.carLicense = value;
+    public void setPassword(String value) {
+        registerModifiedProperty("password");
+        this.password = value;
     }
 
-    public String getMobile() {
-        checkSpecifiedProperty("mobile");
-        return convertEmptyToNull(mobile);
+    public String getPhysicalDeliveryOfficeName() {
+        checkSpecifiedProperty("physicalDeliveryOfficeName");
+        return convertEmptyToNull(physicalDeliveryOfficeName);
     }
 
-    public void setMobile(String value) {
-        registerModifiedProperty("mobile");
-        this.mobile = value;
+    public void setPhysicalDeliveryOfficeName(String value) {
+        registerModifiedProperty("physicalDeliveryOfficeName");
+        this.physicalDeliveryOfficeName = value;
+    }
+
+    public String getPostOfficeBox() {
+        checkSpecifiedProperty("postOfficeBox");
+        return convertEmptyToNull(postOfficeBox);
+    }
+
+    public void setPostOfficeBox(String value) {
+        registerModifiedProperty("postOfficeBox");
+        this.postOfficeBox = value;
     }
 
     public String getPostalAddress() {
@@ -631,133 +631,133 @@ public class BsUser extends EsAbstractEntity {
         this.postalAddress = value;
     }
 
-    public String getCity() {
-        checkSpecifiedProperty("city");
-        return convertEmptyToNull(city);
+    public String getPostalCode() {
+        checkSpecifiedProperty("postalCode");
+        return convertEmptyToNull(postalCode);
     }
 
-    public void setCity(String value) {
-        registerModifiedProperty("city");
-        this.city = value;
+    public void setPostalCode(String value) {
+        registerModifiedProperty("postalCode");
+        this.postalCode = value;
     }
 
-    public String getTeletexTerminalIdentifier() {
-        checkSpecifiedProperty("teletexTerminalIdentifier");
-        return convertEmptyToNull(teletexTerminalIdentifier);
+    public String getPreferredLanguage() {
+        checkSpecifiedProperty("preferredLanguage");
+        return convertEmptyToNull(preferredLanguage);
     }
 
-    public void setTeletexTerminalIdentifier(String value) {
-        registerModifiedProperty("teletexTerminalIdentifier");
-        this.teletexTerminalIdentifier = value;
+    public void setPreferredLanguage(String value) {
+        registerModifiedProperty("preferredLanguage");
+        this.preferredLanguage = value;
     }
 
-    public String getX121Address() {
-        checkSpecifiedProperty("x121Address");
-        return convertEmptyToNull(x121Address);
+    public String getRegisteredAddress() {
+        checkSpecifiedProperty("registeredAddress");
+        return convertEmptyToNull(registeredAddress);
     }
 
-    public void setX121Address(String value) {
-        registerModifiedProperty("x121Address");
-        this.x121Address = value;
+    public void setRegisteredAddress(String value) {
+        registerModifiedProperty("registeredAddress");
+        this.registeredAddress = value;
     }
 
-    public String getBusinessCategory() {
-        checkSpecifiedProperty("businessCategory");
-        return convertEmptyToNull(businessCategory);
+    public String[] getRoles() {
+        checkSpecifiedProperty("roles");
+        return roles;
     }
 
-    public void setBusinessCategory(String value) {
-        registerModifiedProperty("businessCategory");
-        this.businessCategory = value;
+    public void setRoles(String[] value) {
+        registerModifiedProperty("roles");
+        this.roles = value;
     }
 
-    public String getRegisteredAddress() {
-        checkSpecifiedProperty("registeredAddress");
-        return convertEmptyToNull(registeredAddress);
+    public String getRoomNumber() {
+        checkSpecifiedProperty("roomNumber");
+        return convertEmptyToNull(roomNumber);
     }
 
-    public void setRegisteredAddress(String value) {
-        registerModifiedProperty("registeredAddress");
-        this.registeredAddress = value;
+    public void setRoomNumber(String value) {
+        registerModifiedProperty("roomNumber");
+        this.roomNumber = value;
     }
 
-    public String getDisplayName() {
-        checkSpecifiedProperty("displayName");
-        return convertEmptyToNull(displayName);
+    public String getState() {
+        checkSpecifiedProperty("state");
+        return convertEmptyToNull(state);
     }
 
-    public void setDisplayName(String value) {
-        registerModifiedProperty("displayName");
-        this.displayName = value;
+    public void setState(String value) {
+        registerModifiedProperty("state");
+        this.state = value;
     }
 
-    public String getPreferredLanguage() {
-        checkSpecifiedProperty("preferredLanguage");
-        return convertEmptyToNull(preferredLanguage);
+    public String getStreet() {
+        checkSpecifiedProperty("street");
+        return convertEmptyToNull(street);
     }
 
-    public void setPreferredLanguage(String value) {
-        registerModifiedProperty("preferredLanguage");
-        this.preferredLanguage = value;
+    public void setStreet(String value) {
+        registerModifiedProperty("street");
+        this.street = value;
     }
 
-    public String getDepartmentNumber() {
-        checkSpecifiedProperty("departmentNumber");
-        return convertEmptyToNull(departmentNumber);
+    public String getSurname() {
+        checkSpecifiedProperty("surname");
+        return convertEmptyToNull(surname);
     }
 
-    public void setDepartmentNumber(String value) {
-        registerModifiedProperty("departmentNumber");
-        this.departmentNumber = value;
+    public void setSurname(String value) {
+        registerModifiedProperty("surname");
+        this.surname = value;
     }
 
-    public Long getUidNumber() {
-        checkSpecifiedProperty("uidNumber");
-        return uidNumber;
+    public String getTelephoneNumber() {
+        checkSpecifiedProperty("telephoneNumber");
+        return convertEmptyToNull(telephoneNumber);
     }
 
-    public void setUidNumber(Long value) {
-        registerModifiedProperty("uidNumber");
-        this.uidNumber = value;
+    public void setTelephoneNumber(String value) {
+        registerModifiedProperty("telephoneNumber");
+        this.telephoneNumber = value;
     }
 
-    public Long getGidNumber() {
-        checkSpecifiedProperty("gidNumber");
-        return gidNumber;
+    public String getTeletexTerminalIdentifier() {
+        checkSpecifiedProperty("teletexTerminalIdentifier");
+        return convertEmptyToNull(teletexTerminalIdentifier);
     }
 
-    public void setGidNumber(Long value) {
-        registerModifiedProperty("gidNumber");
-        this.gidNumber = value;
+    public void setTeletexTerminalIdentifier(String value) {
+        registerModifiedProperty("teletexTerminalIdentifier");
+        this.teletexTerminalIdentifier = value;
     }
 
-    public String getHomeDirectory() {
-        checkSpecifiedProperty("homeDirectory");
-        return convertEmptyToNull(homeDirectory);
+    public String getTitle() {
+        checkSpecifiedProperty("title");
+        return convertEmptyToNull(title);
     }
 
-    public void setHomeDirectory(String value) {
-        registerModifiedProperty("homeDirectory");
-        this.homeDirectory = value;
+    public void setTitle(String value) {
+        registerModifiedProperty("title");
+        this.title = value;
     }
 
-    public String[] getGroups() {
-        checkSpecifiedProperty("groups");
-        return groups;
+    public Long getUidNumber() {
+        checkSpecifiedProperty("uidNumber");
+        return uidNumber;
     }
 
-    public void setGroups(String[] value) {
-        registerModifiedProperty("groups");
-        this.groups = value;
+    public void setUidNumber(Long value) {
+        registerModifiedProperty("uidNumber");
+        this.uidNumber = value;
     }
 
-    public String[] getRoles() {
-        checkSpecifiedProperty("roles");
-        return roles;
+    public String getX121Address() {
+        checkSpecifiedProperty("x121Address");
+        return convertEmptyToNull(x121Address);
     }
 
-    public void setRoles(String[] value) {
-        registerModifiedProperty("roles");
-        this.roles = value;
+    public void setX121Address(String value) {
+        registerModifiedProperty("x121Address");
+        this.x121Address = value;
     }
 }
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 7f4a6959af456eba4a7e4465f9e82ce189d350db..38f83082fb6d4ca956d08f7d0a1a87ae57682e26 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
@@ -79,8 +79,8 @@ public class GroupDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((Group) et).getName(), (et, vl) -> ((Group) et).setName(DfTypeUtil.toString(vl)), "name");
         setupEpg(_epgMap, et -> ((Group) et).getGidNumber(), (et, vl) -> ((Group) et).setGidNumber(DfTypeUtil.toLong(vl)), "gidNumber");
+        setupEpg(_epgMap, et -> ((Group) et).getName(), (et, vl) -> ((Group) et).setName(DfTypeUtil.toString(vl)), "name");
     }
 
     @Override
@@ -117,23 +117,23 @@ public class GroupDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
-            0, null, 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, null, false, null, null, null, null, null, false);
-
-    public ColumnInfo columnName() {
-        return _columnName;
-    }
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
+            0, null, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnGidNumber() {
         return _columnGidNumber;
     }
 
+    public ColumnInfo columnName() {
+        return _columnName;
+    }
+
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
-        ls.add(columnName());
         ls.add(columnGidNumber());
+        ls.add(columnName());
         return ls;
     }
 
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 8664f0392a6d54da124a0a0c0bc7730461762259..ff2693c27bc9e2471b1b376b33bdba827852bde1 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
@@ -79,65 +79,65 @@ public class UserDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((User) et).getName(), (et, vl) -> ((User) et).setName(DfTypeUtil.toString(vl)), "name");
-        setupEpg(_epgMap, et -> ((User) et).getPassword(), (et, vl) -> ((User) et).setPassword(DfTypeUtil.toString(vl)), "password");
-        setupEpg(_epgMap, et -> ((User) et).getSurname(), (et, vl) -> ((User) et).setSurname(DfTypeUtil.toString(vl)), "surname");
-        setupEpg(_epgMap, et -> ((User) et).getGivenName(), (et, vl) -> ((User) et).setGivenName(DfTypeUtil.toString(vl)), "givenName");
+        setupEpg(_epgMap, et -> ((User) et).getBusinessCategory(), (et, vl) -> ((User) et).setBusinessCategory(DfTypeUtil.toString(vl)),
+                "businessCategory");
+        setupEpg(_epgMap, et -> ((User) et).getCarLicense(), (et, vl) -> ((User) et).setCarLicense(DfTypeUtil.toString(vl)), "carLicense");
+        setupEpg(_epgMap, et -> ((User) et).getCity(), (et, vl) -> ((User) et).setCity(DfTypeUtil.toString(vl)), "city");
+        setupEpg(_epgMap, et -> ((User) et).getDepartmentNumber(), (et, vl) -> ((User) et).setDepartmentNumber(DfTypeUtil.toString(vl)),
+                "departmentNumber");
+        setupEpg(_epgMap, et -> ((User) et).getDescription(), (et, vl) -> ((User) et).setDescription(DfTypeUtil.toString(vl)),
+                "description");
+        setupEpg(_epgMap, et -> ((User) et).getDestinationIndicator(),
+                (et, vl) -> ((User) et).setDestinationIndicator(DfTypeUtil.toString(vl)), "destinationIndicator");
+        setupEpg(_epgMap, et -> ((User) et).getDisplayName(), (et, vl) -> ((User) et).setDisplayName(DfTypeUtil.toString(vl)),
+                "displayName");
         setupEpg(_epgMap, et -> ((User) et).getEmployeeNumber(), (et, vl) -> ((User) et).setEmployeeNumber(DfTypeUtil.toString(vl)),
                 "employeeNumber");
-        setupEpg(_epgMap, et -> ((User) et).getMail(), (et, vl) -> ((User) et).setMail(DfTypeUtil.toString(vl)), "mail");
-        setupEpg(_epgMap, et -> ((User) et).getTelephoneNumber(), (et, vl) -> ((User) et).setTelephoneNumber(DfTypeUtil.toString(vl)),
-                "telephoneNumber");
+        setupEpg(_epgMap, et -> ((User) et).getEmployeeType(), (et, vl) -> ((User) et).setEmployeeType(DfTypeUtil.toString(vl)),
+                "employeeType");
+        setupEpg(_epgMap, et -> ((User) et).getFacsimileTelephoneNumber(),
+                (et, vl) -> ((User) et).setFacsimileTelephoneNumber(DfTypeUtil.toString(vl)), "facsimileTelephoneNumber");
+        setupEpg(_epgMap, et -> ((User) et).getGidNumber(), (et, vl) -> ((User) et).setGidNumber(DfTypeUtil.toLong(vl)), "gidNumber");
+        setupEpg(_epgMap, et -> ((User) et).getGivenName(), (et, vl) -> ((User) et).setGivenName(DfTypeUtil.toString(vl)), "givenName");
+        setupEpg(_epgMap, et -> ((User) et).getGroups(), (et, vl) -> ((User) et).setGroups((String[]) vl), "groups");
+        setupEpg(_epgMap, et -> ((User) et).getHomeDirectory(), (et, vl) -> ((User) et).setHomeDirectory(DfTypeUtil.toString(vl)),
+                "homeDirectory");
         setupEpg(_epgMap, et -> ((User) et).getHomePhone(), (et, vl) -> ((User) et).setHomePhone(DfTypeUtil.toString(vl)), "homePhone");
         setupEpg(_epgMap, et -> ((User) et).getHomePostalAddress(), (et, vl) -> ((User) et).setHomePostalAddress(DfTypeUtil.toString(vl)),
                 "homePostalAddress");
+        setupEpg(_epgMap, et -> ((User) et).getInitials(), (et, vl) -> ((User) et).setInitials(DfTypeUtil.toString(vl)), "initials");
+        setupEpg(_epgMap, et -> ((User) et).getInternationaliSDNNumber(),
+                (et, vl) -> ((User) et).setInternationaliSDNNumber(DfTypeUtil.toString(vl)), "internationaliSDNNumber");
         setupEpg(_epgMap, et -> ((User) et).getLabeledURI(), (et, vl) -> ((User) et).setLabeledURI(DfTypeUtil.toString(vl)), "labeledURI");
-        setupEpg(_epgMap, et -> ((User) et).getRoomNumber(), (et, vl) -> ((User) et).setRoomNumber(DfTypeUtil.toString(vl)), "roomNumber");
-        setupEpg(_epgMap, et -> ((User) et).getDescription(), (et, vl) -> ((User) et).setDescription(DfTypeUtil.toString(vl)),
-                "description");
-        setupEpg(_epgMap, et -> ((User) et).getTitle(), (et, vl) -> ((User) et).setTitle(DfTypeUtil.toString(vl)), "title");
+        setupEpg(_epgMap, et -> ((User) et).getMail(), (et, vl) -> ((User) et).setMail(DfTypeUtil.toString(vl)), "mail");
+        setupEpg(_epgMap, et -> ((User) et).getMobile(), (et, vl) -> ((User) et).setMobile(DfTypeUtil.toString(vl)), "mobile");
+        setupEpg(_epgMap, et -> ((User) et).getName(), (et, vl) -> ((User) et).setName(DfTypeUtil.toString(vl)), "name");
         setupEpg(_epgMap, et -> ((User) et).getPager(), (et, vl) -> ((User) et).setPager(DfTypeUtil.toString(vl)), "pager");
-        setupEpg(_epgMap, et -> ((User) et).getStreet(), (et, vl) -> ((User) et).setStreet(DfTypeUtil.toString(vl)), "street");
-        setupEpg(_epgMap, et -> ((User) et).getPostalCode(), (et, vl) -> ((User) et).setPostalCode(DfTypeUtil.toString(vl)), "postalCode");
+        setupEpg(_epgMap, et -> ((User) et).getPassword(), (et, vl) -> ((User) et).setPassword(DfTypeUtil.toString(vl)), "password");
         setupEpg(_epgMap, et -> ((User) et).getPhysicalDeliveryOfficeName(),
                 (et, vl) -> ((User) et).setPhysicalDeliveryOfficeName(DfTypeUtil.toString(vl)), "physicalDeliveryOfficeName");
-        setupEpg(_epgMap, et -> ((User) et).getDestinationIndicator(),
-                (et, vl) -> ((User) et).setDestinationIndicator(DfTypeUtil.toString(vl)), "destinationIndicator");
-        setupEpg(_epgMap, et -> ((User) et).getInternationaliSDNNumber(),
-                (et, vl) -> ((User) et).setInternationaliSDNNumber(DfTypeUtil.toString(vl)), "internationaliSDNNumber");
-        setupEpg(_epgMap, et -> ((User) et).getState(), (et, vl) -> ((User) et).setState(DfTypeUtil.toString(vl)), "state");
-        setupEpg(_epgMap, et -> ((User) et).getEmployeeType(), (et, vl) -> ((User) et).setEmployeeType(DfTypeUtil.toString(vl)),
-                "employeeType");
-        setupEpg(_epgMap, et -> ((User) et).getFacsimileTelephoneNumber(),
-                (et, vl) -> ((User) et).setFacsimileTelephoneNumber(DfTypeUtil.toString(vl)), "facsimileTelephoneNumber");
         setupEpg(_epgMap, et -> ((User) et).getPostOfficeBox(), (et, vl) -> ((User) et).setPostOfficeBox(DfTypeUtil.toString(vl)),
                 "postOfficeBox");
-        setupEpg(_epgMap, et -> ((User) et).getInitials(), (et, vl) -> ((User) et).setInitials(DfTypeUtil.toString(vl)), "initials");
-        setupEpg(_epgMap, et -> ((User) et).getCarLicense(), (et, vl) -> ((User) et).setCarLicense(DfTypeUtil.toString(vl)), "carLicense");
-        setupEpg(_epgMap, et -> ((User) et).getMobile(), (et, vl) -> ((User) et).setMobile(DfTypeUtil.toString(vl)), "mobile");
         setupEpg(_epgMap, et -> ((User) et).getPostalAddress(), (et, vl) -> ((User) et).setPostalAddress(DfTypeUtil.toString(vl)),
                 "postalAddress");
-        setupEpg(_epgMap, et -> ((User) et).getCity(), (et, vl) -> ((User) et).setCity(DfTypeUtil.toString(vl)), "city");
+        setupEpg(_epgMap, et -> ((User) et).getPostalCode(), (et, vl) -> ((User) et).setPostalCode(DfTypeUtil.toString(vl)), "postalCode");
+        setupEpg(_epgMap, et -> ((User) et).getPreferredLanguage(), (et, vl) -> ((User) et).setPreferredLanguage(DfTypeUtil.toString(vl)),
+                "preferredLanguage");
+        setupEpg(_epgMap, et -> ((User) et).getRegisteredAddress(), (et, vl) -> ((User) et).setRegisteredAddress(DfTypeUtil.toString(vl)),
+                "registeredAddress");
+        setupEpg(_epgMap, et -> ((User) et).getRoles(), (et, vl) -> ((User) et).setRoles((String[]) vl), "roles");
+        setupEpg(_epgMap, et -> ((User) et).getRoomNumber(), (et, vl) -> ((User) et).setRoomNumber(DfTypeUtil.toString(vl)), "roomNumber");
+        setupEpg(_epgMap, et -> ((User) et).getState(), (et, vl) -> ((User) et).setState(DfTypeUtil.toString(vl)), "state");
+        setupEpg(_epgMap, et -> ((User) et).getStreet(), (et, vl) -> ((User) et).setStreet(DfTypeUtil.toString(vl)), "street");
+        setupEpg(_epgMap, et -> ((User) et).getSurname(), (et, vl) -> ((User) et).setSurname(DfTypeUtil.toString(vl)), "surname");
+        setupEpg(_epgMap, et -> ((User) et).getTelephoneNumber(), (et, vl) -> ((User) et).setTelephoneNumber(DfTypeUtil.toString(vl)),
+                "telephoneNumber");
         setupEpg(_epgMap, et -> ((User) et).getTeletexTerminalIdentifier(),
                 (et, vl) -> ((User) et).setTeletexTerminalIdentifier(DfTypeUtil.toString(vl)), "teletexTerminalIdentifier");
+        setupEpg(_epgMap, et -> ((User) et).getTitle(), (et, vl) -> ((User) et).setTitle(DfTypeUtil.toString(vl)), "title");
+        setupEpg(_epgMap, et -> ((User) et).getUidNumber(), (et, vl) -> ((User) et).setUidNumber(DfTypeUtil.toLong(vl)), "uidNumber");
         setupEpg(_epgMap, et -> ((User) et).getX121Address(), (et, vl) -> ((User) et).setX121Address(DfTypeUtil.toString(vl)),
                 "x121Address");
-        setupEpg(_epgMap, et -> ((User) et).getBusinessCategory(), (et, vl) -> ((User) et).setBusinessCategory(DfTypeUtil.toString(vl)),
-                "businessCategory");
-        setupEpg(_epgMap, et -> ((User) et).getRegisteredAddress(), (et, vl) -> ((User) et).setRegisteredAddress(DfTypeUtil.toString(vl)),
-                "registeredAddress");
-        setupEpg(_epgMap, et -> ((User) et).getDisplayName(), (et, vl) -> ((User) et).setDisplayName(DfTypeUtil.toString(vl)),
-                "displayName");
-        setupEpg(_epgMap, et -> ((User) et).getPreferredLanguage(), (et, vl) -> ((User) et).setPreferredLanguage(DfTypeUtil.toString(vl)),
-                "preferredLanguage");
-        setupEpg(_epgMap, et -> ((User) et).getDepartmentNumber(), (et, vl) -> ((User) et).setDepartmentNumber(DfTypeUtil.toString(vl)),
-                "departmentNumber");
-        setupEpg(_epgMap, et -> ((User) et).getUidNumber(), (et, vl) -> ((User) et).setUidNumber(DfTypeUtil.toLong(vl)), "uidNumber");
-        setupEpg(_epgMap, et -> ((User) et).getGidNumber(), (et, vl) -> ((User) et).setGidNumber(DfTypeUtil.toLong(vl)), "gidNumber");
-        setupEpg(_epgMap, et -> ((User) et).getHomeDirectory(), (et, vl) -> ((User) et).setHomeDirectory(DfTypeUtil.toString(vl)),
-                "homeDirectory");
-        setupEpg(_epgMap, et -> ((User) et).getGroups(), (et, vl) -> ((User) et).setGroups((String[]) vl), "groups");
-        setupEpg(_epgMap, et -> ((User) et).getRoles(), (et, vl) -> ((User) et).setRoles((String[]) vl), "roles");
     }
 
     @Override
@@ -174,293 +174,293 @@ public class UserDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
+    protected final ColumnInfo _columnBusinessCategory = cci("businessCategory", "businessCategory", null, null, String.class,
+            "businessCategory", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCarLicense = cci("carLicense", "carLicense", null, null, String.class, "carLicense", null, false,
+            false, false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false,
-            false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnSurname = cci("surname", "surname", null, null, String.class, "surname", null, false, false, false,
-            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnDepartmentNumber = cci("departmentNumber", "departmentNumber", null, null, String.class,
+            "departmentNumber", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnDescription = cci("description", "description", null, null, String.class, "description", null, false,
+            false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnDestinationIndicator = cci("destinationIndicator", "destinationIndicator", null, null, String.class,
+            "destinationIndicator", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnDisplayName = cci("displayName", "displayName", null, null, String.class, "displayName", null, false,
+            false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnEmployeeNumber = cci("employeeNumber", "employeeNumber", null, null, String.class, "employeeNumber",
+            null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnEmployeeType = cci("employeeType", "employeeType", null, null, String.class, "employeeType", null,
+            false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnFacsimileTelephoneNumber = cci("facsimileTelephoneNumber", "facsimileTelephoneNumber", null, null,
+            String.class, "facsimileTelephoneNumber", null, false, false, false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnGivenName = cci("givenName", "givenName", null, null, String.class, "givenName", null, false, false,
             false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnEmployeeNumber = cci("employeeNumber", "employeeNumber", null, null, String.class, "employeeNumber",
+    protected final ColumnInfo _columnGroups = cci("groups", "groups", null, null, String[].class, "groups", null, false, false, false,
+            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnHomeDirectory = cci("homeDirectory", "homeDirectory", null, null, String.class, "homeDirectory",
             null, false, false, false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTelephoneNumber = cci("telephoneNumber", "telephoneNumber", null, null, String.class,
-            "telephoneNumber", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHomePhone = cci("homePhone", "homePhone", null, null, String.class, "homePhone", null, false, false,
             false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHomePostalAddress = cci("homePostalAddress", "homePostalAddress", null, null, String.class,
             "homePostalAddress", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnInitials = cci("initials", "initials", null, null, String.class, "initials", null, false, false,
+            false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnInternationaliSDNNumber = cci("internationaliSDNNumber", "internationaliSDNNumber", null, null,
+            String.class, "internationaliSDNNumber", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null,
+            null, false);
     protected final ColumnInfo _columnLabeledURI = cci("labeledURI", "labeledURI", null, null, String.class, "labeledURI", null, false,
             false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnRoomNumber = cci("roomNumber", "roomNumber", null, null, String.class, "roomNumber", null, false,
-            false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnDescription = cci("description", "description", null, null, String.class, "description", null, false,
-            false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTitle = cci("title", "title", null, null, String.class, "title", null, false, false, false,
+    protected final ColumnInfo _columnMail = cci("mail", "mail", null, null, String.class, "mail", null, false, false, false, "keyword", 0,
+            0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnMobile = cci("mobile", "mobile", null, null, String.class, "mobile", null, false, false, false,
             "keyword", 0, 0, null, 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, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnStreet = cci("street", "street", null, null, String.class, "street", null, false, false, false,
-            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnPostalCode = cci("postalCode", "postalCode", null, null, String.class, "postalCode", null, false,
-            false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false,
+            false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPhysicalDeliveryOfficeName = cci("physicalDeliveryOfficeName", "physicalDeliveryOfficeName", null,
             null, String.class, "physicalDeliveryOfficeName", null, false, false, false, "keyword", 0, 0, null, null, false, null, null,
             null, null, null, false);
-    protected final ColumnInfo _columnDestinationIndicator = cci("destinationIndicator", "destinationIndicator", null, null, String.class,
-            "destinationIndicator", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnInternationaliSDNNumber = cci("internationaliSDNNumber", "internationaliSDNNumber", null, null,
-            String.class, "internationaliSDNNumber", null, false, false, false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnEmployeeType = cci("employeeType", "employeeType", null, null, String.class, "employeeType", null,
-            false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnFacsimileTelephoneNumber = cci("facsimileTelephoneNumber", "facsimileTelephoneNumber", null, null,
-            String.class, "facsimileTelephoneNumber", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null,
-            null, null, false);
     protected final ColumnInfo _columnPostOfficeBox = cci("postOfficeBox", "postOfficeBox", null, null, String.class, "postOfficeBox",
             null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnInitials = cci("initials", "initials", null, null, String.class, "initials", null, false, false,
-            false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCarLicense = cci("carLicense", "carLicense", null, null, String.class, "carLicense", null, false,
-            false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnMobile = cci("mobile", "mobile", null, null, String.class, "mobile", null, false, false, false,
-            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPostalAddress = cci("postalAddress", "postalAddress", null, null, String.class, "postalAddress",
             null, false, false, false, "keyword", 0, 0, null, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTeletexTerminalIdentifier = cci("teletexTerminalIdentifier", "teletexTerminalIdentifier", null, null,
-            String.class, "teletexTerminalIdentifier", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null,
-            null, null, false);
-    protected final ColumnInfo _columnX121Address = cci("x121Address", "x121Address", null, null, String.class, "x121Address", null, false,
+    protected final ColumnInfo _columnPostalCode = cci("postalCode", "postalCode", null, null, String.class, "postalCode", null, false,
             false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnBusinessCategory = cci("businessCategory", "businessCategory", null, null, String.class,
-            "businessCategory", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnPreferredLanguage = cci("preferredLanguage", "preferredLanguage", null, null, String.class,
+            "preferredLanguage", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRegisteredAddress = cci("registeredAddress", "registeredAddress", null, null, String.class,
             "registeredAddress", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnDisplayName = cci("displayName", "displayName", null, null, String.class, "displayName", null, false,
+    protected final ColumnInfo _columnRoles = cci("roles", "roles", null, null, String[].class, "roles", null, false, false, false,
+            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnRoomNumber = cci("roomNumber", "roomNumber", null, null, String.class, "roomNumber", null, false,
             false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnPreferredLanguage = cci("preferredLanguage", "preferredLanguage", null, null, String.class,
-            "preferredLanguage", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnDepartmentNumber = cci("departmentNumber", "departmentNumber", null, null, String.class,
-            "departmentNumber", null, false, false, false, "keyword", 0, 0, null, 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, 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, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnHomeDirectory = cci("homeDirectory", "homeDirectory", null, null, String.class, "homeDirectory",
-            null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnGroups = cci("groups", "groups", null, null, String[].class, "groups", null, false, false, false,
+    protected final ColumnInfo _columnState = cci("state", "state", null, null, String.class, "state", null, false, false, false,
             "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnRoles = cci("roles", "roles", null, null, String[].class, "roles", null, false, false, false,
+    protected final ColumnInfo _columnStreet = cci("street", "street", null, null, String.class, "street", null, false, false, false,
             "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnSurname = cci("surname", "surname", null, null, String.class, "surname", null, false, false, false,
+            "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnTelephoneNumber = cci("telephoneNumber", "telephoneNumber", null, null, String.class,
+            "telephoneNumber", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnTeletexTerminalIdentifier = cci("teletexTerminalIdentifier", "teletexTerminalIdentifier", null, null,
+            String.class, "teletexTerminalIdentifier", null, false, false, false, "keyword", 0, 0, null, 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, 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, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnX121Address = cci("x121Address", "x121Address", null, null, String.class, "x121Address", null, false,
+            false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
 
-    public ColumnInfo columnName() {
-        return _columnName;
-    }
-
-    public ColumnInfo columnPassword() {
-        return _columnPassword;
+    public ColumnInfo columnBusinessCategory() {
+        return _columnBusinessCategory;
     }
 
-    public ColumnInfo columnSurname() {
-        return _columnSurname;
+    public ColumnInfo columnCarLicense() {
+        return _columnCarLicense;
     }
 
-    public ColumnInfo columnGivenName() {
-        return _columnGivenName;
+    public ColumnInfo columnCity() {
+        return _columnCity;
     }
 
-    public ColumnInfo columnEmployeeNumber() {
-        return _columnEmployeeNumber;
+    public ColumnInfo columnDepartmentNumber() {
+        return _columnDepartmentNumber;
     }
 
-    public ColumnInfo columnMail() {
-        return _columnMail;
+    public ColumnInfo columnDescription() {
+        return _columnDescription;
     }
 
-    public ColumnInfo columnTelephoneNumber() {
-        return _columnTelephoneNumber;
+    public ColumnInfo columnDestinationIndicator() {
+        return _columnDestinationIndicator;
     }
 
-    public ColumnInfo columnHomePhone() {
-        return _columnHomePhone;
+    public ColumnInfo columnDisplayName() {
+        return _columnDisplayName;
     }
 
-    public ColumnInfo columnHomePostalAddress() {
-        return _columnHomePostalAddress;
+    public ColumnInfo columnEmployeeNumber() {
+        return _columnEmployeeNumber;
     }
 
-    public ColumnInfo columnLabeledURI() {
-        return _columnLabeledURI;
+    public ColumnInfo columnEmployeeType() {
+        return _columnEmployeeType;
     }
 
-    public ColumnInfo columnRoomNumber() {
-        return _columnRoomNumber;
+    public ColumnInfo columnFacsimileTelephoneNumber() {
+        return _columnFacsimileTelephoneNumber;
     }
 
-    public ColumnInfo columnDescription() {
-        return _columnDescription;
+    public ColumnInfo columnGidNumber() {
+        return _columnGidNumber;
     }
 
-    public ColumnInfo columnTitle() {
-        return _columnTitle;
+    public ColumnInfo columnGivenName() {
+        return _columnGivenName;
     }
 
-    public ColumnInfo columnPager() {
-        return _columnPager;
+    public ColumnInfo columnGroups() {
+        return _columnGroups;
     }
 
-    public ColumnInfo columnStreet() {
-        return _columnStreet;
+    public ColumnInfo columnHomeDirectory() {
+        return _columnHomeDirectory;
     }
 
-    public ColumnInfo columnPostalCode() {
-        return _columnPostalCode;
+    public ColumnInfo columnHomePhone() {
+        return _columnHomePhone;
     }
 
-    public ColumnInfo columnPhysicalDeliveryOfficeName() {
-        return _columnPhysicalDeliveryOfficeName;
+    public ColumnInfo columnHomePostalAddress() {
+        return _columnHomePostalAddress;
     }
 
-    public ColumnInfo columnDestinationIndicator() {
-        return _columnDestinationIndicator;
+    public ColumnInfo columnInitials() {
+        return _columnInitials;
     }
 
     public ColumnInfo columnInternationaliSDNNumber() {
         return _columnInternationaliSDNNumber;
     }
 
-    public ColumnInfo columnState() {
-        return _columnState;
+    public ColumnInfo columnLabeledURI() {
+        return _columnLabeledURI;
     }
 
-    public ColumnInfo columnEmployeeType() {
-        return _columnEmployeeType;
+    public ColumnInfo columnMail() {
+        return _columnMail;
     }
 
-    public ColumnInfo columnFacsimileTelephoneNumber() {
-        return _columnFacsimileTelephoneNumber;
+    public ColumnInfo columnMobile() {
+        return _columnMobile;
     }
 
-    public ColumnInfo columnPostOfficeBox() {
-        return _columnPostOfficeBox;
+    public ColumnInfo columnName() {
+        return _columnName;
     }
 
-    public ColumnInfo columnInitials() {
-        return _columnInitials;
+    public ColumnInfo columnPager() {
+        return _columnPager;
     }
 
-    public ColumnInfo columnCarLicense() {
-        return _columnCarLicense;
+    public ColumnInfo columnPassword() {
+        return _columnPassword;
     }
 
-    public ColumnInfo columnMobile() {
-        return _columnMobile;
+    public ColumnInfo columnPhysicalDeliveryOfficeName() {
+        return _columnPhysicalDeliveryOfficeName;
+    }
+
+    public ColumnInfo columnPostOfficeBox() {
+        return _columnPostOfficeBox;
     }
 
     public ColumnInfo columnPostalAddress() {
         return _columnPostalAddress;
     }
 
-    public ColumnInfo columnCity() {
-        return _columnCity;
+    public ColumnInfo columnPostalCode() {
+        return _columnPostalCode;
     }
 
-    public ColumnInfo columnTeletexTerminalIdentifier() {
-        return _columnTeletexTerminalIdentifier;
+    public ColumnInfo columnPreferredLanguage() {
+        return _columnPreferredLanguage;
     }
 
-    public ColumnInfo columnX121Address() {
-        return _columnX121Address;
+    public ColumnInfo columnRegisteredAddress() {
+        return _columnRegisteredAddress;
     }
 
-    public ColumnInfo columnBusinessCategory() {
-        return _columnBusinessCategory;
+    public ColumnInfo columnRoles() {
+        return _columnRoles;
     }
 
-    public ColumnInfo columnRegisteredAddress() {
-        return _columnRegisteredAddress;
+    public ColumnInfo columnRoomNumber() {
+        return _columnRoomNumber;
     }
 
-    public ColumnInfo columnDisplayName() {
-        return _columnDisplayName;
+    public ColumnInfo columnState() {
+        return _columnState;
     }
 
-    public ColumnInfo columnPreferredLanguage() {
-        return _columnPreferredLanguage;
+    public ColumnInfo columnStreet() {
+        return _columnStreet;
     }
 
-    public ColumnInfo columnDepartmentNumber() {
-        return _columnDepartmentNumber;
+    public ColumnInfo columnSurname() {
+        return _columnSurname;
     }
 
-    public ColumnInfo columnUidNumber() {
-        return _columnUidNumber;
+    public ColumnInfo columnTelephoneNumber() {
+        return _columnTelephoneNumber;
     }
 
-    public ColumnInfo columnGidNumber() {
-        return _columnGidNumber;
+    public ColumnInfo columnTeletexTerminalIdentifier() {
+        return _columnTeletexTerminalIdentifier;
     }
 
-    public ColumnInfo columnHomeDirectory() {
-        return _columnHomeDirectory;
+    public ColumnInfo columnTitle() {
+        return _columnTitle;
     }
 
-    public ColumnInfo columnGroups() {
-        return _columnGroups;
+    public ColumnInfo columnUidNumber() {
+        return _columnUidNumber;
     }
 
-    public ColumnInfo columnRoles() {
-        return _columnRoles;
+    public ColumnInfo columnX121Address() {
+        return _columnX121Address;
     }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
-        ls.add(columnName());
-        ls.add(columnPassword());
-        ls.add(columnSurname());
-        ls.add(columnGivenName());
+        ls.add(columnBusinessCategory());
+        ls.add(columnCarLicense());
+        ls.add(columnCity());
+        ls.add(columnDepartmentNumber());
+        ls.add(columnDescription());
+        ls.add(columnDestinationIndicator());
+        ls.add(columnDisplayName());
         ls.add(columnEmployeeNumber());
-        ls.add(columnMail());
-        ls.add(columnTelephoneNumber());
+        ls.add(columnEmployeeType());
+        ls.add(columnFacsimileTelephoneNumber());
+        ls.add(columnGidNumber());
+        ls.add(columnGivenName());
+        ls.add(columnGroups());
+        ls.add(columnHomeDirectory());
         ls.add(columnHomePhone());
         ls.add(columnHomePostalAddress());
+        ls.add(columnInitials());
+        ls.add(columnInternationaliSDNNumber());
         ls.add(columnLabeledURI());
-        ls.add(columnRoomNumber());
-        ls.add(columnDescription());
-        ls.add(columnTitle());
+        ls.add(columnMail());
+        ls.add(columnMobile());
+        ls.add(columnName());
         ls.add(columnPager());
-        ls.add(columnStreet());
-        ls.add(columnPostalCode());
+        ls.add(columnPassword());
         ls.add(columnPhysicalDeliveryOfficeName());
-        ls.add(columnDestinationIndicator());
-        ls.add(columnInternationaliSDNNumber());
-        ls.add(columnState());
-        ls.add(columnEmployeeType());
-        ls.add(columnFacsimileTelephoneNumber());
         ls.add(columnPostOfficeBox());
-        ls.add(columnInitials());
-        ls.add(columnCarLicense());
-        ls.add(columnMobile());
         ls.add(columnPostalAddress());
-        ls.add(columnCity());
-        ls.add(columnTeletexTerminalIdentifier());
-        ls.add(columnX121Address());
-        ls.add(columnBusinessCategory());
-        ls.add(columnRegisteredAddress());
-        ls.add(columnDisplayName());
+        ls.add(columnPostalCode());
         ls.add(columnPreferredLanguage());
-        ls.add(columnDepartmentNumber());
-        ls.add(columnUidNumber());
-        ls.add(columnGidNumber());
-        ls.add(columnHomeDirectory());
-        ls.add(columnGroups());
+        ls.add(columnRegisteredAddress());
         ls.add(columnRoles());
+        ls.add(columnRoomNumber());
+        ls.add(columnState());
+        ls.add(columnStreet());
+        ls.add(columnSurname());
+        ls.add(columnTelephoneNumber());
+        ls.add(columnTeletexTerminalIdentifier());
+        ls.add(columnTitle());
+        ls.add(columnUidNumber());
+        ls.add(columnX121Address());
         return ls;
     }
 
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
index 250840cc0146a62f2bd58403e59d78a71c27a6c5..2a109533ede021827564fd0dc99bf0c0cbb8aec6 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
@@ -176,12 +176,12 @@ public class BsGroupCB extends EsAbstractConditionBean {
             doColumn("_id");
         }
 
-        public void columnName() {
-            doColumn("name");
-        }
-
         public void columnGidNumber() {
             doColumn("gidNumber");
         }
+
+        public void columnName() {
+            doColumn("name");
+        }
     }
 }
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
index cefbfe4ce8e20cca4b47c2550b6afca672780cb4..41688cda2becfe2de16e83f3877806e82544f3ba 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
@@ -176,164 +176,164 @@ public class BsUserCB extends EsAbstractConditionBean {
             doColumn("_id");
         }
 
-        public void columnName() {
-            doColumn("name");
-        }
-
-        public void columnPassword() {
-            doColumn("password");
+        public void columnBusinessCategory() {
+            doColumn("businessCategory");
         }
 
-        public void columnSurname() {
-            doColumn("surname");
+        public void columnCarLicense() {
+            doColumn("carLicense");
         }
 
-        public void columnGivenName() {
-            doColumn("givenName");
+        public void columnCity() {
+            doColumn("city");
         }
 
-        public void columnEmployeeNumber() {
-            doColumn("employeeNumber");
+        public void columnDepartmentNumber() {
+            doColumn("departmentNumber");
         }
 
-        public void columnMail() {
-            doColumn("mail");
+        public void columnDescription() {
+            doColumn("description");
         }
 
-        public void columnTelephoneNumber() {
-            doColumn("telephoneNumber");
+        public void columnDestinationIndicator() {
+            doColumn("destinationIndicator");
         }
 
-        public void columnHomePhone() {
-            doColumn("homePhone");
+        public void columnDisplayName() {
+            doColumn("displayName");
         }
 
-        public void columnHomePostalAddress() {
-            doColumn("homePostalAddress");
+        public void columnEmployeeNumber() {
+            doColumn("employeeNumber");
         }
 
-        public void columnLabeledURI() {
-            doColumn("labeledURI");
+        public void columnEmployeeType() {
+            doColumn("employeeType");
         }
 
-        public void columnRoomNumber() {
-            doColumn("roomNumber");
+        public void columnFacsimileTelephoneNumber() {
+            doColumn("facsimileTelephoneNumber");
         }
 
-        public void columnDescription() {
-            doColumn("description");
+        public void columnGidNumber() {
+            doColumn("gidNumber");
         }
 
-        public void columnTitle() {
-            doColumn("title");
+        public void columnGivenName() {
+            doColumn("givenName");
         }
 
-        public void columnPager() {
-            doColumn("pager");
+        public void columnGroups() {
+            doColumn("groups");
         }
 
-        public void columnStreet() {
-            doColumn("street");
+        public void columnHomeDirectory() {
+            doColumn("homeDirectory");
         }
 
-        public void columnPostalCode() {
-            doColumn("postalCode");
+        public void columnHomePhone() {
+            doColumn("homePhone");
         }
 
-        public void columnPhysicalDeliveryOfficeName() {
-            doColumn("physicalDeliveryOfficeName");
+        public void columnHomePostalAddress() {
+            doColumn("homePostalAddress");
         }
 
-        public void columnDestinationIndicator() {
-            doColumn("destinationIndicator");
+        public void columnInitials() {
+            doColumn("initials");
         }
 
         public void columnInternationaliSDNNumber() {
             doColumn("internationaliSDNNumber");
         }
 
-        public void columnState() {
-            doColumn("state");
+        public void columnLabeledURI() {
+            doColumn("labeledURI");
         }
 
-        public void columnEmployeeType() {
-            doColumn("employeeType");
+        public void columnMail() {
+            doColumn("mail");
         }
 
-        public void columnFacsimileTelephoneNumber() {
-            doColumn("facsimileTelephoneNumber");
+        public void columnMobile() {
+            doColumn("mobile");
         }
 
-        public void columnPostOfficeBox() {
-            doColumn("postOfficeBox");
+        public void columnName() {
+            doColumn("name");
         }
 
-        public void columnInitials() {
-            doColumn("initials");
+        public void columnPager() {
+            doColumn("pager");
         }
 
-        public void columnCarLicense() {
-            doColumn("carLicense");
+        public void columnPassword() {
+            doColumn("password");
         }
 
-        public void columnMobile() {
-            doColumn("mobile");
+        public void columnPhysicalDeliveryOfficeName() {
+            doColumn("physicalDeliveryOfficeName");
+        }
+
+        public void columnPostOfficeBox() {
+            doColumn("postOfficeBox");
         }
 
         public void columnPostalAddress() {
             doColumn("postalAddress");
         }
 
-        public void columnCity() {
-            doColumn("city");
+        public void columnPostalCode() {
+            doColumn("postalCode");
         }
 
-        public void columnTeletexTerminalIdentifier() {
-            doColumn("teletexTerminalIdentifier");
+        public void columnPreferredLanguage() {
+            doColumn("preferredLanguage");
         }
 
-        public void columnX121Address() {
-            doColumn("x121Address");
+        public void columnRegisteredAddress() {
+            doColumn("registeredAddress");
         }
 
-        public void columnBusinessCategory() {
-            doColumn("businessCategory");
+        public void columnRoles() {
+            doColumn("roles");
         }
 
-        public void columnRegisteredAddress() {
-            doColumn("registeredAddress");
+        public void columnRoomNumber() {
+            doColumn("roomNumber");
         }
 
-        public void columnDisplayName() {
-            doColumn("displayName");
+        public void columnState() {
+            doColumn("state");
         }
 
-        public void columnPreferredLanguage() {
-            doColumn("preferredLanguage");
+        public void columnStreet() {
+            doColumn("street");
         }
 
-        public void columnDepartmentNumber() {
-            doColumn("departmentNumber");
+        public void columnSurname() {
+            doColumn("surname");
         }
 
-        public void columnUidNumber() {
-            doColumn("uidNumber");
+        public void columnTelephoneNumber() {
+            doColumn("telephoneNumber");
         }
 
-        public void columnGidNumber() {
-            doColumn("gidNumber");
+        public void columnTeletexTerminalIdentifier() {
+            doColumn("teletexTerminalIdentifier");
         }
 
-        public void columnHomeDirectory() {
-            doColumn("homeDirectory");
+        public void columnTitle() {
+            doColumn("title");
         }
 
-        public void columnGroups() {
-            doColumn("groups");
+        public void columnUidNumber() {
+            doColumn("uidNumber");
         }
 
-        public void columnRoles() {
-            doColumn("roles");
+        public void columnX121Address() {
+            doColumn("x121Address");
         }
     }
 }
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 bf72a740bed49a0141e7f069d0dbf90044af03ad..d21064d42188919f88640f5900e2176792f5e2c6 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -106,134 +106,6 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setName_Terms() {
-        setName_Terms(null);
-    }
-
-    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setName_Terms("name", opLambda, null);
-    }
-
-    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
-        setName_Terms("name", opLambda, aggsLambda);
-    }
-
-    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            GroupCA ca = new GroupCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setName_SignificantTerms() {
-        setName_SignificantTerms(null);
-    }
-
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setName_SignificantTerms("name", opLambda, null);
-    }
-
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsGroupCA> aggsLambda) {
-        setName_SignificantTerms("name", opLambda, aggsLambda);
-    }
-
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsGroupCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            GroupCA ca = new GroupCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setName_IpRange() {
-        setName_IpRange(null);
-    }
-
-    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setName_IpRange("name", opLambda, null);
-    }
-
-    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
-        setName_IpRange("name", opLambda, aggsLambda);
-    }
-
-    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            GroupCA ca = new GroupCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setName_Count() {
-        setName_Count(null);
-    }
-
-    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setName_Count("name", opLambda);
-    }
-
-    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Cardinality() {
-        setName_Cardinality(null);
-    }
-
-    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setName_Cardinality("name", opLambda);
-    }
-
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Missing() {
-        setName_Missing(null);
-    }
-
-    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setName_Missing("name", opLambda, null);
-    }
-
-    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
-        setName_Missing("name", opLambda, aggsLambda);
-    }
-
-    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            GroupCA ca = new GroupCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
     public void setGidNumber_Avg() {
         setGidNumber_Avg(null);
     }
@@ -339,16 +211,16 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setGidNumber_PercentileRanks() {
-        setGidNumber_PercentileRanks(null);
+    public void setGidNumber_PercentileRanks(double[] values) {
+        setGidNumber_PercentileRanks(values, null);
     }
 
-    public void setGidNumber_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setGidNumber_PercentileRanks("gidNumber", opLambda);
+    public void setGidNumber_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setGidNumber_PercentileRanks("gidNumber", values, opLambda);
     }
 
-    public void setGidNumber_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "gidNumber");
+    public void setGidNumber_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "gidNumber", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,4 +330,132 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         }
     }
 
+    public void setName_Terms() {
+        setName_Terms(null);
+    }
+
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setName_Terms("name", opLambda, null);
+    }
+
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+        setName_Terms("name", opLambda, aggsLambda);
+    }
+
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            GroupCA ca = new GroupCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setName_SignificantTerms() {
+        setName_SignificantTerms(null);
+    }
+
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setName_SignificantTerms("name", opLambda, null);
+    }
+
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsGroupCA> aggsLambda) {
+        setName_SignificantTerms("name", opLambda, aggsLambda);
+    }
+
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsGroupCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            GroupCA ca = new GroupCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setName_IpRange() {
+        setName_IpRange(null);
+    }
+
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setName_IpRange("name", opLambda, null);
+    }
+
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+        setName_IpRange("name", opLambda, aggsLambda);
+    }
+
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            GroupCA ca = new GroupCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setName_Count() {
+        setName_Count(null);
+    }
+
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setName_Count("name", opLambda);
+    }
+
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setName_Cardinality() {
+        setName_Cardinality(null);
+    }
+
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setName_Cardinality("name", opLambda);
+    }
+
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setName_Missing() {
+        setName_Missing(null);
+    }
+
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setName_Missing("name", opLambda, null);
+    }
+
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+        setName_Missing("name", opLambda, aggsLambda);
+    }
+
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            GroupCA ca = new GroupCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
 }
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 860c4be2824b67845161e45a1bea444631320d78..2fc784d1d5c984f9cb22c151742107907a27ac34 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
@@ -23,7 +23,7 @@ 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.GlobalAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
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 d44bb79830dd4b5271c737e0d338eb9c22108966..16f18c2affcd3e15e33d7b9095a9384fe490c6c0 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
@@ -24,8 +24,8 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 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.IpRangeAggregationBuilder;
 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.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
@@ -106,20 +106,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setName_Terms() {
-        setName_Terms(null);
+    public void setBusinessCategory_Terms() {
+        setBusinessCategory_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setName_Terms("name", opLambda, null);
+    public void setBusinessCategory_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setBusinessCategory_Terms("businessCategory", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setName_Terms("name", opLambda, aggsLambda);
+    public void setBusinessCategory_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setBusinessCategory_Terms("businessCategory", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "name");
+    public void setBusinessCategory_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "businessCategory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -130,21 +131,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setName_SignificantTerms() {
-        setName_SignificantTerms(null);
+    public void setBusinessCategory_SignificantTerms() {
+        setBusinessCategory_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setName_SignificantTerms("name", opLambda, null);
+    public void setBusinessCategory_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setBusinessCategory_SignificantTerms("businessCategory", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setName_SignificantTerms("name", opLambda, aggsLambda);
+    public void setBusinessCategory_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        setBusinessCategory_SignificantTerms("businessCategory", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setBusinessCategory_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "businessCategory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -155,20 +157,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setName_IpRange() {
-        setName_IpRange(null);
+    public void setBusinessCategory_IpRange() {
+        setBusinessCategory_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setName_IpRange("name", opLambda, null);
+    public void setBusinessCategory_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setBusinessCategory_IpRange("businessCategory", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setName_IpRange("name", opLambda, aggsLambda);
+    public void setBusinessCategory_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setBusinessCategory_IpRange("businessCategory", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
+    public void setBusinessCategory_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "businessCategory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -179,50 +182,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setName_Count() {
-        setName_Count(null);
+    public void setBusinessCategory_Count() {
+        setBusinessCategory_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setName_Count("name", opLambda);
+    public void setBusinessCategory_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setBusinessCategory_Count("businessCategory", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "name");
+    public void setBusinessCategory_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "businessCategory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Cardinality() {
-        setName_Cardinality(null);
+    public void setBusinessCategory_Cardinality() {
+        setBusinessCategory_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setName_Cardinality("name", opLambda);
+    public void setBusinessCategory_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setBusinessCategory_Cardinality("businessCategory", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
+    public void setBusinessCategory_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "businessCategory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Missing() {
-        setName_Missing(null);
+    public void setBusinessCategory_Missing() {
+        setBusinessCategory_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setName_Missing("name", opLambda, null);
+    public void setBusinessCategory_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setBusinessCategory_Missing("businessCategory", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setName_Missing("name", opLambda, aggsLambda);
+    public void setBusinessCategory_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setBusinessCategory_Missing("businessCategory", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "name");
+    public void setBusinessCategory_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "businessCategory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -233,20 +237,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPassword_Terms() {
-        setPassword_Terms(null);
+    public void setCarLicense_Terms() {
+        setCarLicense_Terms(null);
     }
 
-    public void setPassword_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setPassword_Terms("password", opLambda, null);
+    public void setCarLicense_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setCarLicense_Terms("carLicense", opLambda, null);
     }
 
-    public void setPassword_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPassword_Terms("password", opLambda, aggsLambda);
+    public void setCarLicense_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setCarLicense_Terms("carLicense", opLambda, aggsLambda);
     }
 
-    public void setPassword_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "password");
+    public void setCarLicense_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "carLicense");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -257,22 +261,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPassword_SignificantTerms() {
-        setPassword_SignificantTerms(null);
+    public void setCarLicense_SignificantTerms() {
+        setCarLicense_SignificantTerms(null);
     }
 
-    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setPassword_SignificantTerms("password", opLambda, null);
+    public void setCarLicense_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setCarLicense_SignificantTerms("carLicense", opLambda, null);
     }
 
-    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setCarLicense_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setPassword_SignificantTerms("password", opLambda, aggsLambda);
+        setCarLicense_SignificantTerms("carLicense", opLambda, aggsLambda);
     }
 
-    public void setPassword_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setCarLicense_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "password");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "carLicense");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -283,20 +287,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPassword_IpRange() {
-        setPassword_IpRange(null);
+    public void setCarLicense_IpRange() {
+        setCarLicense_IpRange(null);
     }
 
-    public void setPassword_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setPassword_IpRange("password", opLambda, null);
+    public void setCarLicense_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setCarLicense_IpRange("carLicense", opLambda, null);
     }
 
-    public void setPassword_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPassword_IpRange("password", opLambda, aggsLambda);
+    public void setCarLicense_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setCarLicense_IpRange("carLicense", opLambda, aggsLambda);
     }
 
-    public void setPassword_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "password");
+    public void setCarLicense_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "carLicense");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -307,50 +312,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPassword_Count() {
-        setPassword_Count(null);
+    public void setCarLicense_Count() {
+        setCarLicense_Count(null);
     }
 
-    public void setPassword_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setPassword_Count("password", opLambda);
+    public void setCarLicense_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setCarLicense_Count("carLicense", opLambda);
     }
 
-    public void setPassword_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "password");
+    public void setCarLicense_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "carLicense");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_Cardinality() {
-        setPassword_Cardinality(null);
+    public void setCarLicense_Cardinality() {
+        setCarLicense_Cardinality(null);
     }
 
-    public void setPassword_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setPassword_Cardinality("password", opLambda);
+    public void setCarLicense_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setCarLicense_Cardinality("carLicense", opLambda);
     }
 
-    public void setPassword_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "password");
+    public void setCarLicense_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "carLicense");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_Missing() {
-        setPassword_Missing(null);
+    public void setCarLicense_Missing() {
+        setCarLicense_Missing(null);
     }
 
-    public void setPassword_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setPassword_Missing("password", opLambda, null);
+    public void setCarLicense_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setCarLicense_Missing("carLicense", opLambda, null);
     }
 
-    public void setPassword_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPassword_Missing("password", opLambda, aggsLambda);
+    public void setCarLicense_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setCarLicense_Missing("carLicense", opLambda, aggsLambda);
     }
 
-    public void setPassword_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "password");
+    public void setCarLicense_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "carLicense");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -361,20 +367,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSurname_Terms() {
-        setSurname_Terms(null);
+    public void setCity_Terms() {
+        setCity_Terms(null);
     }
 
-    public void setSurname_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setSurname_Terms("surname", opLambda, null);
+    public void setCity_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setCity_Terms("city", opLambda, null);
     }
 
-    public void setSurname_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setSurname_Terms("surname", opLambda, aggsLambda);
+    public void setCity_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setCity_Terms("city", opLambda, aggsLambda);
     }
 
-    public void setSurname_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "surname");
+    public void setCity_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "city");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -385,22 +391,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSurname_SignificantTerms() {
-        setSurname_SignificantTerms(null);
+    public void setCity_SignificantTerms() {
+        setCity_SignificantTerms(null);
     }
 
-    public void setSurname_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setSurname_SignificantTerms("surname", opLambda, null);
+    public void setCity_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setCity_SignificantTerms("city", opLambda, null);
     }
 
-    public void setSurname_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        setSurname_SignificantTerms("surname", opLambda, aggsLambda);
+    public void setCity_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setCity_SignificantTerms("city", opLambda, aggsLambda);
     }
 
-    public void setSurname_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setCity_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "surname");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "city");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -411,20 +416,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSurname_IpRange() {
-        setSurname_IpRange(null);
+    public void setCity_IpRange() {
+        setCity_IpRange(null);
     }
 
-    public void setSurname_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setSurname_IpRange("surname", opLambda, null);
+    public void setCity_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setCity_IpRange("city", opLambda, null);
     }
 
-    public void setSurname_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setSurname_IpRange("surname", opLambda, aggsLambda);
+    public void setCity_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setCity_IpRange("city", opLambda, aggsLambda);
     }
 
-    public void setSurname_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "surname");
+    public void setCity_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "city");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -435,50 +440,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setSurname_Count() {
-        setSurname_Count(null);
+    public void setCity_Count() {
+        setCity_Count(null);
     }
 
-    public void setSurname_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setSurname_Count("surname", opLambda);
+    public void setCity_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setCity_Count("city", opLambda);
     }
 
-    public void setSurname_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "surname");
+    public void setCity_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "city");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_Cardinality() {
-        setSurname_Cardinality(null);
+    public void setCity_Cardinality() {
+        setCity_Cardinality(null);
     }
 
-    public void setSurname_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setSurname_Cardinality("surname", opLambda);
+    public void setCity_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setCity_Cardinality("city", opLambda);
     }
 
-    public void setSurname_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "surname");
+    public void setCity_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "city");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_Missing() {
-        setSurname_Missing(null);
+    public void setCity_Missing() {
+        setCity_Missing(null);
     }
 
-    public void setSurname_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setSurname_Missing("surname", opLambda, null);
+    public void setCity_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setCity_Missing("city", opLambda, null);
     }
 
-    public void setSurname_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setSurname_Missing("surname", opLambda, aggsLambda);
+    public void setCity_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setCity_Missing("city", opLambda, aggsLambda);
     }
 
-    public void setSurname_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "surname");
+    public void setCity_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "city");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -489,20 +494,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setGivenName_Terms() {
-        setGivenName_Terms(null);
+    public void setDepartmentNumber_Terms() {
+        setDepartmentNumber_Terms(null);
     }
 
-    public void setGivenName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setGivenName_Terms("givenName", opLambda, null);
+    public void setDepartmentNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setDepartmentNumber_Terms("departmentNumber", opLambda, null);
     }
 
-    public void setGivenName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setGivenName_Terms("givenName", opLambda, aggsLambda);
+    public void setDepartmentNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setDepartmentNumber_Terms("departmentNumber", opLambda, aggsLambda);
     }
 
-    public void setGivenName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "givenName");
+    public void setDepartmentNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "departmentNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -513,22 +519,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setGivenName_SignificantTerms() {
-        setGivenName_SignificantTerms(null);
+    public void setDepartmentNumber_SignificantTerms() {
+        setDepartmentNumber_SignificantTerms(null);
     }
 
-    public void setGivenName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setGivenName_SignificantTerms("givenName", opLambda, null);
+    public void setDepartmentNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setDepartmentNumber_SignificantTerms("departmentNumber", opLambda, null);
     }
 
-    public void setGivenName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setDepartmentNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setGivenName_SignificantTerms("givenName", opLambda, aggsLambda);
+        setDepartmentNumber_SignificantTerms("departmentNumber", opLambda, aggsLambda);
     }
 
-    public void setGivenName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setDepartmentNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "givenName");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "departmentNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -539,20 +545,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setGivenName_IpRange() {
-        setGivenName_IpRange(null);
+    public void setDepartmentNumber_IpRange() {
+        setDepartmentNumber_IpRange(null);
     }
 
-    public void setGivenName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setGivenName_IpRange("givenName", opLambda, null);
+    public void setDepartmentNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setDepartmentNumber_IpRange("departmentNumber", opLambda, null);
     }
 
-    public void setGivenName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setGivenName_IpRange("givenName", opLambda, aggsLambda);
+    public void setDepartmentNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setDepartmentNumber_IpRange("departmentNumber", opLambda, aggsLambda);
     }
 
-    public void setGivenName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "givenName");
+    public void setDepartmentNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "departmentNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -563,50 +570,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setGivenName_Count() {
-        setGivenName_Count(null);
+    public void setDepartmentNumber_Count() {
+        setDepartmentNumber_Count(null);
     }
 
-    public void setGivenName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setGivenName_Count("givenName", opLambda);
+    public void setDepartmentNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setDepartmentNumber_Count("departmentNumber", opLambda);
     }
 
-    public void setGivenName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "givenName");
+    public void setDepartmentNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "departmentNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_Cardinality() {
-        setGivenName_Cardinality(null);
+    public void setDepartmentNumber_Cardinality() {
+        setDepartmentNumber_Cardinality(null);
     }
 
-    public void setGivenName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setGivenName_Cardinality("givenName", opLambda);
+    public void setDepartmentNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setDepartmentNumber_Cardinality("departmentNumber", opLambda);
     }
 
-    public void setGivenName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "givenName");
+    public void setDepartmentNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "departmentNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_Missing() {
-        setGivenName_Missing(null);
+    public void setDepartmentNumber_Missing() {
+        setDepartmentNumber_Missing(null);
     }
 
-    public void setGivenName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setGivenName_Missing("givenName", opLambda, null);
+    public void setDepartmentNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setDepartmentNumber_Missing("departmentNumber", opLambda, null);
     }
 
-    public void setGivenName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setGivenName_Missing("givenName", opLambda, aggsLambda);
+    public void setDepartmentNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setDepartmentNumber_Missing("departmentNumber", opLambda, aggsLambda);
     }
 
-    public void setGivenName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "givenName");
+    public void setDepartmentNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "departmentNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -617,21 +625,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setEmployeeNumber_Terms() {
-        setEmployeeNumber_Terms(null);
+    public void setDescription_Terms() {
+        setDescription_Terms(null);
     }
 
-    public void setEmployeeNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setEmployeeNumber_Terms("employeeNumber", opLambda, null);
+    public void setDescription_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setDescription_Terms("description", opLambda, null);
     }
 
-    public void setEmployeeNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setEmployeeNumber_Terms("employeeNumber", opLambda, aggsLambda);
+    public void setDescription_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setDescription_Terms("description", opLambda, aggsLambda);
     }
 
-    public void setEmployeeNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "employeeNumber");
+    public void setDescription_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "description");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -642,22 +649,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setEmployeeNumber_SignificantTerms() {
-        setEmployeeNumber_SignificantTerms(null);
+    public void setDescription_SignificantTerms() {
+        setDescription_SignificantTerms(null);
     }
 
-    public void setEmployeeNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setEmployeeNumber_SignificantTerms("employeeNumber", opLambda, null);
+    public void setDescription_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setDescription_SignificantTerms("description", opLambda, null);
     }
 
-    public void setEmployeeNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setDescription_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setEmployeeNumber_SignificantTerms("employeeNumber", opLambda, aggsLambda);
+        setDescription_SignificantTerms("description", opLambda, aggsLambda);
     }
 
-    public void setEmployeeNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setDescription_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "employeeNumber");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "description");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -668,21 +675,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setEmployeeNumber_IpRange() {
-        setEmployeeNumber_IpRange(null);
+    public void setDescription_IpRange() {
+        setDescription_IpRange(null);
     }
 
-    public void setEmployeeNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setEmployeeNumber_IpRange("employeeNumber", opLambda, null);
+    public void setDescription_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setDescription_IpRange("description", opLambda, null);
     }
 
-    public void setEmployeeNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setEmployeeNumber_IpRange("employeeNumber", opLambda, aggsLambda);
+    public void setDescription_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setDescription_IpRange("description", opLambda, aggsLambda);
     }
 
-    public void setEmployeeNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setDescription_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "employeeNumber");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "description");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -693,51 +700,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setEmployeeNumber_Count() {
-        setEmployeeNumber_Count(null);
+    public void setDescription_Count() {
+        setDescription_Count(null);
     }
 
-    public void setEmployeeNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setEmployeeNumber_Count("employeeNumber", opLambda);
+    public void setDescription_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setDescription_Count("description", opLambda);
     }
 
-    public void setEmployeeNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "employeeNumber");
+    public void setDescription_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "description");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_Cardinality() {
-        setEmployeeNumber_Cardinality(null);
+    public void setDescription_Cardinality() {
+        setDescription_Cardinality(null);
     }
 
-    public void setEmployeeNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setEmployeeNumber_Cardinality("employeeNumber", opLambda);
+    public void setDescription_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setDescription_Cardinality("description", opLambda);
     }
 
-    public void setEmployeeNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "employeeNumber");
+    public void setDescription_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "description");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_Missing() {
-        setEmployeeNumber_Missing(null);
+    public void setDescription_Missing() {
+        setDescription_Missing(null);
     }
 
-    public void setEmployeeNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setEmployeeNumber_Missing("employeeNumber", opLambda, null);
+    public void setDescription_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setDescription_Missing("description", opLambda, null);
     }
 
-    public void setEmployeeNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setEmployeeNumber_Missing("employeeNumber", opLambda, aggsLambda);
+    public void setDescription_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setDescription_Missing("description", opLambda, aggsLambda);
     }
 
-    public void setEmployeeNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setDescription_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "employeeNumber");
+        MissingAggregationBuilder builder = regMissingA(name, "description");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -748,20 +755,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setMail_Terms() {
-        setMail_Terms(null);
+    public void setDestinationIndicator_Terms() {
+        setDestinationIndicator_Terms(null);
     }
 
-    public void setMail_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setMail_Terms("mail", opLambda, null);
+    public void setDestinationIndicator_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setDestinationIndicator_Terms("destinationIndicator", opLambda, null);
     }
 
-    public void setMail_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setMail_Terms("mail", opLambda, aggsLambda);
+    public void setDestinationIndicator_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setDestinationIndicator_Terms("destinationIndicator", opLambda, aggsLambda);
     }
 
-    public void setMail_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "mail");
+    public void setDestinationIndicator_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "destinationIndicator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -772,21 +780,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setMail_SignificantTerms() {
-        setMail_SignificantTerms(null);
+    public void setDestinationIndicator_SignificantTerms() {
+        setDestinationIndicator_SignificantTerms(null);
     }
 
-    public void setMail_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setMail_SignificantTerms("mail", opLambda, null);
+    public void setDestinationIndicator_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setDestinationIndicator_SignificantTerms("destinationIndicator", opLambda, null);
     }
 
-    public void setMail_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setMail_SignificantTerms("mail", opLambda, aggsLambda);
+    public void setDestinationIndicator_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        setDestinationIndicator_SignificantTerms("destinationIndicator", opLambda, aggsLambda);
     }
 
-    public void setMail_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setDestinationIndicator_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "mail");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "destinationIndicator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -797,20 +806,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setMail_IpRange() {
-        setMail_IpRange(null);
+    public void setDestinationIndicator_IpRange() {
+        setDestinationIndicator_IpRange(null);
     }
 
-    public void setMail_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setMail_IpRange("mail", opLambda, null);
+    public void setDestinationIndicator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setDestinationIndicator_IpRange("destinationIndicator", opLambda, null);
     }
 
-    public void setMail_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setMail_IpRange("mail", opLambda, aggsLambda);
+    public void setDestinationIndicator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setDestinationIndicator_IpRange("destinationIndicator", opLambda, aggsLambda);
     }
 
-    public void setMail_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "mail");
+    public void setDestinationIndicator_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "destinationIndicator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -821,50 +831,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setMail_Count() {
-        setMail_Count(null);
+    public void setDestinationIndicator_Count() {
+        setDestinationIndicator_Count(null);
     }
 
-    public void setMail_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setMail_Count("mail", opLambda);
+    public void setDestinationIndicator_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setDestinationIndicator_Count("destinationIndicator", opLambda);
     }
 
-    public void setMail_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "mail");
+    public void setDestinationIndicator_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "destinationIndicator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_Cardinality() {
-        setMail_Cardinality(null);
+    public void setDestinationIndicator_Cardinality() {
+        setDestinationIndicator_Cardinality(null);
     }
 
-    public void setMail_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setMail_Cardinality("mail", opLambda);
+    public void setDestinationIndicator_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setDestinationIndicator_Cardinality("destinationIndicator", opLambda);
     }
 
-    public void setMail_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "mail");
+    public void setDestinationIndicator_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "destinationIndicator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_Missing() {
-        setMail_Missing(null);
+    public void setDestinationIndicator_Missing() {
+        setDestinationIndicator_Missing(null);
     }
 
-    public void setMail_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setMail_Missing("mail", opLambda, null);
+    public void setDestinationIndicator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setDestinationIndicator_Missing("destinationIndicator", opLambda, null);
     }
 
-    public void setMail_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setMail_Missing("mail", opLambda, aggsLambda);
+    public void setDestinationIndicator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setDestinationIndicator_Missing("destinationIndicator", opLambda, aggsLambda);
     }
 
-    public void setMail_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "mail");
+    public void setDestinationIndicator_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "destinationIndicator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -875,21 +886,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTelephoneNumber_Terms() {
-        setTelephoneNumber_Terms(null);
+    public void setDisplayName_Terms() {
+        setDisplayName_Terms(null);
     }
 
-    public void setTelephoneNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setTelephoneNumber_Terms("telephoneNumber", opLambda, null);
+    public void setDisplayName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setDisplayName_Terms("displayName", opLambda, null);
     }
 
-    public void setTelephoneNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setTelephoneNumber_Terms("telephoneNumber", opLambda, aggsLambda);
+    public void setDisplayName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setDisplayName_Terms("displayName", opLambda, aggsLambda);
     }
 
-    public void setTelephoneNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "telephoneNumber");
+    public void setDisplayName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "displayName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -900,22 +910,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTelephoneNumber_SignificantTerms() {
-        setTelephoneNumber_SignificantTerms(null);
+    public void setDisplayName_SignificantTerms() {
+        setDisplayName_SignificantTerms(null);
     }
 
-    public void setTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setTelephoneNumber_SignificantTerms("telephoneNumber", opLambda, null);
+    public void setDisplayName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setDisplayName_SignificantTerms("displayName", opLambda, null);
     }
 
-    public void setTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setDisplayName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setTelephoneNumber_SignificantTerms("telephoneNumber", opLambda, aggsLambda);
+        setDisplayName_SignificantTerms("displayName", opLambda, aggsLambda);
     }
 
-    public void setTelephoneNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setDisplayName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "telephoneNumber");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "displayName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -926,21 +936,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTelephoneNumber_IpRange() {
-        setTelephoneNumber_IpRange(null);
+    public void setDisplayName_IpRange() {
+        setDisplayName_IpRange(null);
     }
 
-    public void setTelephoneNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setTelephoneNumber_IpRange("telephoneNumber", opLambda, null);
+    public void setDisplayName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setDisplayName_IpRange("displayName", opLambda, null);
     }
 
-    public void setTelephoneNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setTelephoneNumber_IpRange("telephoneNumber", opLambda, aggsLambda);
+    public void setDisplayName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setDisplayName_IpRange("displayName", opLambda, aggsLambda);
     }
 
-    public void setTelephoneNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setDisplayName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "telephoneNumber");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "displayName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -951,51 +961,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTelephoneNumber_Count() {
-        setTelephoneNumber_Count(null);
+    public void setDisplayName_Count() {
+        setDisplayName_Count(null);
     }
 
-    public void setTelephoneNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setTelephoneNumber_Count("telephoneNumber", opLambda);
+    public void setDisplayName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setDisplayName_Count("displayName", opLambda);
     }
 
-    public void setTelephoneNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "telephoneNumber");
+    public void setDisplayName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "displayName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_Cardinality() {
-        setTelephoneNumber_Cardinality(null);
+    public void setDisplayName_Cardinality() {
+        setDisplayName_Cardinality(null);
     }
 
-    public void setTelephoneNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setTelephoneNumber_Cardinality("telephoneNumber", opLambda);
+    public void setDisplayName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setDisplayName_Cardinality("displayName", opLambda);
     }
 
-    public void setTelephoneNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "telephoneNumber");
+    public void setDisplayName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "displayName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_Missing() {
-        setTelephoneNumber_Missing(null);
+    public void setDisplayName_Missing() {
+        setDisplayName_Missing(null);
     }
 
-    public void setTelephoneNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setTelephoneNumber_Missing("telephoneNumber", opLambda, null);
+    public void setDisplayName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setDisplayName_Missing("displayName", opLambda, null);
     }
 
-    public void setTelephoneNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setTelephoneNumber_Missing("telephoneNumber", opLambda, aggsLambda);
+    public void setDisplayName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setDisplayName_Missing("displayName", opLambda, aggsLambda);
     }
 
-    public void setTelephoneNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setDisplayName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "telephoneNumber");
+        MissingAggregationBuilder builder = regMissingA(name, "displayName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1006,20 +1016,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setHomePhone_Terms() {
-        setHomePhone_Terms(null);
+    public void setEmployeeNumber_Terms() {
+        setEmployeeNumber_Terms(null);
     }
 
-    public void setHomePhone_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setHomePhone_Terms("homePhone", opLambda, null);
+    public void setEmployeeNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setEmployeeNumber_Terms("employeeNumber", opLambda, null);
     }
 
-    public void setHomePhone_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setHomePhone_Terms("homePhone", opLambda, aggsLambda);
+    public void setEmployeeNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setEmployeeNumber_Terms("employeeNumber", opLambda, aggsLambda);
     }
 
-    public void setHomePhone_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "homePhone");
+    public void setEmployeeNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "employeeNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1030,22 +1041,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setHomePhone_SignificantTerms() {
-        setHomePhone_SignificantTerms(null);
+    public void setEmployeeNumber_SignificantTerms() {
+        setEmployeeNumber_SignificantTerms(null);
     }
 
-    public void setHomePhone_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setHomePhone_SignificantTerms("homePhone", opLambda, null);
+    public void setEmployeeNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setEmployeeNumber_SignificantTerms("employeeNumber", opLambda, null);
     }
 
-    public void setHomePhone_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setEmployeeNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setHomePhone_SignificantTerms("homePhone", opLambda, aggsLambda);
+        setEmployeeNumber_SignificantTerms("employeeNumber", opLambda, aggsLambda);
     }
 
-    public void setHomePhone_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setEmployeeNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "homePhone");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "employeeNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1056,20 +1067,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setHomePhone_IpRange() {
-        setHomePhone_IpRange(null);
+    public void setEmployeeNumber_IpRange() {
+        setEmployeeNumber_IpRange(null);
     }
 
-    public void setHomePhone_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setHomePhone_IpRange("homePhone", opLambda, null);
+    public void setEmployeeNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setEmployeeNumber_IpRange("employeeNumber", opLambda, null);
     }
 
-    public void setHomePhone_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setHomePhone_IpRange("homePhone", opLambda, aggsLambda);
+    public void setEmployeeNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setEmployeeNumber_IpRange("employeeNumber", opLambda, aggsLambda);
     }
 
-    public void setHomePhone_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "homePhone");
+    public void setEmployeeNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "employeeNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1080,50 +1092,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setHomePhone_Count() {
-        setHomePhone_Count(null);
+    public void setEmployeeNumber_Count() {
+        setEmployeeNumber_Count(null);
     }
 
-    public void setHomePhone_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setHomePhone_Count("homePhone", opLambda);
+    public void setEmployeeNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setEmployeeNumber_Count("employeeNumber", opLambda);
     }
 
-    public void setHomePhone_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "homePhone");
+    public void setEmployeeNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "employeeNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_Cardinality() {
-        setHomePhone_Cardinality(null);
+    public void setEmployeeNumber_Cardinality() {
+        setEmployeeNumber_Cardinality(null);
     }
 
-    public void setHomePhone_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setHomePhone_Cardinality("homePhone", opLambda);
+    public void setEmployeeNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setEmployeeNumber_Cardinality("employeeNumber", opLambda);
     }
 
-    public void setHomePhone_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "homePhone");
+    public void setEmployeeNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "employeeNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_Missing() {
-        setHomePhone_Missing(null);
+    public void setEmployeeNumber_Missing() {
+        setEmployeeNumber_Missing(null);
     }
 
-    public void setHomePhone_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setHomePhone_Missing("homePhone", opLambda, null);
+    public void setEmployeeNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setEmployeeNumber_Missing("employeeNumber", opLambda, null);
     }
 
-    public void setHomePhone_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setHomePhone_Missing("homePhone", opLambda, aggsLambda);
+    public void setEmployeeNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setEmployeeNumber_Missing("employeeNumber", opLambda, aggsLambda);
     }
 
-    public void setHomePhone_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "homePhone");
+    public void setEmployeeNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "employeeNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1134,21 +1147,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setHomePostalAddress_Terms() {
-        setHomePostalAddress_Terms(null);
+    public void setEmployeeType_Terms() {
+        setEmployeeType_Terms(null);
     }
 
-    public void setHomePostalAddress_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setHomePostalAddress_Terms("homePostalAddress", opLambda, null);
+    public void setEmployeeType_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setEmployeeType_Terms("employeeType", opLambda, null);
     }
 
-    public void setHomePostalAddress_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setHomePostalAddress_Terms("homePostalAddress", opLambda, aggsLambda);
+    public void setEmployeeType_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setEmployeeType_Terms("employeeType", opLambda, aggsLambda);
     }
 
-    public void setHomePostalAddress_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "homePostalAddress");
+    public void setEmployeeType_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "employeeType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1159,22 +1171,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setHomePostalAddress_SignificantTerms() {
-        setHomePostalAddress_SignificantTerms(null);
+    public void setEmployeeType_SignificantTerms() {
+        setEmployeeType_SignificantTerms(null);
     }
 
-    public void setHomePostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setHomePostalAddress_SignificantTerms("homePostalAddress", opLambda, null);
+    public void setEmployeeType_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setEmployeeType_SignificantTerms("employeeType", opLambda, null);
     }
 
-    public void setHomePostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setEmployeeType_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setHomePostalAddress_SignificantTerms("homePostalAddress", opLambda, aggsLambda);
+        setEmployeeType_SignificantTerms("employeeType", opLambda, aggsLambda);
     }
 
-    public void setHomePostalAddress_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setEmployeeType_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "homePostalAddress");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "employeeType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1185,21 +1197,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setHomePostalAddress_IpRange() {
-        setHomePostalAddress_IpRange(null);
+    public void setEmployeeType_IpRange() {
+        setEmployeeType_IpRange(null);
     }
 
-    public void setHomePostalAddress_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setHomePostalAddress_IpRange("homePostalAddress", opLambda, null);
+    public void setEmployeeType_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setEmployeeType_IpRange("employeeType", opLambda, null);
     }
 
-    public void setHomePostalAddress_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setHomePostalAddress_IpRange("homePostalAddress", opLambda, aggsLambda);
+    public void setEmployeeType_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setEmployeeType_IpRange("employeeType", opLambda, aggsLambda);
     }
 
-    public void setHomePostalAddress_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setEmployeeType_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "homePostalAddress");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "employeeType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1210,51 +1222,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setHomePostalAddress_Count() {
-        setHomePostalAddress_Count(null);
+    public void setEmployeeType_Count() {
+        setEmployeeType_Count(null);
     }
 
-    public void setHomePostalAddress_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setHomePostalAddress_Count("homePostalAddress", opLambda);
+    public void setEmployeeType_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setEmployeeType_Count("employeeType", opLambda);
     }
 
-    public void setHomePostalAddress_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "homePostalAddress");
+    public void setEmployeeType_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "employeeType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_Cardinality() {
-        setHomePostalAddress_Cardinality(null);
+    public void setEmployeeType_Cardinality() {
+        setEmployeeType_Cardinality(null);
     }
 
-    public void setHomePostalAddress_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setHomePostalAddress_Cardinality("homePostalAddress", opLambda);
+    public void setEmployeeType_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setEmployeeType_Cardinality("employeeType", opLambda);
     }
 
-    public void setHomePostalAddress_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "homePostalAddress");
+    public void setEmployeeType_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "employeeType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_Missing() {
-        setHomePostalAddress_Missing(null);
+    public void setEmployeeType_Missing() {
+        setEmployeeType_Missing(null);
     }
 
-    public void setHomePostalAddress_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setHomePostalAddress_Missing("homePostalAddress", opLambda, null);
+    public void setEmployeeType_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setEmployeeType_Missing("employeeType", opLambda, null);
     }
 
-    public void setHomePostalAddress_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setHomePostalAddress_Missing("homePostalAddress", opLambda, aggsLambda);
+    public void setEmployeeType_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setEmployeeType_Missing("employeeType", opLambda, aggsLambda);
     }
 
-    public void setHomePostalAddress_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setEmployeeType_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "homePostalAddress");
+        MissingAggregationBuilder builder = regMissingA(name, "employeeType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1265,20 +1277,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setLabeledURI_Terms() {
-        setLabeledURI_Terms(null);
+    public void setFacsimileTelephoneNumber_Terms() {
+        setFacsimileTelephoneNumber_Terms(null);
     }
 
-    public void setLabeledURI_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setLabeledURI_Terms("labeledURI", opLambda, null);
+    public void setFacsimileTelephoneNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setFacsimileTelephoneNumber_Terms("facsimileTelephoneNumber", opLambda, null);
     }
 
-    public void setLabeledURI_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setLabeledURI_Terms("labeledURI", opLambda, aggsLambda);
+    public void setFacsimileTelephoneNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setFacsimileTelephoneNumber_Terms("facsimileTelephoneNumber", opLambda, aggsLambda);
     }
 
-    public void setLabeledURI_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "labeledURI");
+    public void setFacsimileTelephoneNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "facsimileTelephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1289,22 +1302,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setLabeledURI_SignificantTerms() {
-        setLabeledURI_SignificantTerms(null);
+    public void setFacsimileTelephoneNumber_SignificantTerms() {
+        setFacsimileTelephoneNumber_SignificantTerms(null);
     }
 
-    public void setLabeledURI_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setLabeledURI_SignificantTerms("labeledURI", opLambda, null);
+    public void setFacsimileTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setFacsimileTelephoneNumber_SignificantTerms("facsimileTelephoneNumber", opLambda, null);
     }
 
-    public void setLabeledURI_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setFacsimileTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setLabeledURI_SignificantTerms("labeledURI", opLambda, aggsLambda);
+        setFacsimileTelephoneNumber_SignificantTerms("facsimileTelephoneNumber", opLambda, aggsLambda);
     }
 
-    public void setLabeledURI_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setFacsimileTelephoneNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "labeledURI");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "facsimileTelephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1315,21 +1328,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setLabeledURI_IpRange() {
-        setLabeledURI_IpRange(null);
+    public void setFacsimileTelephoneNumber_IpRange() {
+        setFacsimileTelephoneNumber_IpRange(null);
     }
 
-    public void setLabeledURI_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setLabeledURI_IpRange("labeledURI", opLambda, null);
+    public void setFacsimileTelephoneNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setFacsimileTelephoneNumber_IpRange("facsimileTelephoneNumber", opLambda, null);
     }
 
-    public void setLabeledURI_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setLabeledURI_IpRange("labeledURI", opLambda, aggsLambda);
+    public void setFacsimileTelephoneNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        setFacsimileTelephoneNumber_IpRange("facsimileTelephoneNumber", opLambda, aggsLambda);
     }
 
-    public void setLabeledURI_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setFacsimileTelephoneNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "labeledURI");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "facsimileTelephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1340,51 +1354,52 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setLabeledURI_Count() {
-        setLabeledURI_Count(null);
+    public void setFacsimileTelephoneNumber_Count() {
+        setFacsimileTelephoneNumber_Count(null);
     }
 
-    public void setLabeledURI_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setLabeledURI_Count("labeledURI", opLambda);
+    public void setFacsimileTelephoneNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setFacsimileTelephoneNumber_Count("facsimileTelephoneNumber", opLambda);
     }
 
-    public void setLabeledURI_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "labeledURI");
+    public void setFacsimileTelephoneNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "facsimileTelephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_Cardinality() {
-        setLabeledURI_Cardinality(null);
+    public void setFacsimileTelephoneNumber_Cardinality() {
+        setFacsimileTelephoneNumber_Cardinality(null);
     }
 
-    public void setLabeledURI_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setLabeledURI_Cardinality("labeledURI", opLambda);
+    public void setFacsimileTelephoneNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setFacsimileTelephoneNumber_Cardinality("facsimileTelephoneNumber", opLambda);
     }
 
-    public void setLabeledURI_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "labeledURI");
+    public void setFacsimileTelephoneNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "facsimileTelephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_Missing() {
-        setLabeledURI_Missing(null);
+    public void setFacsimileTelephoneNumber_Missing() {
+        setFacsimileTelephoneNumber_Missing(null);
     }
 
-    public void setLabeledURI_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setLabeledURI_Missing("labeledURI", opLambda, null);
+    public void setFacsimileTelephoneNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setFacsimileTelephoneNumber_Missing("facsimileTelephoneNumber", opLambda, null);
     }
 
-    public void setLabeledURI_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setLabeledURI_Missing("labeledURI", opLambda, aggsLambda);
+    public void setFacsimileTelephoneNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        setFacsimileTelephoneNumber_Missing("facsimileTelephoneNumber", opLambda, aggsLambda);
     }
 
-    public void setLabeledURI_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setFacsimileTelephoneNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "labeledURI");
+        MissingAggregationBuilder builder = regMissingA(name, "facsimileTelephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1395,176 +1410,141 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setRoomNumber_Terms() {
-        setRoomNumber_Terms(null);
-    }
-
-    public void setRoomNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setRoomNumber_Terms("roomNumber", opLambda, null);
+    public void setGidNumber_Avg() {
+        setGidNumber_Avg(null);
     }
 
-    public void setRoomNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setRoomNumber_Terms("roomNumber", opLambda, aggsLambda);
+    public void setGidNumber_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        setGidNumber_Avg("gidNumber", opLambda);
     }
 
-    public void setRoomNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "roomNumber");
+    public void setGidNumber_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            UserCA ca = new UserCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setRoomNumber_SignificantTerms() {
-        setRoomNumber_SignificantTerms(null);
     }
 
-    public void setRoomNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setRoomNumber_SignificantTerms("roomNumber", opLambda, null);
+    public void setGidNumber_Max() {
+        setGidNumber_Max(null);
     }
 
-    public void setRoomNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        setRoomNumber_SignificantTerms("roomNumber", opLambda, aggsLambda);
+    public void setGidNumber_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        setGidNumber_Max("gidNumber", opLambda);
     }
 
-    public void setRoomNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roomNumber");
+    public void setGidNumber_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            UserCA ca = new UserCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setRoomNumber_IpRange() {
-        setRoomNumber_IpRange(null);
     }
 
-    public void setRoomNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setRoomNumber_IpRange("roomNumber", opLambda, null);
+    public void setGidNumber_Min() {
+        setGidNumber_Min(null);
     }
 
-    public void setRoomNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setRoomNumber_IpRange("roomNumber", opLambda, aggsLambda);
+    public void setGidNumber_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        setGidNumber_Min("gidNumber", opLambda);
     }
 
-    public void setRoomNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "roomNumber");
+    public void setGidNumber_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            UserCA ca = new UserCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setRoomNumber_Count() {
-        setRoomNumber_Count(null);
+    public void setGidNumber_Sum() {
+        setGidNumber_Sum(null);
     }
 
-    public void setRoomNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setRoomNumber_Count("roomNumber", opLambda);
+    public void setGidNumber_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        setGidNumber_Sum("gidNumber", opLambda);
     }
 
-    public void setRoomNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "roomNumber");
+    public void setGidNumber_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoomNumber_Cardinality() {
-        setRoomNumber_Cardinality(null);
+    public void setGidNumber_ExtendedStats() {
+        setGidNumber_ExtendedStats(null);
     }
 
-    public void setRoomNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setRoomNumber_Cardinality("roomNumber", opLambda);
+    public void setGidNumber_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        setGidNumber_ExtendedStats("gidNumber", opLambda);
     }
 
-    public void setRoomNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "roomNumber");
+    public void setGidNumber_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoomNumber_Missing() {
-        setRoomNumber_Missing(null);
-    }
-
-    public void setRoomNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setRoomNumber_Missing("roomNumber", opLambda, null);
+    public void setGidNumber_Stats() {
+        setGidNumber_Stats(null);
     }
 
-    public void setRoomNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setRoomNumber_Missing("roomNumber", opLambda, aggsLambda);
+    public void setGidNumber_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        setGidNumber_Stats("gidNumber", opLambda);
     }
 
-    public void setRoomNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "roomNumber");
+    public void setGidNumber_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            UserCA ca = new UserCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setDescription_Terms() {
-        setDescription_Terms(null);
+    public void setGidNumber_Percentiles() {
+        setGidNumber_Percentiles(null);
     }
 
-    public void setDescription_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setDescription_Terms("description", opLambda, null);
+    public void setGidNumber_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        setGidNumber_Percentiles("gidNumber", opLambda);
     }
 
-    public void setDescription_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setDescription_Terms("description", opLambda, aggsLambda);
+    public void setGidNumber_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "gidNumber");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setDescription_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "description");
+    public void setGidNumber_PercentileRanks(double[] values) {
+        setGidNumber_PercentileRanks(values, null);
+    }
+
+    public void setGidNumber_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setGidNumber_PercentileRanks("gidNumber", values, opLambda);
+    }
+
+    public void setGidNumber_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "gidNumber", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            UserCA ca = new UserCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setDescription_SignificantTerms() {
-        setDescription_SignificantTerms(null);
+    public void setGidNumber_Histogram() {
+        setGidNumber_Histogram(null);
     }
 
-    public void setDescription_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setDescription_SignificantTerms("description", opLambda, null);
+    public void setGidNumber_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
+        setGidNumber_Histogram("gidNumber", opLambda, null);
     }
 
-    public void setDescription_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        setDescription_SignificantTerms("description", opLambda, aggsLambda);
+    public void setGidNumber_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setGidNumber_Histogram("gidNumber", opLambda, aggsLambda);
     }
 
-    public void setDescription_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setGidNumber_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "description");
+        HistogramAggregationBuilder builder = regHistogramA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1575,21 +1555,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDescription_IpRange() {
-        setDescription_IpRange(null);
+    public void setGidNumber_Range() {
+        setGidNumber_Range(null);
     }
 
-    public void setDescription_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setDescription_IpRange("description", opLambda, null);
+    public void setGidNumber_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
+        setGidNumber_Range("gidNumber", opLambda, null);
     }
 
-    public void setDescription_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setDescription_IpRange("description", opLambda, aggsLambda);
+    public void setGidNumber_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setGidNumber_Range("gidNumber", opLambda, aggsLambda);
     }
 
-    public void setDescription_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "description");
+    public void setGidNumber_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1600,51 +1579,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDescription_Count() {
-        setDescription_Count(null);
+    public void setGidNumber_Count() {
+        setGidNumber_Count(null);
     }
 
-    public void setDescription_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setDescription_Count("description", opLambda);
+    public void setGidNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setGidNumber_Count("gidNumber", opLambda);
     }
 
-    public void setDescription_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "description");
+    public void setGidNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_Cardinality() {
-        setDescription_Cardinality(null);
+    public void setGidNumber_Cardinality() {
+        setGidNumber_Cardinality(null);
     }
 
-    public void setDescription_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setDescription_Cardinality("description", opLambda);
+    public void setGidNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setGidNumber_Cardinality("gidNumber", opLambda);
     }
 
-    public void setDescription_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "description");
+    public void setGidNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_Missing() {
-        setDescription_Missing(null);
+    public void setGidNumber_Missing() {
+        setGidNumber_Missing(null);
     }
 
-    public void setDescription_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setDescription_Missing("description", opLambda, null);
+    public void setGidNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setGidNumber_Missing("gidNumber", opLambda, null);
     }
 
-    public void setDescription_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setDescription_Missing("description", opLambda, aggsLambda);
+    public void setGidNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setGidNumber_Missing("gidNumber", opLambda, aggsLambda);
     }
 
-    public void setDescription_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "description");
+    public void setGidNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1655,20 +1633,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTitle_Terms() {
-        setTitle_Terms(null);
+    public void setGivenName_Terms() {
+        setGivenName_Terms(null);
     }
 
-    public void setTitle_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setTitle_Terms("title", opLambda, null);
+    public void setGivenName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setGivenName_Terms("givenName", opLambda, null);
     }
 
-    public void setTitle_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setTitle_Terms("title", opLambda, aggsLambda);
+    public void setGivenName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setGivenName_Terms("givenName", opLambda, aggsLambda);
     }
 
-    public void setTitle_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "title");
+    public void setGivenName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "givenName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1679,22 +1657,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTitle_SignificantTerms() {
-        setTitle_SignificantTerms(null);
+    public void setGivenName_SignificantTerms() {
+        setGivenName_SignificantTerms(null);
     }
 
-    public void setTitle_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setTitle_SignificantTerms("title", opLambda, null);
+    public void setGivenName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setGivenName_SignificantTerms("givenName", opLambda, null);
     }
 
-    public void setTitle_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setGivenName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setTitle_SignificantTerms("title", opLambda, aggsLambda);
+        setGivenName_SignificantTerms("givenName", opLambda, aggsLambda);
     }
 
-    public void setTitle_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setGivenName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "title");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "givenName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1705,20 +1683,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTitle_IpRange() {
-        setTitle_IpRange(null);
+    public void setGivenName_IpRange() {
+        setGivenName_IpRange(null);
     }
 
-    public void setTitle_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setTitle_IpRange("title", opLambda, null);
+    public void setGivenName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setGivenName_IpRange("givenName", opLambda, null);
     }
 
-    public void setTitle_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setTitle_IpRange("title", opLambda, aggsLambda);
+    public void setGivenName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setGivenName_IpRange("givenName", opLambda, aggsLambda);
     }
 
-    public void setTitle_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "title");
+    public void setGivenName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "givenName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1729,50 +1707,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTitle_Count() {
-        setTitle_Count(null);
+    public void setGivenName_Count() {
+        setGivenName_Count(null);
     }
 
-    public void setTitle_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setTitle_Count("title", opLambda);
+    public void setGivenName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setGivenName_Count("givenName", opLambda);
     }
 
-    public void setTitle_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "title");
+    public void setGivenName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "givenName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_Cardinality() {
-        setTitle_Cardinality(null);
+    public void setGivenName_Cardinality() {
+        setGivenName_Cardinality(null);
     }
 
-    public void setTitle_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setTitle_Cardinality("title", opLambda);
+    public void setGivenName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setGivenName_Cardinality("givenName", opLambda);
     }
 
-    public void setTitle_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "title");
+    public void setGivenName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "givenName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_Missing() {
-        setTitle_Missing(null);
+    public void setGivenName_Missing() {
+        setGivenName_Missing(null);
     }
 
-    public void setTitle_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setTitle_Missing("title", opLambda, null);
+    public void setGivenName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setGivenName_Missing("givenName", opLambda, null);
     }
 
-    public void setTitle_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setTitle_Missing("title", opLambda, aggsLambda);
+    public void setGivenName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setGivenName_Missing("givenName", opLambda, aggsLambda);
     }
 
-    public void setTitle_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "title");
+    public void setGivenName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "givenName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1783,20 +1761,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPager_Terms() {
-        setPager_Terms(null);
+    public void setGroups_Terms() {
+        setGroups_Terms(null);
     }
 
-    public void setPager_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setPager_Terms("pager", opLambda, null);
+    public void setGroups_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setGroups_Terms("groups", opLambda, null);
     }
 
-    public void setPager_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPager_Terms("pager", opLambda, aggsLambda);
+    public void setGroups_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setGroups_Terms("groups", opLambda, aggsLambda);
     }
 
-    public void setPager_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "pager");
+    public void setGroups_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "groups");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1807,22 +1785,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPager_SignificantTerms() {
-        setPager_SignificantTerms(null);
+    public void setGroups_SignificantTerms() {
+        setGroups_SignificantTerms(null);
     }
 
-    public void setPager_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setPager_SignificantTerms("pager", opLambda, null);
+    public void setGroups_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setGroups_SignificantTerms("groups", opLambda, null);
     }
 
-    public void setPager_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setGroups_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setPager_SignificantTerms("pager", opLambda, aggsLambda);
+        setGroups_SignificantTerms("groups", opLambda, aggsLambda);
     }
 
-    public void setPager_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setGroups_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "pager");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "groups");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1833,20 +1811,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPager_IpRange() {
-        setPager_IpRange(null);
+    public void setGroups_IpRange() {
+        setGroups_IpRange(null);
     }
 
-    public void setPager_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setPager_IpRange("pager", opLambda, null);
+    public void setGroups_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setGroups_IpRange("groups", opLambda, null);
     }
 
-    public void setPager_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPager_IpRange("pager", opLambda, aggsLambda);
+    public void setGroups_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setGroups_IpRange("groups", opLambda, aggsLambda);
     }
 
-    public void setPager_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "pager");
+    public void setGroups_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "groups");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1857,50 +1835,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPager_Count() {
-        setPager_Count(null);
+    public void setGroups_Count() {
+        setGroups_Count(null);
     }
 
-    public void setPager_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setPager_Count("pager", opLambda);
+    public void setGroups_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setGroups_Count("groups", opLambda);
     }
 
-    public void setPager_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "pager");
+    public void setGroups_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "groups");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_Cardinality() {
-        setPager_Cardinality(null);
+    public void setGroups_Cardinality() {
+        setGroups_Cardinality(null);
     }
 
-    public void setPager_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setPager_Cardinality("pager", opLambda);
+    public void setGroups_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setGroups_Cardinality("groups", opLambda);
     }
 
-    public void setPager_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "pager");
+    public void setGroups_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "groups");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_Missing() {
-        setPager_Missing(null);
+    public void setGroups_Missing() {
+        setGroups_Missing(null);
     }
 
-    public void setPager_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setPager_Missing("pager", opLambda, null);
+    public void setGroups_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setGroups_Missing("groups", opLambda, null);
     }
 
-    public void setPager_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPager_Missing("pager", opLambda, aggsLambda);
+    public void setGroups_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setGroups_Missing("groups", opLambda, aggsLambda);
     }
 
-    public void setPager_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "pager");
+    public void setGroups_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "groups");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1911,20 +1889,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setStreet_Terms() {
-        setStreet_Terms(null);
+    public void setHomeDirectory_Terms() {
+        setHomeDirectory_Terms(null);
     }
 
-    public void setStreet_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setStreet_Terms("street", opLambda, null);
+    public void setHomeDirectory_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setHomeDirectory_Terms("homeDirectory", opLambda, null);
     }
 
-    public void setStreet_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setStreet_Terms("street", opLambda, aggsLambda);
+    public void setHomeDirectory_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setHomeDirectory_Terms("homeDirectory", opLambda, aggsLambda);
     }
 
-    public void setStreet_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "street");
+    public void setHomeDirectory_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "homeDirectory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1935,22 +1913,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setStreet_SignificantTerms() {
-        setStreet_SignificantTerms(null);
+    public void setHomeDirectory_SignificantTerms() {
+        setHomeDirectory_SignificantTerms(null);
     }
 
-    public void setStreet_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setStreet_SignificantTerms("street", opLambda, null);
+    public void setHomeDirectory_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setHomeDirectory_SignificantTerms("homeDirectory", opLambda, null);
     }
 
-    public void setStreet_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setHomeDirectory_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setStreet_SignificantTerms("street", opLambda, aggsLambda);
+        setHomeDirectory_SignificantTerms("homeDirectory", opLambda, aggsLambda);
     }
 
-    public void setStreet_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setHomeDirectory_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "street");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "homeDirectory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1961,20 +1939,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setStreet_IpRange() {
-        setStreet_IpRange(null);
+    public void setHomeDirectory_IpRange() {
+        setHomeDirectory_IpRange(null);
     }
 
-    public void setStreet_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setStreet_IpRange("street", opLambda, null);
+    public void setHomeDirectory_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setHomeDirectory_IpRange("homeDirectory", opLambda, null);
     }
 
-    public void setStreet_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setStreet_IpRange("street", opLambda, aggsLambda);
+    public void setHomeDirectory_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setHomeDirectory_IpRange("homeDirectory", opLambda, aggsLambda);
     }
 
-    public void setStreet_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "street");
+    public void setHomeDirectory_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "homeDirectory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1985,50 +1964,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setStreet_Count() {
-        setStreet_Count(null);
+    public void setHomeDirectory_Count() {
+        setHomeDirectory_Count(null);
     }
 
-    public void setStreet_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setStreet_Count("street", opLambda);
+    public void setHomeDirectory_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setHomeDirectory_Count("homeDirectory", opLambda);
     }
 
-    public void setStreet_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "street");
+    public void setHomeDirectory_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "homeDirectory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_Cardinality() {
-        setStreet_Cardinality(null);
+    public void setHomeDirectory_Cardinality() {
+        setHomeDirectory_Cardinality(null);
     }
 
-    public void setStreet_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setStreet_Cardinality("street", opLambda);
+    public void setHomeDirectory_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setHomeDirectory_Cardinality("homeDirectory", opLambda);
     }
 
-    public void setStreet_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "street");
+    public void setHomeDirectory_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "homeDirectory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_Missing() {
-        setStreet_Missing(null);
+    public void setHomeDirectory_Missing() {
+        setHomeDirectory_Missing(null);
     }
 
-    public void setStreet_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setStreet_Missing("street", opLambda, null);
+    public void setHomeDirectory_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setHomeDirectory_Missing("homeDirectory", opLambda, null);
     }
 
-    public void setStreet_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setStreet_Missing("street", opLambda, aggsLambda);
+    public void setHomeDirectory_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setHomeDirectory_Missing("homeDirectory", opLambda, aggsLambda);
     }
 
-    public void setStreet_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "street");
+    public void setHomeDirectory_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "homeDirectory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2039,20 +2019,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPostalCode_Terms() {
-        setPostalCode_Terms(null);
+    public void setHomePhone_Terms() {
+        setHomePhone_Terms(null);
     }
 
-    public void setPostalCode_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setPostalCode_Terms("postalCode", opLambda, null);
+    public void setHomePhone_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setHomePhone_Terms("homePhone", opLambda, null);
     }
 
-    public void setPostalCode_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPostalCode_Terms("postalCode", opLambda, aggsLambda);
+    public void setHomePhone_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setHomePhone_Terms("homePhone", opLambda, aggsLambda);
     }
 
-    public void setPostalCode_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "postalCode");
+    public void setHomePhone_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "homePhone");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2063,22 +2043,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPostalCode_SignificantTerms() {
-        setPostalCode_SignificantTerms(null);
+    public void setHomePhone_SignificantTerms() {
+        setHomePhone_SignificantTerms(null);
     }
 
-    public void setPostalCode_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setPostalCode_SignificantTerms("postalCode", opLambda, null);
+    public void setHomePhone_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setHomePhone_SignificantTerms("homePhone", opLambda, null);
     }
 
-    public void setPostalCode_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setHomePhone_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setPostalCode_SignificantTerms("postalCode", opLambda, aggsLambda);
+        setHomePhone_SignificantTerms("homePhone", opLambda, aggsLambda);
     }
 
-    public void setPostalCode_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setHomePhone_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "postalCode");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "homePhone");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2089,21 +2069,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPostalCode_IpRange() {
-        setPostalCode_IpRange(null);
+    public void setHomePhone_IpRange() {
+        setHomePhone_IpRange(null);
     }
 
-    public void setPostalCode_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setPostalCode_IpRange("postalCode", opLambda, null);
+    public void setHomePhone_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setHomePhone_IpRange("homePhone", opLambda, null);
     }
 
-    public void setPostalCode_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPostalCode_IpRange("postalCode", opLambda, aggsLambda);
+    public void setHomePhone_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setHomePhone_IpRange("homePhone", opLambda, aggsLambda);
     }
 
-    public void setPostalCode_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "postalCode");
+    public void setHomePhone_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "homePhone");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2114,51 +2093,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPostalCode_Count() {
-        setPostalCode_Count(null);
+    public void setHomePhone_Count() {
+        setHomePhone_Count(null);
     }
 
-    public void setPostalCode_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setPostalCode_Count("postalCode", opLambda);
+    public void setHomePhone_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setHomePhone_Count("homePhone", opLambda);
     }
 
-    public void setPostalCode_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "postalCode");
+    public void setHomePhone_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "homePhone");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_Cardinality() {
-        setPostalCode_Cardinality(null);
+    public void setHomePhone_Cardinality() {
+        setHomePhone_Cardinality(null);
     }
 
-    public void setPostalCode_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setPostalCode_Cardinality("postalCode", opLambda);
+    public void setHomePhone_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setHomePhone_Cardinality("homePhone", opLambda);
     }
 
-    public void setPostalCode_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "postalCode");
+    public void setHomePhone_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "homePhone");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_Missing() {
-        setPostalCode_Missing(null);
+    public void setHomePhone_Missing() {
+        setHomePhone_Missing(null);
     }
 
-    public void setPostalCode_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setPostalCode_Missing("postalCode", opLambda, null);
+    public void setHomePhone_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setHomePhone_Missing("homePhone", opLambda, null);
     }
 
-    public void setPostalCode_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPostalCode_Missing("postalCode", opLambda, aggsLambda);
+    public void setHomePhone_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setHomePhone_Missing("homePhone", opLambda, aggsLambda);
     }
 
-    public void setPostalCode_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "postalCode");
+    public void setHomePhone_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "homePhone");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2169,21 +2147,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_Terms() {
-        setPhysicalDeliveryOfficeName_Terms(null);
+    public void setHomePostalAddress_Terms() {
+        setHomePostalAddress_Terms(null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setPhysicalDeliveryOfficeName_Terms("physicalDeliveryOfficeName", opLambda, null);
+    public void setHomePostalAddress_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setHomePostalAddress_Terms("homePostalAddress", opLambda, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPhysicalDeliveryOfficeName_Terms("physicalDeliveryOfficeName", opLambda, aggsLambda);
+    public void setHomePostalAddress_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setHomePostalAddress_Terms("homePostalAddress", opLambda, aggsLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+    public void setHomePostalAddress_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "physicalDeliveryOfficeName");
+        TermsAggregationBuilder builder = regTermsA(name, "homePostalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2194,22 +2172,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_SignificantTerms() {
-        setPhysicalDeliveryOfficeName_SignificantTerms(null);
+    public void setHomePostalAddress_SignificantTerms() {
+        setHomePostalAddress_SignificantTerms(null);
     }
 
-    public void setPhysicalDeliveryOfficeName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setPhysicalDeliveryOfficeName_SignificantTerms("physicalDeliveryOfficeName", opLambda, null);
+    public void setHomePostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setHomePostalAddress_SignificantTerms("homePostalAddress", opLambda, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setHomePostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setPhysicalDeliveryOfficeName_SignificantTerms("physicalDeliveryOfficeName", opLambda, aggsLambda);
+        setHomePostalAddress_SignificantTerms("homePostalAddress", opLambda, aggsLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_SignificantTerms(String name,
-            ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "physicalDeliveryOfficeName");
+    public void setHomePostalAddress_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "homePostalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2220,22 +2198,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_IpRange() {
-        setPhysicalDeliveryOfficeName_IpRange(null);
+    public void setHomePostalAddress_IpRange() {
+        setHomePostalAddress_IpRange(null);
     }
 
-    public void setPhysicalDeliveryOfficeName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setPhysicalDeliveryOfficeName_IpRange("physicalDeliveryOfficeName", opLambda, null);
+    public void setHomePostalAddress_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setHomePostalAddress_IpRange("homePostalAddress", opLambda, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        setPhysicalDeliveryOfficeName_IpRange("physicalDeliveryOfficeName", opLambda, aggsLambda);
+    public void setHomePostalAddress_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setHomePostalAddress_IpRange("homePostalAddress", opLambda, aggsLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setHomePostalAddress_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "physicalDeliveryOfficeName");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "homePostalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2246,52 +2223,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_Count() {
-        setPhysicalDeliveryOfficeName_Count(null);
+    public void setHomePostalAddress_Count() {
+        setHomePostalAddress_Count(null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setPhysicalDeliveryOfficeName_Count("physicalDeliveryOfficeName", opLambda);
+    public void setHomePostalAddress_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setHomePostalAddress_Count("homePostalAddress", opLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "physicalDeliveryOfficeName");
+    public void setHomePostalAddress_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "homePostalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_Cardinality() {
-        setPhysicalDeliveryOfficeName_Cardinality(null);
+    public void setHomePostalAddress_Cardinality() {
+        setHomePostalAddress_Cardinality(null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setPhysicalDeliveryOfficeName_Cardinality("physicalDeliveryOfficeName", opLambda);
+    public void setHomePostalAddress_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setHomePostalAddress_Cardinality("homePostalAddress", opLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "physicalDeliveryOfficeName");
+    public void setHomePostalAddress_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "homePostalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_Missing() {
-        setPhysicalDeliveryOfficeName_Missing(null);
+    public void setHomePostalAddress_Missing() {
+        setHomePostalAddress_Missing(null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setPhysicalDeliveryOfficeName_Missing("physicalDeliveryOfficeName", opLambda, null);
+    public void setHomePostalAddress_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setHomePostalAddress_Missing("homePostalAddress", opLambda, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        setPhysicalDeliveryOfficeName_Missing("physicalDeliveryOfficeName", opLambda, aggsLambda);
+    public void setHomePostalAddress_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setHomePostalAddress_Missing("homePostalAddress", opLambda, aggsLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setHomePostalAddress_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "physicalDeliveryOfficeName");
+        MissingAggregationBuilder builder = regMissingA(name, "homePostalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2302,21 +2278,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDestinationIndicator_Terms() {
-        setDestinationIndicator_Terms(null);
+    public void setInitials_Terms() {
+        setInitials_Terms(null);
     }
 
-    public void setDestinationIndicator_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setDestinationIndicator_Terms("destinationIndicator", opLambda, null);
+    public void setInitials_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setInitials_Terms("initials", opLambda, null);
     }
 
-    public void setDestinationIndicator_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setDestinationIndicator_Terms("destinationIndicator", opLambda, aggsLambda);
+    public void setInitials_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setInitials_Terms("initials", opLambda, aggsLambda);
     }
 
-    public void setDestinationIndicator_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "destinationIndicator");
+    public void setInitials_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "initials");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2327,22 +2302,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDestinationIndicator_SignificantTerms() {
-        setDestinationIndicator_SignificantTerms(null);
+    public void setInitials_SignificantTerms() {
+        setInitials_SignificantTerms(null);
     }
 
-    public void setDestinationIndicator_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setDestinationIndicator_SignificantTerms("destinationIndicator", opLambda, null);
+    public void setInitials_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setInitials_SignificantTerms("initials", opLambda, null);
     }
 
-    public void setDestinationIndicator_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setInitials_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setDestinationIndicator_SignificantTerms("destinationIndicator", opLambda, aggsLambda);
+        setInitials_SignificantTerms("initials", opLambda, aggsLambda);
     }
 
-    public void setDestinationIndicator_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setInitials_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "destinationIndicator");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "initials");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2353,21 +2328,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDestinationIndicator_IpRange() {
-        setDestinationIndicator_IpRange(null);
+    public void setInitials_IpRange() {
+        setInitials_IpRange(null);
     }
 
-    public void setDestinationIndicator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setDestinationIndicator_IpRange("destinationIndicator", opLambda, null);
+    public void setInitials_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setInitials_IpRange("initials", opLambda, null);
     }
 
-    public void setDestinationIndicator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setDestinationIndicator_IpRange("destinationIndicator", opLambda, aggsLambda);
+    public void setInitials_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setInitials_IpRange("initials", opLambda, aggsLambda);
     }
 
-    public void setDestinationIndicator_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "destinationIndicator");
+    public void setInitials_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "initials");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2378,51 +2352,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDestinationIndicator_Count() {
-        setDestinationIndicator_Count(null);
+    public void setInitials_Count() {
+        setInitials_Count(null);
     }
 
-    public void setDestinationIndicator_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setDestinationIndicator_Count("destinationIndicator", opLambda);
+    public void setInitials_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setInitials_Count("initials", opLambda);
     }
 
-    public void setDestinationIndicator_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "destinationIndicator");
+    public void setInitials_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "initials");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDestinationIndicator_Cardinality() {
-        setDestinationIndicator_Cardinality(null);
+    public void setInitials_Cardinality() {
+        setInitials_Cardinality(null);
     }
 
-    public void setDestinationIndicator_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setDestinationIndicator_Cardinality("destinationIndicator", opLambda);
+    public void setInitials_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setInitials_Cardinality("initials", opLambda);
     }
 
-    public void setDestinationIndicator_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "destinationIndicator");
+    public void setInitials_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "initials");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDestinationIndicator_Missing() {
-        setDestinationIndicator_Missing(null);
+    public void setInitials_Missing() {
+        setInitials_Missing(null);
     }
 
-    public void setDestinationIndicator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setDestinationIndicator_Missing("destinationIndicator", opLambda, null);
+    public void setInitials_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setInitials_Missing("initials", opLambda, null);
     }
 
-    public void setDestinationIndicator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setDestinationIndicator_Missing("destinationIndicator", opLambda, aggsLambda);
+    public void setInitials_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setInitials_Missing("initials", opLambda, aggsLambda);
     }
 
-    public void setDestinationIndicator_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "destinationIndicator");
+    public void setInitials_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "initials");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2566,20 +2539,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setState_Terms() {
-        setState_Terms(null);
+    public void setLabeledURI_Terms() {
+        setLabeledURI_Terms(null);
     }
 
-    public void setState_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setState_Terms("state", opLambda, null);
+    public void setLabeledURI_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setLabeledURI_Terms("labeledURI", opLambda, null);
     }
 
-    public void setState_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setState_Terms("state", opLambda, aggsLambda);
+    public void setLabeledURI_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setLabeledURI_Terms("labeledURI", opLambda, aggsLambda);
     }
 
-    public void setState_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "state");
+    public void setLabeledURI_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "labeledURI");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2590,22 +2563,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setState_SignificantTerms() {
-        setState_SignificantTerms(null);
+    public void setLabeledURI_SignificantTerms() {
+        setLabeledURI_SignificantTerms(null);
     }
 
-    public void setState_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setState_SignificantTerms("state", opLambda, null);
+    public void setLabeledURI_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setLabeledURI_SignificantTerms("labeledURI", opLambda, null);
     }
 
-    public void setState_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setLabeledURI_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setState_SignificantTerms("state", opLambda, aggsLambda);
+        setLabeledURI_SignificantTerms("labeledURI", opLambda, aggsLambda);
     }
 
-    public void setState_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setLabeledURI_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "state");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "labeledURI");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2616,20 +2589,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setState_IpRange() {
-        setState_IpRange(null);
+    public void setLabeledURI_IpRange() {
+        setLabeledURI_IpRange(null);
     }
 
-    public void setState_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setState_IpRange("state", opLambda, null);
+    public void setLabeledURI_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setLabeledURI_IpRange("labeledURI", opLambda, null);
     }
 
-    public void setState_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setState_IpRange("state", opLambda, aggsLambda);
+    public void setLabeledURI_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setLabeledURI_IpRange("labeledURI", opLambda, aggsLambda);
     }
 
-    public void setState_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "state");
+    public void setLabeledURI_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "labeledURI");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2640,50 +2614,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setState_Count() {
-        setState_Count(null);
+    public void setLabeledURI_Count() {
+        setLabeledURI_Count(null);
     }
 
-    public void setState_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setState_Count("state", opLambda);
+    public void setLabeledURI_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setLabeledURI_Count("labeledURI", opLambda);
     }
 
-    public void setState_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "state");
+    public void setLabeledURI_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "labeledURI");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_Cardinality() {
-        setState_Cardinality(null);
+    public void setLabeledURI_Cardinality() {
+        setLabeledURI_Cardinality(null);
     }
 
-    public void setState_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setState_Cardinality("state", opLambda);
+    public void setLabeledURI_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setLabeledURI_Cardinality("labeledURI", opLambda);
     }
 
-    public void setState_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "state");
+    public void setLabeledURI_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "labeledURI");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_Missing() {
-        setState_Missing(null);
+    public void setLabeledURI_Missing() {
+        setLabeledURI_Missing(null);
     }
 
-    public void setState_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setState_Missing("state", opLambda, null);
+    public void setLabeledURI_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setLabeledURI_Missing("labeledURI", opLambda, null);
     }
 
-    public void setState_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setState_Missing("state", opLambda, aggsLambda);
+    public void setLabeledURI_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setLabeledURI_Missing("labeledURI", opLambda, aggsLambda);
     }
 
-    public void setState_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "state");
+    public void setLabeledURI_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "labeledURI");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2694,20 +2669,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setEmployeeType_Terms() {
-        setEmployeeType_Terms(null);
+    public void setMail_Terms() {
+        setMail_Terms(null);
     }
 
-    public void setEmployeeType_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setEmployeeType_Terms("employeeType", opLambda, null);
+    public void setMail_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setMail_Terms("mail", opLambda, null);
     }
 
-    public void setEmployeeType_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setEmployeeType_Terms("employeeType", opLambda, aggsLambda);
+    public void setMail_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setMail_Terms("mail", opLambda, aggsLambda);
     }
 
-    public void setEmployeeType_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "employeeType");
+    public void setMail_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "mail");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2718,22 +2693,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setEmployeeType_SignificantTerms() {
-        setEmployeeType_SignificantTerms(null);
+    public void setMail_SignificantTerms() {
+        setMail_SignificantTerms(null);
     }
 
-    public void setEmployeeType_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setEmployeeType_SignificantTerms("employeeType", opLambda, null);
+    public void setMail_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setMail_SignificantTerms("mail", opLambda, null);
     }
 
-    public void setEmployeeType_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        setEmployeeType_SignificantTerms("employeeType", opLambda, aggsLambda);
+    public void setMail_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setMail_SignificantTerms("mail", opLambda, aggsLambda);
     }
 
-    public void setEmployeeType_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setMail_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "employeeType");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "mail");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2744,21 +2718,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setEmployeeType_IpRange() {
-        setEmployeeType_IpRange(null);
+    public void setMail_IpRange() {
+        setMail_IpRange(null);
     }
 
-    public void setEmployeeType_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setEmployeeType_IpRange("employeeType", opLambda, null);
+    public void setMail_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setMail_IpRange("mail", opLambda, null);
     }
 
-    public void setEmployeeType_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setEmployeeType_IpRange("employeeType", opLambda, aggsLambda);
+    public void setMail_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setMail_IpRange("mail", opLambda, aggsLambda);
     }
 
-    public void setEmployeeType_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "employeeType");
+    public void setMail_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "mail");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2769,51 +2742,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setEmployeeType_Count() {
-        setEmployeeType_Count(null);
+    public void setMail_Count() {
+        setMail_Count(null);
     }
 
-    public void setEmployeeType_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setEmployeeType_Count("employeeType", opLambda);
+    public void setMail_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setMail_Count("mail", opLambda);
     }
 
-    public void setEmployeeType_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "employeeType");
+    public void setMail_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "mail");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_Cardinality() {
-        setEmployeeType_Cardinality(null);
+    public void setMail_Cardinality() {
+        setMail_Cardinality(null);
     }
 
-    public void setEmployeeType_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setEmployeeType_Cardinality("employeeType", opLambda);
+    public void setMail_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setMail_Cardinality("mail", opLambda);
     }
 
-    public void setEmployeeType_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "employeeType");
+    public void setMail_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "mail");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_Missing() {
-        setEmployeeType_Missing(null);
+    public void setMail_Missing() {
+        setMail_Missing(null);
     }
 
-    public void setEmployeeType_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setEmployeeType_Missing("employeeType", opLambda, null);
+    public void setMail_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setMail_Missing("mail", opLambda, null);
     }
 
-    public void setEmployeeType_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setEmployeeType_Missing("employeeType", opLambda, aggsLambda);
+    public void setMail_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setMail_Missing("mail", opLambda, aggsLambda);
     }
 
-    public void setEmployeeType_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "employeeType");
+    public void setMail_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "mail");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2824,21 +2796,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setFacsimileTelephoneNumber_Terms() {
-        setFacsimileTelephoneNumber_Terms(null);
+    public void setMobile_Terms() {
+        setMobile_Terms(null);
     }
 
-    public void setFacsimileTelephoneNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setFacsimileTelephoneNumber_Terms("facsimileTelephoneNumber", opLambda, null);
+    public void setMobile_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setMobile_Terms("mobile", opLambda, null);
     }
 
-    public void setFacsimileTelephoneNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setFacsimileTelephoneNumber_Terms("facsimileTelephoneNumber", opLambda, aggsLambda);
+    public void setMobile_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setMobile_Terms("mobile", opLambda, aggsLambda);
     }
 
-    public void setFacsimileTelephoneNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "facsimileTelephoneNumber");
+    public void setMobile_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "mobile");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2849,22 +2820,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setFacsimileTelephoneNumber_SignificantTerms() {
-        setFacsimileTelephoneNumber_SignificantTerms(null);
+    public void setMobile_SignificantTerms() {
+        setMobile_SignificantTerms(null);
     }
 
-    public void setFacsimileTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setFacsimileTelephoneNumber_SignificantTerms("facsimileTelephoneNumber", opLambda, null);
+    public void setMobile_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setMobile_SignificantTerms("mobile", opLambda, null);
     }
 
-    public void setFacsimileTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setMobile_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setFacsimileTelephoneNumber_SignificantTerms("facsimileTelephoneNumber", opLambda, aggsLambda);
+        setMobile_SignificantTerms("mobile", opLambda, aggsLambda);
     }
 
-    public void setFacsimileTelephoneNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setMobile_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "facsimileTelephoneNumber");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "mobile");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2875,22 +2846,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setFacsimileTelephoneNumber_IpRange() {
-        setFacsimileTelephoneNumber_IpRange(null);
+    public void setMobile_IpRange() {
+        setMobile_IpRange(null);
     }
 
-    public void setFacsimileTelephoneNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setFacsimileTelephoneNumber_IpRange("facsimileTelephoneNumber", opLambda, null);
+    public void setMobile_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setMobile_IpRange("mobile", opLambda, null);
     }
 
-    public void setFacsimileTelephoneNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        setFacsimileTelephoneNumber_IpRange("facsimileTelephoneNumber", opLambda, aggsLambda);
+    public void setMobile_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setMobile_IpRange("mobile", opLambda, aggsLambda);
     }
 
-    public void setFacsimileTelephoneNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "facsimileTelephoneNumber");
+    public void setMobile_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "mobile");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2901,52 +2870,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setFacsimileTelephoneNumber_Count() {
-        setFacsimileTelephoneNumber_Count(null);
+    public void setMobile_Count() {
+        setMobile_Count(null);
     }
 
-    public void setFacsimileTelephoneNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setFacsimileTelephoneNumber_Count("facsimileTelephoneNumber", opLambda);
+    public void setMobile_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setMobile_Count("mobile", opLambda);
     }
 
-    public void setFacsimileTelephoneNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "facsimileTelephoneNumber");
+    public void setMobile_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "mobile");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_Cardinality() {
-        setFacsimileTelephoneNumber_Cardinality(null);
+    public void setMobile_Cardinality() {
+        setMobile_Cardinality(null);
     }
 
-    public void setFacsimileTelephoneNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setFacsimileTelephoneNumber_Cardinality("facsimileTelephoneNumber", opLambda);
+    public void setMobile_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setMobile_Cardinality("mobile", opLambda);
     }
 
-    public void setFacsimileTelephoneNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "facsimileTelephoneNumber");
+    public void setMobile_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "mobile");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_Missing() {
-        setFacsimileTelephoneNumber_Missing(null);
+    public void setMobile_Missing() {
+        setMobile_Missing(null);
     }
 
-    public void setFacsimileTelephoneNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setFacsimileTelephoneNumber_Missing("facsimileTelephoneNumber", opLambda, null);
+    public void setMobile_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setMobile_Missing("mobile", opLambda, null);
     }
 
-    public void setFacsimileTelephoneNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        setFacsimileTelephoneNumber_Missing("facsimileTelephoneNumber", opLambda, aggsLambda);
+    public void setMobile_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setMobile_Missing("mobile", opLambda, aggsLambda);
     }
 
-    public void setFacsimileTelephoneNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "facsimileTelephoneNumber");
+    public void setMobile_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "mobile");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2957,20 +2924,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPostOfficeBox_Terms() {
-        setPostOfficeBox_Terms(null);
+    public void setName_Terms() {
+        setName_Terms(null);
     }
 
-    public void setPostOfficeBox_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setPostOfficeBox_Terms("postOfficeBox", opLambda, null);
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setName_Terms("name", opLambda, null);
     }
 
-    public void setPostOfficeBox_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPostOfficeBox_Terms("postOfficeBox", opLambda, aggsLambda);
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setPostOfficeBox_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "postOfficeBox");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2981,22 +2948,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPostOfficeBox_SignificantTerms() {
-        setPostOfficeBox_SignificantTerms(null);
+    public void setName_SignificantTerms() {
+        setName_SignificantTerms(null);
     }
 
-    public void setPostOfficeBox_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setPostOfficeBox_SignificantTerms("postOfficeBox", opLambda, null);
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setPostOfficeBox_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        setPostOfficeBox_SignificantTerms("postOfficeBox", opLambda, aggsLambda);
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setPostOfficeBox_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "postOfficeBox");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3007,21 +2973,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPostOfficeBox_IpRange() {
-        setPostOfficeBox_IpRange(null);
+    public void setName_IpRange() {
+        setName_IpRange(null);
     }
 
-    public void setPostOfficeBox_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setPostOfficeBox_IpRange("postOfficeBox", opLambda, null);
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setName_IpRange("name", opLambda, null);
     }
 
-    public void setPostOfficeBox_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPostOfficeBox_IpRange("postOfficeBox", opLambda, aggsLambda);
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setPostOfficeBox_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "postOfficeBox");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3032,51 +2997,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPostOfficeBox_Count() {
-        setPostOfficeBox_Count(null);
+    public void setName_Count() {
+        setName_Count(null);
     }
 
-    public void setPostOfficeBox_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setPostOfficeBox_Count("postOfficeBox", opLambda);
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setName_Count("name", opLambda);
     }
 
-    public void setPostOfficeBox_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "postOfficeBox");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_Cardinality() {
-        setPostOfficeBox_Cardinality(null);
+    public void setName_Cardinality() {
+        setName_Cardinality(null);
     }
 
-    public void setPostOfficeBox_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setPostOfficeBox_Cardinality("postOfficeBox", opLambda);
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setName_Cardinality("name", opLambda);
     }
 
-    public void setPostOfficeBox_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "postOfficeBox");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_Missing() {
-        setPostOfficeBox_Missing(null);
+    public void setName_Missing() {
+        setName_Missing(null);
     }
 
-    public void setPostOfficeBox_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setPostOfficeBox_Missing("postOfficeBox", opLambda, null);
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setName_Missing("name", opLambda, null);
     }
 
-    public void setPostOfficeBox_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPostOfficeBox_Missing("postOfficeBox", opLambda, aggsLambda);
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setPostOfficeBox_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "postOfficeBox");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3087,20 +3051,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setInitials_Terms() {
-        setInitials_Terms(null);
+    public void setPager_Terms() {
+        setPager_Terms(null);
     }
 
-    public void setInitials_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setInitials_Terms("initials", opLambda, null);
+    public void setPager_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setPager_Terms("pager", opLambda, null);
     }
 
-    public void setInitials_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setInitials_Terms("initials", opLambda, aggsLambda);
+    public void setPager_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPager_Terms("pager", opLambda, aggsLambda);
     }
 
-    public void setInitials_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "initials");
+    public void setPager_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "pager");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3111,22 +3075,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setInitials_SignificantTerms() {
-        setInitials_SignificantTerms(null);
+    public void setPager_SignificantTerms() {
+        setPager_SignificantTerms(null);
     }
 
-    public void setInitials_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setInitials_SignificantTerms("initials", opLambda, null);
+    public void setPager_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setPager_SignificantTerms("pager", opLambda, null);
     }
 
-    public void setInitials_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setPager_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setInitials_SignificantTerms("initials", opLambda, aggsLambda);
+        setPager_SignificantTerms("pager", opLambda, aggsLambda);
     }
 
-    public void setInitials_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setPager_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "initials");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "pager");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3137,20 +3101,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setInitials_IpRange() {
-        setInitials_IpRange(null);
+    public void setPager_IpRange() {
+        setPager_IpRange(null);
     }
 
-    public void setInitials_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setInitials_IpRange("initials", opLambda, null);
+    public void setPager_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setPager_IpRange("pager", opLambda, null);
     }
 
-    public void setInitials_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setInitials_IpRange("initials", opLambda, aggsLambda);
+    public void setPager_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPager_IpRange("pager", opLambda, aggsLambda);
     }
 
-    public void setInitials_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "initials");
+    public void setPager_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "pager");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3161,50 +3125,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setInitials_Count() {
-        setInitials_Count(null);
+    public void setPager_Count() {
+        setPager_Count(null);
     }
 
-    public void setInitials_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setInitials_Count("initials", opLambda);
+    public void setPager_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setPager_Count("pager", opLambda);
     }
 
-    public void setInitials_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "initials");
+    public void setPager_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "pager");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_Cardinality() {
-        setInitials_Cardinality(null);
+    public void setPager_Cardinality() {
+        setPager_Cardinality(null);
     }
 
-    public void setInitials_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setInitials_Cardinality("initials", opLambda);
+    public void setPager_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setPager_Cardinality("pager", opLambda);
     }
 
-    public void setInitials_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "initials");
+    public void setPager_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "pager");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_Missing() {
-        setInitials_Missing(null);
+    public void setPager_Missing() {
+        setPager_Missing(null);
     }
 
-    public void setInitials_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setInitials_Missing("initials", opLambda, null);
+    public void setPager_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setPager_Missing("pager", opLambda, null);
     }
 
-    public void setInitials_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setInitials_Missing("initials", opLambda, aggsLambda);
+    public void setPager_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPager_Missing("pager", opLambda, aggsLambda);
     }
 
-    public void setInitials_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "initials");
+    public void setPager_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "pager");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3215,20 +3179,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCarLicense_Terms() {
-        setCarLicense_Terms(null);
+    public void setPassword_Terms() {
+        setPassword_Terms(null);
     }
 
-    public void setCarLicense_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setCarLicense_Terms("carLicense", opLambda, null);
+    public void setPassword_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setPassword_Terms("password", opLambda, null);
     }
 
-    public void setCarLicense_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setCarLicense_Terms("carLicense", opLambda, aggsLambda);
+    public void setPassword_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPassword_Terms("password", opLambda, aggsLambda);
     }
 
-    public void setCarLicense_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "carLicense");
+    public void setPassword_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3239,22 +3203,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCarLicense_SignificantTerms() {
-        setCarLicense_SignificantTerms(null);
+    public void setPassword_SignificantTerms() {
+        setPassword_SignificantTerms(null);
     }
 
-    public void setCarLicense_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setCarLicense_SignificantTerms("carLicense", opLambda, null);
+    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setPassword_SignificantTerms("password", opLambda, null);
     }
 
-    public void setCarLicense_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setCarLicense_SignificantTerms("carLicense", opLambda, aggsLambda);
+        setPassword_SignificantTerms("password", opLambda, aggsLambda);
     }
 
-    public void setCarLicense_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setPassword_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "carLicense");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3265,21 +3229,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCarLicense_IpRange() {
-        setCarLicense_IpRange(null);
+    public void setPassword_IpRange() {
+        setPassword_IpRange(null);
     }
 
-    public void setCarLicense_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setCarLicense_IpRange("carLicense", opLambda, null);
+    public void setPassword_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setPassword_IpRange("password", opLambda, null);
     }
 
-    public void setCarLicense_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setCarLicense_IpRange("carLicense", opLambda, aggsLambda);
+    public void setPassword_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPassword_IpRange("password", opLambda, aggsLambda);
     }
 
-    public void setCarLicense_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "carLicense");
+    public void setPassword_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3290,51 +3253,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCarLicense_Count() {
-        setCarLicense_Count(null);
+    public void setPassword_Count() {
+        setPassword_Count(null);
     }
 
-    public void setCarLicense_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setCarLicense_Count("carLicense", opLambda);
+    public void setPassword_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setPassword_Count("password", opLambda);
     }
 
-    public void setCarLicense_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "carLicense");
+    public void setPassword_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_Cardinality() {
-        setCarLicense_Cardinality(null);
+    public void setPassword_Cardinality() {
+        setPassword_Cardinality(null);
     }
 
-    public void setCarLicense_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setCarLicense_Cardinality("carLicense", opLambda);
+    public void setPassword_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setPassword_Cardinality("password", opLambda);
     }
 
-    public void setCarLicense_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "carLicense");
+    public void setPassword_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_Missing() {
-        setCarLicense_Missing(null);
+    public void setPassword_Missing() {
+        setPassword_Missing(null);
     }
 
-    public void setCarLicense_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setCarLicense_Missing("carLicense", opLambda, null);
+    public void setPassword_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setPassword_Missing("password", opLambda, null);
     }
 
-    public void setCarLicense_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setCarLicense_Missing("carLicense", opLambda, aggsLambda);
+    public void setPassword_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPassword_Missing("password", opLambda, aggsLambda);
     }
 
-    public void setCarLicense_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "carLicense");
+    public void setPassword_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3345,20 +3307,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setMobile_Terms() {
-        setMobile_Terms(null);
+    public void setPhysicalDeliveryOfficeName_Terms() {
+        setPhysicalDeliveryOfficeName_Terms(null);
     }
 
-    public void setMobile_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setMobile_Terms("mobile", opLambda, null);
+    public void setPhysicalDeliveryOfficeName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setPhysicalDeliveryOfficeName_Terms("physicalDeliveryOfficeName", opLambda, null);
     }
 
-    public void setMobile_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setMobile_Terms("mobile", opLambda, aggsLambda);
+    public void setPhysicalDeliveryOfficeName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPhysicalDeliveryOfficeName_Terms("physicalDeliveryOfficeName", opLambda, aggsLambda);
     }
 
-    public void setMobile_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "mobile");
+    public void setPhysicalDeliveryOfficeName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "physicalDeliveryOfficeName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3369,22 +3332,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setMobile_SignificantTerms() {
-        setMobile_SignificantTerms(null);
+    public void setPhysicalDeliveryOfficeName_SignificantTerms() {
+        setPhysicalDeliveryOfficeName_SignificantTerms(null);
     }
 
-    public void setMobile_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setMobile_SignificantTerms("mobile", opLambda, null);
+    public void setPhysicalDeliveryOfficeName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setPhysicalDeliveryOfficeName_SignificantTerms("physicalDeliveryOfficeName", opLambda, null);
     }
 
-    public void setMobile_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setPhysicalDeliveryOfficeName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setMobile_SignificantTerms("mobile", opLambda, aggsLambda);
+        setPhysicalDeliveryOfficeName_SignificantTerms("physicalDeliveryOfficeName", opLambda, aggsLambda);
     }
 
-    public void setMobile_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "mobile");
+    public void setPhysicalDeliveryOfficeName_SignificantTerms(String name,
+            ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "physicalDeliveryOfficeName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3395,20 +3358,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setMobile_IpRange() {
-        setMobile_IpRange(null);
+    public void setPhysicalDeliveryOfficeName_IpRange() {
+        setPhysicalDeliveryOfficeName_IpRange(null);
     }
 
-    public void setMobile_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setMobile_IpRange("mobile", opLambda, null);
+    public void setPhysicalDeliveryOfficeName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setPhysicalDeliveryOfficeName_IpRange("physicalDeliveryOfficeName", opLambda, null);
     }
 
-    public void setMobile_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setMobile_IpRange("mobile", opLambda, aggsLambda);
+    public void setPhysicalDeliveryOfficeName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        setPhysicalDeliveryOfficeName_IpRange("physicalDeliveryOfficeName", opLambda, aggsLambda);
     }
 
-    public void setMobile_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "mobile");
+    public void setPhysicalDeliveryOfficeName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "physicalDeliveryOfficeName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3419,50 +3384,52 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setMobile_Count() {
-        setMobile_Count(null);
+    public void setPhysicalDeliveryOfficeName_Count() {
+        setPhysicalDeliveryOfficeName_Count(null);
     }
 
-    public void setMobile_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setMobile_Count("mobile", opLambda);
+    public void setPhysicalDeliveryOfficeName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setPhysicalDeliveryOfficeName_Count("physicalDeliveryOfficeName", opLambda);
     }
 
-    public void setMobile_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "mobile");
+    public void setPhysicalDeliveryOfficeName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "physicalDeliveryOfficeName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_Cardinality() {
-        setMobile_Cardinality(null);
+    public void setPhysicalDeliveryOfficeName_Cardinality() {
+        setPhysicalDeliveryOfficeName_Cardinality(null);
     }
 
-    public void setMobile_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setMobile_Cardinality("mobile", opLambda);
+    public void setPhysicalDeliveryOfficeName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setPhysicalDeliveryOfficeName_Cardinality("physicalDeliveryOfficeName", opLambda);
     }
 
-    public void setMobile_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "mobile");
+    public void setPhysicalDeliveryOfficeName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "physicalDeliveryOfficeName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_Missing() {
-        setMobile_Missing(null);
+    public void setPhysicalDeliveryOfficeName_Missing() {
+        setPhysicalDeliveryOfficeName_Missing(null);
     }
 
-    public void setMobile_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setMobile_Missing("mobile", opLambda, null);
+    public void setPhysicalDeliveryOfficeName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setPhysicalDeliveryOfficeName_Missing("physicalDeliveryOfficeName", opLambda, null);
     }
 
-    public void setMobile_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setMobile_Missing("mobile", opLambda, aggsLambda);
+    public void setPhysicalDeliveryOfficeName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        setPhysicalDeliveryOfficeName_Missing("physicalDeliveryOfficeName", opLambda, aggsLambda);
     }
 
-    public void setMobile_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "mobile");
+    public void setPhysicalDeliveryOfficeName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "physicalDeliveryOfficeName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3473,20 +3440,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPostalAddress_Terms() {
-        setPostalAddress_Terms(null);
+    public void setPostOfficeBox_Terms() {
+        setPostOfficeBox_Terms(null);
     }
 
-    public void setPostalAddress_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setPostalAddress_Terms("postalAddress", opLambda, null);
+    public void setPostOfficeBox_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setPostOfficeBox_Terms("postOfficeBox", opLambda, null);
     }
 
-    public void setPostalAddress_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPostalAddress_Terms("postalAddress", opLambda, aggsLambda);
-    }
+    public void setPostOfficeBox_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPostOfficeBox_Terms("postOfficeBox", opLambda, aggsLambda);
+    }
 
-    public void setPostalAddress_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "postalAddress");
+    public void setPostOfficeBox_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "postOfficeBox");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3497,22 +3464,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPostalAddress_SignificantTerms() {
-        setPostalAddress_SignificantTerms(null);
+    public void setPostOfficeBox_SignificantTerms() {
+        setPostOfficeBox_SignificantTerms(null);
     }
 
-    public void setPostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setPostalAddress_SignificantTerms("postalAddress", opLambda, null);
+    public void setPostOfficeBox_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setPostOfficeBox_SignificantTerms("postOfficeBox", opLambda, null);
     }
 
-    public void setPostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setPostOfficeBox_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setPostalAddress_SignificantTerms("postalAddress", opLambda, aggsLambda);
+        setPostOfficeBox_SignificantTerms("postOfficeBox", opLambda, aggsLambda);
     }
 
-    public void setPostalAddress_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setPostOfficeBox_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "postalAddress");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "postOfficeBox");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3523,21 +3490,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPostalAddress_IpRange() {
-        setPostalAddress_IpRange(null);
+    public void setPostOfficeBox_IpRange() {
+        setPostOfficeBox_IpRange(null);
     }
 
-    public void setPostalAddress_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setPostalAddress_IpRange("postalAddress", opLambda, null);
+    public void setPostOfficeBox_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setPostOfficeBox_IpRange("postOfficeBox", opLambda, null);
     }
 
-    public void setPostalAddress_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPostalAddress_IpRange("postalAddress", opLambda, aggsLambda);
+    public void setPostOfficeBox_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPostOfficeBox_IpRange("postOfficeBox", opLambda, aggsLambda);
     }
 
-    public void setPostalAddress_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setPostOfficeBox_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "postalAddress");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "postOfficeBox");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3548,51 +3515,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPostalAddress_Count() {
-        setPostalAddress_Count(null);
+    public void setPostOfficeBox_Count() {
+        setPostOfficeBox_Count(null);
     }
 
-    public void setPostalAddress_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setPostalAddress_Count("postalAddress", opLambda);
+    public void setPostOfficeBox_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setPostOfficeBox_Count("postOfficeBox", opLambda);
     }
 
-    public void setPostalAddress_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "postalAddress");
+    public void setPostOfficeBox_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "postOfficeBox");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_Cardinality() {
-        setPostalAddress_Cardinality(null);
+    public void setPostOfficeBox_Cardinality() {
+        setPostOfficeBox_Cardinality(null);
     }
 
-    public void setPostalAddress_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setPostalAddress_Cardinality("postalAddress", opLambda);
+    public void setPostOfficeBox_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setPostOfficeBox_Cardinality("postOfficeBox", opLambda);
     }
 
-    public void setPostalAddress_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "postalAddress");
+    public void setPostOfficeBox_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "postOfficeBox");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_Missing() {
-        setPostalAddress_Missing(null);
+    public void setPostOfficeBox_Missing() {
+        setPostOfficeBox_Missing(null);
     }
 
-    public void setPostalAddress_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setPostalAddress_Missing("postalAddress", opLambda, null);
+    public void setPostOfficeBox_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setPostOfficeBox_Missing("postOfficeBox", opLambda, null);
     }
 
-    public void setPostalAddress_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPostalAddress_Missing("postalAddress", opLambda, aggsLambda);
+    public void setPostOfficeBox_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPostOfficeBox_Missing("postOfficeBox", opLambda, aggsLambda);
     }
 
-    public void setPostalAddress_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setPostOfficeBox_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "postalAddress");
+        MissingAggregationBuilder builder = regMissingA(name, "postOfficeBox");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3603,20 +3570,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCity_Terms() {
-        setCity_Terms(null);
+    public void setPostalAddress_Terms() {
+        setPostalAddress_Terms(null);
     }
 
-    public void setCity_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setCity_Terms("city", opLambda, null);
+    public void setPostalAddress_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setPostalAddress_Terms("postalAddress", opLambda, null);
     }
 
-    public void setCity_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setCity_Terms("city", opLambda, aggsLambda);
+    public void setPostalAddress_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPostalAddress_Terms("postalAddress", opLambda, aggsLambda);
     }
 
-    public void setCity_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "city");
+    public void setPostalAddress_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "postalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3627,21 +3594,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCity_SignificantTerms() {
-        setCity_SignificantTerms(null);
+    public void setPostalAddress_SignificantTerms() {
+        setPostalAddress_SignificantTerms(null);
     }
 
-    public void setCity_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setCity_SignificantTerms("city", opLambda, null);
+    public void setPostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setPostalAddress_SignificantTerms("postalAddress", opLambda, null);
     }
 
-    public void setCity_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setCity_SignificantTerms("city", opLambda, aggsLambda);
+    public void setPostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        setPostalAddress_SignificantTerms("postalAddress", opLambda, aggsLambda);
     }
 
-    public void setCity_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setPostalAddress_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "city");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "postalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3652,20 +3620,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCity_IpRange() {
-        setCity_IpRange(null);
+    public void setPostalAddress_IpRange() {
+        setPostalAddress_IpRange(null);
     }
 
-    public void setCity_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setCity_IpRange("city", opLambda, null);
+    public void setPostalAddress_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setPostalAddress_IpRange("postalAddress", opLambda, null);
     }
 
-    public void setCity_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setCity_IpRange("city", opLambda, aggsLambda);
+    public void setPostalAddress_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPostalAddress_IpRange("postalAddress", opLambda, aggsLambda);
     }
 
-    public void setCity_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "city");
+    public void setPostalAddress_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "postalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3676,50 +3645,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setCity_Count() {
-        setCity_Count(null);
+    public void setPostalAddress_Count() {
+        setPostalAddress_Count(null);
     }
 
-    public void setCity_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setCity_Count("city", opLambda);
+    public void setPostalAddress_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setPostalAddress_Count("postalAddress", opLambda);
     }
 
-    public void setCity_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "city");
+    public void setPostalAddress_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "postalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_Cardinality() {
-        setCity_Cardinality(null);
+    public void setPostalAddress_Cardinality() {
+        setPostalAddress_Cardinality(null);
     }
 
-    public void setCity_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setCity_Cardinality("city", opLambda);
+    public void setPostalAddress_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setPostalAddress_Cardinality("postalAddress", opLambda);
     }
 
-    public void setCity_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "city");
+    public void setPostalAddress_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "postalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_Missing() {
-        setCity_Missing(null);
+    public void setPostalAddress_Missing() {
+        setPostalAddress_Missing(null);
     }
 
-    public void setCity_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setCity_Missing("city", opLambda, null);
+    public void setPostalAddress_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setPostalAddress_Missing("postalAddress", opLambda, null);
     }
 
-    public void setCity_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setCity_Missing("city", opLambda, aggsLambda);
+    public void setPostalAddress_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPostalAddress_Missing("postalAddress", opLambda, aggsLambda);
     }
 
-    public void setCity_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "city");
+    public void setPostalAddress_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "postalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3730,21 +3700,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTeletexTerminalIdentifier_Terms() {
-        setTeletexTerminalIdentifier_Terms(null);
+    public void setPostalCode_Terms() {
+        setPostalCode_Terms(null);
     }
 
-    public void setTeletexTerminalIdentifier_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setTeletexTerminalIdentifier_Terms("teletexTerminalIdentifier", opLambda, null);
+    public void setPostalCode_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setPostalCode_Terms("postalCode", opLambda, null);
     }
 
-    public void setTeletexTerminalIdentifier_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setTeletexTerminalIdentifier_Terms("teletexTerminalIdentifier", opLambda, aggsLambda);
+    public void setPostalCode_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPostalCode_Terms("postalCode", opLambda, aggsLambda);
     }
 
-    public void setTeletexTerminalIdentifier_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "teletexTerminalIdentifier");
+    public void setPostalCode_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "postalCode");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3755,22 +3724,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTeletexTerminalIdentifier_SignificantTerms() {
-        setTeletexTerminalIdentifier_SignificantTerms(null);
+    public void setPostalCode_SignificantTerms() {
+        setPostalCode_SignificantTerms(null);
     }
 
-    public void setTeletexTerminalIdentifier_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setTeletexTerminalIdentifier_SignificantTerms("teletexTerminalIdentifier", opLambda, null);
+    public void setPostalCode_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setPostalCode_SignificantTerms("postalCode", opLambda, null);
     }
 
-    public void setTeletexTerminalIdentifier_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setPostalCode_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setTeletexTerminalIdentifier_SignificantTerms("teletexTerminalIdentifier", opLambda, aggsLambda);
+        setPostalCode_SignificantTerms("postalCode", opLambda, aggsLambda);
     }
 
-    public void setTeletexTerminalIdentifier_SignificantTerms(String name,
-            ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "teletexTerminalIdentifier");
+    public void setPostalCode_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "postalCode");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3781,22 +3750,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTeletexTerminalIdentifier_IpRange() {
-        setTeletexTerminalIdentifier_IpRange(null);
+    public void setPostalCode_IpRange() {
+        setPostalCode_IpRange(null);
     }
 
-    public void setTeletexTerminalIdentifier_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setTeletexTerminalIdentifier_IpRange("teletexTerminalIdentifier", opLambda, null);
+    public void setPostalCode_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setPostalCode_IpRange("postalCode", opLambda, null);
     }
 
-    public void setTeletexTerminalIdentifier_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        setTeletexTerminalIdentifier_IpRange("teletexTerminalIdentifier", opLambda, aggsLambda);
+    public void setPostalCode_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPostalCode_IpRange("postalCode", opLambda, aggsLambda);
     }
 
-    public void setTeletexTerminalIdentifier_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setPostalCode_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "teletexTerminalIdentifier");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "postalCode");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3807,182 +3775,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setTeletexTerminalIdentifier_Count() {
-        setTeletexTerminalIdentifier_Count(null);
+    public void setPostalCode_Count() {
+        setPostalCode_Count(null);
     }
 
-    public void setTeletexTerminalIdentifier_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setTeletexTerminalIdentifier_Count("teletexTerminalIdentifier", opLambda);
+    public void setPostalCode_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setPostalCode_Count("postalCode", opLambda);
     }
 
-    public void setTeletexTerminalIdentifier_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "teletexTerminalIdentifier");
+    public void setPostalCode_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "postalCode");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_Cardinality() {
-        setTeletexTerminalIdentifier_Cardinality(null);
+    public void setPostalCode_Cardinality() {
+        setPostalCode_Cardinality(null);
     }
 
-    public void setTeletexTerminalIdentifier_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setTeletexTerminalIdentifier_Cardinality("teletexTerminalIdentifier", opLambda);
+    public void setPostalCode_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setPostalCode_Cardinality("postalCode", opLambda);
     }
 
-    public void setTeletexTerminalIdentifier_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "teletexTerminalIdentifier");
+    public void setPostalCode_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "postalCode");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_Missing() {
-        setTeletexTerminalIdentifier_Missing(null);
+    public void setPostalCode_Missing() {
+        setPostalCode_Missing(null);
     }
 
-    public void setTeletexTerminalIdentifier_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setTeletexTerminalIdentifier_Missing("teletexTerminalIdentifier", opLambda, null);
+    public void setPostalCode_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setPostalCode_Missing("postalCode", opLambda, null);
     }
 
-    public void setTeletexTerminalIdentifier_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        setTeletexTerminalIdentifier_Missing("teletexTerminalIdentifier", opLambda, aggsLambda);
-    }
-
-    public void setTeletexTerminalIdentifier_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "teletexTerminalIdentifier");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            UserCA ca = new UserCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setX121Address_Terms() {
-        setX121Address_Terms(null);
-    }
-
-    public void setX121Address_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setX121Address_Terms("x121Address", opLambda, null);
-    }
-
-    public void setX121Address_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setX121Address_Terms("x121Address", opLambda, aggsLambda);
-    }
-
-    public void setX121Address_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "x121Address");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            UserCA ca = new UserCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setX121Address_SignificantTerms() {
-        setX121Address_SignificantTerms(null);
-    }
-
-    public void setX121Address_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setX121Address_SignificantTerms("x121Address", opLambda, null);
-    }
-
-    public void setX121Address_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        setX121Address_SignificantTerms("x121Address", opLambda, aggsLambda);
-    }
-
-    public void setX121Address_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "x121Address");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            UserCA ca = new UserCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setX121Address_IpRange() {
-        setX121Address_IpRange(null);
-    }
-
-    public void setX121Address_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setX121Address_IpRange("x121Address", opLambda, null);
-    }
-
-    public void setX121Address_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setX121Address_IpRange("x121Address", opLambda, aggsLambda);
-    }
-
-    public void setX121Address_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "x121Address");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-        if (aggsLambda != null) {
-            UserCA ca = new UserCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setX121Address_Count() {
-        setX121Address_Count(null);
-    }
-
-    public void setX121Address_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setX121Address_Count("x121Address", opLambda);
-    }
-
-    public void setX121Address_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "x121Address");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setX121Address_Cardinality() {
-        setX121Address_Cardinality(null);
-    }
-
-    public void setX121Address_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setX121Address_Cardinality("x121Address", opLambda);
-    }
-
-    public void setX121Address_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "x121Address");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setX121Address_Missing() {
-        setX121Address_Missing(null);
-    }
-
-    public void setX121Address_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setX121Address_Missing("x121Address", opLambda, null);
-    }
-
-    public void setX121Address_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setX121Address_Missing("x121Address", opLambda, aggsLambda);
+    public void setPostalCode_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPostalCode_Missing("postalCode", opLambda, aggsLambda);
     }
 
-    public void setX121Address_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setPostalCode_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "x121Address");
+        MissingAggregationBuilder builder = regMissingA(name, "postalCode");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3993,21 +3830,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setBusinessCategory_Terms() {
-        setBusinessCategory_Terms(null);
+    public void setPreferredLanguage_Terms() {
+        setPreferredLanguage_Terms(null);
     }
 
-    public void setBusinessCategory_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setBusinessCategory_Terms("businessCategory", opLambda, null);
+    public void setPreferredLanguage_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setPreferredLanguage_Terms("preferredLanguage", opLambda, null);
     }
 
-    public void setBusinessCategory_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setBusinessCategory_Terms("businessCategory", opLambda, aggsLambda);
+    public void setPreferredLanguage_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPreferredLanguage_Terms("preferredLanguage", opLambda, aggsLambda);
     }
 
-    public void setBusinessCategory_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+    public void setPreferredLanguage_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "businessCategory");
+        TermsAggregationBuilder builder = regTermsA(name, "preferredLanguage");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4018,22 +3855,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setBusinessCategory_SignificantTerms() {
-        setBusinessCategory_SignificantTerms(null);
+    public void setPreferredLanguage_SignificantTerms() {
+        setPreferredLanguage_SignificantTerms(null);
     }
 
-    public void setBusinessCategory_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setBusinessCategory_SignificantTerms("businessCategory", opLambda, null);
+    public void setPreferredLanguage_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setPreferredLanguage_SignificantTerms("preferredLanguage", opLambda, null);
     }
 
-    public void setBusinessCategory_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setPreferredLanguage_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setBusinessCategory_SignificantTerms("businessCategory", opLambda, aggsLambda);
+        setPreferredLanguage_SignificantTerms("preferredLanguage", opLambda, aggsLambda);
     }
 
-    public void setBusinessCategory_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setPreferredLanguage_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "businessCategory");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "preferredLanguage");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4044,21 +3881,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setBusinessCategory_IpRange() {
-        setBusinessCategory_IpRange(null);
+    public void setPreferredLanguage_IpRange() {
+        setPreferredLanguage_IpRange(null);
     }
 
-    public void setBusinessCategory_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setBusinessCategory_IpRange("businessCategory", opLambda, null);
+    public void setPreferredLanguage_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setPreferredLanguage_IpRange("preferredLanguage", opLambda, null);
     }
 
-    public void setBusinessCategory_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setBusinessCategory_IpRange("businessCategory", opLambda, aggsLambda);
+    public void setPreferredLanguage_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPreferredLanguage_IpRange("preferredLanguage", opLambda, aggsLambda);
     }
 
-    public void setBusinessCategory_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setPreferredLanguage_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "businessCategory");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "preferredLanguage");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4069,51 +3906,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setBusinessCategory_Count() {
-        setBusinessCategory_Count(null);
+    public void setPreferredLanguage_Count() {
+        setPreferredLanguage_Count(null);
     }
 
-    public void setBusinessCategory_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setBusinessCategory_Count("businessCategory", opLambda);
+    public void setPreferredLanguage_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setPreferredLanguage_Count("preferredLanguage", opLambda);
     }
 
-    public void setBusinessCategory_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "businessCategory");
+    public void setPreferredLanguage_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "preferredLanguage");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_Cardinality() {
-        setBusinessCategory_Cardinality(null);
+    public void setPreferredLanguage_Cardinality() {
+        setPreferredLanguage_Cardinality(null);
     }
 
-    public void setBusinessCategory_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setBusinessCategory_Cardinality("businessCategory", opLambda);
+    public void setPreferredLanguage_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setPreferredLanguage_Cardinality("preferredLanguage", opLambda);
     }
 
-    public void setBusinessCategory_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "businessCategory");
+    public void setPreferredLanguage_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "preferredLanguage");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_Missing() {
-        setBusinessCategory_Missing(null);
+    public void setPreferredLanguage_Missing() {
+        setPreferredLanguage_Missing(null);
     }
 
-    public void setBusinessCategory_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setBusinessCategory_Missing("businessCategory", opLambda, null);
+    public void setPreferredLanguage_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setPreferredLanguage_Missing("preferredLanguage", opLambda, null);
     }
 
-    public void setBusinessCategory_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setBusinessCategory_Missing("businessCategory", opLambda, aggsLambda);
+    public void setPreferredLanguage_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setPreferredLanguage_Missing("preferredLanguage", opLambda, aggsLambda);
     }
 
-    public void setBusinessCategory_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setPreferredLanguage_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "businessCategory");
+        MissingAggregationBuilder builder = regMissingA(name, "preferredLanguage");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4255,20 +4092,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDisplayName_Terms() {
-        setDisplayName_Terms(null);
+    public void setRoles_Terms() {
+        setRoles_Terms(null);
     }
 
-    public void setDisplayName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setDisplayName_Terms("displayName", opLambda, null);
+    public void setRoles_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setRoles_Terms("roles", opLambda, null);
     }
 
-    public void setDisplayName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setDisplayName_Terms("displayName", opLambda, aggsLambda);
+    public void setRoles_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setRoles_Terms("roles", opLambda, aggsLambda);
     }
 
-    public void setDisplayName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "displayName");
+    public void setRoles_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4279,22 +4116,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDisplayName_SignificantTerms() {
-        setDisplayName_SignificantTerms(null);
+    public void setRoles_SignificantTerms() {
+        setRoles_SignificantTerms(null);
     }
 
-    public void setDisplayName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setDisplayName_SignificantTerms("displayName", opLambda, null);
+    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setRoles_SignificantTerms("roles", opLambda, null);
     }
 
-    public void setDisplayName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setDisplayName_SignificantTerms("displayName", opLambda, aggsLambda);
+        setRoles_SignificantTerms("roles", opLambda, aggsLambda);
     }
 
-    public void setDisplayName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setRoles_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "displayName");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4305,21 +4142,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDisplayName_IpRange() {
-        setDisplayName_IpRange(null);
+    public void setRoles_IpRange() {
+        setRoles_IpRange(null);
     }
 
-    public void setDisplayName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setDisplayName_IpRange("displayName", opLambda, null);
+    public void setRoles_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setRoles_IpRange("roles", opLambda, null);
     }
 
-    public void setDisplayName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setDisplayName_IpRange("displayName", opLambda, aggsLambda);
+    public void setRoles_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setRoles_IpRange("roles", opLambda, aggsLambda);
     }
 
-    public void setDisplayName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "displayName");
+    public void setRoles_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4330,51 +4166,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDisplayName_Count() {
-        setDisplayName_Count(null);
+    public void setRoles_Count() {
+        setRoles_Count(null);
     }
 
-    public void setDisplayName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setDisplayName_Count("displayName", opLambda);
+    public void setRoles_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setRoles_Count("roles", opLambda);
     }
 
-    public void setDisplayName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "displayName");
+    public void setRoles_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_Cardinality() {
-        setDisplayName_Cardinality(null);
+    public void setRoles_Cardinality() {
+        setRoles_Cardinality(null);
     }
 
-    public void setDisplayName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setDisplayName_Cardinality("displayName", opLambda);
+    public void setRoles_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setRoles_Cardinality("roles", opLambda);
     }
 
-    public void setDisplayName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "displayName");
+    public void setRoles_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_Missing() {
-        setDisplayName_Missing(null);
+    public void setRoles_Missing() {
+        setRoles_Missing(null);
     }
 
-    public void setDisplayName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setDisplayName_Missing("displayName", opLambda, null);
+    public void setRoles_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setRoles_Missing("roles", opLambda, null);
     }
 
-    public void setDisplayName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setDisplayName_Missing("displayName", opLambda, aggsLambda);
+    public void setRoles_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setRoles_Missing("roles", opLambda, aggsLambda);
     }
 
-    public void setDisplayName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "displayName");
+    public void setRoles_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4385,21 +4220,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPreferredLanguage_Terms() {
-        setPreferredLanguage_Terms(null);
+    public void setRoomNumber_Terms() {
+        setRoomNumber_Terms(null);
     }
 
-    public void setPreferredLanguage_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setPreferredLanguage_Terms("preferredLanguage", opLambda, null);
+    public void setRoomNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setRoomNumber_Terms("roomNumber", opLambda, null);
     }
 
-    public void setPreferredLanguage_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPreferredLanguage_Terms("preferredLanguage", opLambda, aggsLambda);
+    public void setRoomNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setRoomNumber_Terms("roomNumber", opLambda, aggsLambda);
     }
 
-    public void setPreferredLanguage_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "preferredLanguage");
+    public void setRoomNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "roomNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4410,22 +4244,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPreferredLanguage_SignificantTerms() {
-        setPreferredLanguage_SignificantTerms(null);
+    public void setRoomNumber_SignificantTerms() {
+        setRoomNumber_SignificantTerms(null);
     }
 
-    public void setPreferredLanguage_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setPreferredLanguage_SignificantTerms("preferredLanguage", opLambda, null);
+    public void setRoomNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setRoomNumber_SignificantTerms("roomNumber", opLambda, null);
     }
 
-    public void setPreferredLanguage_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setRoomNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setPreferredLanguage_SignificantTerms("preferredLanguage", opLambda, aggsLambda);
+        setRoomNumber_SignificantTerms("roomNumber", opLambda, aggsLambda);
     }
 
-    public void setPreferredLanguage_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setRoomNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "preferredLanguage");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roomNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4436,21 +4270,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPreferredLanguage_IpRange() {
-        setPreferredLanguage_IpRange(null);
+    public void setRoomNumber_IpRange() {
+        setRoomNumber_IpRange(null);
     }
 
-    public void setPreferredLanguage_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setPreferredLanguage_IpRange("preferredLanguage", opLambda, null);
+    public void setRoomNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setRoomNumber_IpRange("roomNumber", opLambda, null);
     }
 
-    public void setPreferredLanguage_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPreferredLanguage_IpRange("preferredLanguage", opLambda, aggsLambda);
+    public void setRoomNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setRoomNumber_IpRange("roomNumber", opLambda, aggsLambda);
     }
 
-    public void setPreferredLanguage_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+    public void setRoomNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "preferredLanguage");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "roomNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4461,51 +4295,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setPreferredLanguage_Count() {
-        setPreferredLanguage_Count(null);
+    public void setRoomNumber_Count() {
+        setRoomNumber_Count(null);
     }
 
-    public void setPreferredLanguage_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setPreferredLanguage_Count("preferredLanguage", opLambda);
+    public void setRoomNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setRoomNumber_Count("roomNumber", opLambda);
     }
 
-    public void setPreferredLanguage_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "preferredLanguage");
+    public void setRoomNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "roomNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_Cardinality() {
-        setPreferredLanguage_Cardinality(null);
+    public void setRoomNumber_Cardinality() {
+        setRoomNumber_Cardinality(null);
     }
 
-    public void setPreferredLanguage_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setPreferredLanguage_Cardinality("preferredLanguage", opLambda);
+    public void setRoomNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setRoomNumber_Cardinality("roomNumber", opLambda);
     }
 
-    public void setPreferredLanguage_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "preferredLanguage");
+    public void setRoomNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "roomNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_Missing() {
-        setPreferredLanguage_Missing(null);
+    public void setRoomNumber_Missing() {
+        setRoomNumber_Missing(null);
     }
 
-    public void setPreferredLanguage_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setPreferredLanguage_Missing("preferredLanguage", opLambda, null);
+    public void setRoomNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setRoomNumber_Missing("roomNumber", opLambda, null);
     }
 
-    public void setPreferredLanguage_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setPreferredLanguage_Missing("preferredLanguage", opLambda, aggsLambda);
+    public void setRoomNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setRoomNumber_Missing("roomNumber", opLambda, aggsLambda);
     }
 
-    public void setPreferredLanguage_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+    public void setRoomNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "preferredLanguage");
+        MissingAggregationBuilder builder = regMissingA(name, "roomNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4516,21 +4350,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDepartmentNumber_Terms() {
-        setDepartmentNumber_Terms(null);
+    public void setState_Terms() {
+        setState_Terms(null);
     }
 
-    public void setDepartmentNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setDepartmentNumber_Terms("departmentNumber", opLambda, null);
+    public void setState_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setState_Terms("state", opLambda, null);
     }
 
-    public void setDepartmentNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setDepartmentNumber_Terms("departmentNumber", opLambda, aggsLambda);
+    public void setState_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setState_Terms("state", opLambda, aggsLambda);
     }
 
-    public void setDepartmentNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "departmentNumber");
+    public void setState_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "state");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4541,22 +4374,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDepartmentNumber_SignificantTerms() {
-        setDepartmentNumber_SignificantTerms(null);
+    public void setState_SignificantTerms() {
+        setState_SignificantTerms(null);
     }
 
-    public void setDepartmentNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setDepartmentNumber_SignificantTerms("departmentNumber", opLambda, null);
+    public void setState_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setState_SignificantTerms("state", opLambda, null);
     }
 
-    public void setDepartmentNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setState_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setDepartmentNumber_SignificantTerms("departmentNumber", opLambda, aggsLambda);
+        setState_SignificantTerms("state", opLambda, aggsLambda);
     }
 
-    public void setDepartmentNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setState_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "departmentNumber");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "state");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4567,21 +4400,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDepartmentNumber_IpRange() {
-        setDepartmentNumber_IpRange(null);
+    public void setState_IpRange() {
+        setState_IpRange(null);
     }
 
-    public void setDepartmentNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setDepartmentNumber_IpRange("departmentNumber", opLambda, null);
+    public void setState_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setState_IpRange("state", opLambda, null);
     }
 
-    public void setDepartmentNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setDepartmentNumber_IpRange("departmentNumber", opLambda, aggsLambda);
+    public void setState_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setState_IpRange("state", opLambda, aggsLambda);
     }
 
-    public void setDepartmentNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "departmentNumber");
+    public void setState_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "state");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4592,51 +4424,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setDepartmentNumber_Count() {
-        setDepartmentNumber_Count(null);
+    public void setState_Count() {
+        setState_Count(null);
     }
 
-    public void setDepartmentNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setDepartmentNumber_Count("departmentNumber", opLambda);
+    public void setState_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setState_Count("state", opLambda);
     }
 
-    public void setDepartmentNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "departmentNumber");
+    public void setState_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "state");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_Cardinality() {
-        setDepartmentNumber_Cardinality(null);
+    public void setState_Cardinality() {
+        setState_Cardinality(null);
     }
 
-    public void setDepartmentNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setDepartmentNumber_Cardinality("departmentNumber", opLambda);
+    public void setState_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setState_Cardinality("state", opLambda);
     }
 
-    public void setDepartmentNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "departmentNumber");
+    public void setState_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "state");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_Missing() {
-        setDepartmentNumber_Missing(null);
+    public void setState_Missing() {
+        setState_Missing(null);
     }
 
-    public void setDepartmentNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setDepartmentNumber_Missing("departmentNumber", opLambda, null);
+    public void setState_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setState_Missing("state", opLambda, null);
     }
 
-    public void setDepartmentNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setDepartmentNumber_Missing("departmentNumber", opLambda, aggsLambda);
+    public void setState_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setState_Missing("state", opLambda, aggsLambda);
     }
 
-    public void setDepartmentNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "departmentNumber");
+    public void setState_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "state");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4647,141 +4478,277 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUidNumber_Avg() {
-        setUidNumber_Avg(null);
+    public void setStreet_Terms() {
+        setStreet_Terms(null);
     }
 
-    public void setUidNumber_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        setUidNumber_Avg("uidNumber", opLambda);
+    public void setStreet_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setStreet_Terms("street", opLambda, null);
     }
 
-    public void setUidNumber_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        AvgAggregationBuilder builder = regAvgA(name, "uidNumber");
+    public void setStreet_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setStreet_Terms("street", opLambda, aggsLambda);
+    }
+
+    public void setStreet_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "street");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-    }
+        if (aggsLambda != null) {
+            UserCA ca = new UserCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
 
-    public void setUidNumber_Max() {
-        setUidNumber_Max(null);
+    public void setStreet_SignificantTerms() {
+        setStreet_SignificantTerms(null);
     }
 
-    public void setUidNumber_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        setUidNumber_Max("uidNumber", opLambda);
+    public void setStreet_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setStreet_SignificantTerms("street", opLambda, null);
     }
 
-    public void setUidNumber_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        MaxAggregationBuilder builder = regMaxA(name, "uidNumber");
+    public void setStreet_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        setStreet_SignificantTerms("street", opLambda, aggsLambda);
+    }
+
+    public void setStreet_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "street");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            UserCA ca = new UserCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setUidNumber_Min() {
-        setUidNumber_Min(null);
+    public void setStreet_IpRange() {
+        setStreet_IpRange(null);
     }
 
-    public void setUidNumber_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        setUidNumber_Min("uidNumber", opLambda);
+    public void setStreet_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setStreet_IpRange("street", opLambda, null);
     }
 
-    public void setUidNumber_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        MinAggregationBuilder builder = regMinA(name, "uidNumber");
+    public void setStreet_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setStreet_IpRange("street", opLambda, aggsLambda);
+    }
+
+    public void setStreet_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "street");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            UserCA ca = new UserCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setUidNumber_Sum() {
-        setUidNumber_Sum(null);
+    public void setStreet_Count() {
+        setStreet_Count(null);
     }
 
-    public void setUidNumber_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        setUidNumber_Sum("uidNumber", opLambda);
+    public void setStreet_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setStreet_Count("street", opLambda);
     }
 
-    public void setUidNumber_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        SumAggregationBuilder builder = regSumA(name, "uidNumber");
+    public void setStreet_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "street");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUidNumber_ExtendedStats() {
-        setUidNumber_ExtendedStats(null);
+    public void setStreet_Cardinality() {
+        setStreet_Cardinality(null);
     }
 
-    public void setUidNumber_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        setUidNumber_ExtendedStats("uidNumber", opLambda);
+    public void setStreet_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setStreet_Cardinality("street", opLambda);
     }
 
-    public void setUidNumber_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "uidNumber");
+    public void setStreet_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "street");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUidNumber_Stats() {
-        setUidNumber_Stats(null);
+    public void setStreet_Missing() {
+        setStreet_Missing(null);
     }
 
-    public void setUidNumber_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        setUidNumber_Stats("uidNumber", opLambda);
+    public void setStreet_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setStreet_Missing("street", opLambda, null);
     }
 
-    public void setUidNumber_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        StatsAggregationBuilder builder = regStatsA(name, "uidNumber");
+    public void setStreet_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setStreet_Missing("street", opLambda, aggsLambda);
+    }
+
+    public void setStreet_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "street");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            UserCA ca = new UserCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setUidNumber_Percentiles() {
-        setUidNumber_Percentiles(null);
+    public void setSurname_Terms() {
+        setSurname_Terms(null);
     }
 
-    public void setUidNumber_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        setUidNumber_Percentiles("uidNumber", opLambda);
+    public void setSurname_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setSurname_Terms("surname", opLambda, null);
     }
 
-    public void setUidNumber_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        PercentilesAggregationBuilder builder = regPercentilesA(name, "uidNumber");
+    public void setSurname_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setSurname_Terms("surname", opLambda, aggsLambda);
+    }
+
+    public void setSurname_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "surname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            UserCA ca = new UserCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setSurname_SignificantTerms() {
+        setSurname_SignificantTerms(null);
     }
 
-    public void setUidNumber_PercentileRanks() {
-        setUidNumber_PercentileRanks(null);
+    public void setSurname_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setSurname_SignificantTerms("surname", opLambda, null);
     }
 
-    public void setUidNumber_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setUidNumber_PercentileRanks("uidNumber", opLambda);
+    public void setSurname_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        setSurname_SignificantTerms("surname", opLambda, aggsLambda);
     }
 
-    public void setUidNumber_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "uidNumber");
+    public void setSurname_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "surname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            UserCA ca = new UserCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setUidNumber_Histogram() {
-        setUidNumber_Histogram(null);
+    public void setSurname_IpRange() {
+        setSurname_IpRange(null);
     }
 
-    public void setUidNumber_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
-        setUidNumber_Histogram("uidNumber", opLambda, null);
+    public void setSurname_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setSurname_IpRange("surname", opLambda, null);
     }
 
-    public void setUidNumber_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setUidNumber_Histogram("uidNumber", opLambda, aggsLambda);
+    public void setSurname_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setSurname_IpRange("surname", opLambda, aggsLambda);
     }
 
-    public void setUidNumber_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+    public void setSurname_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "surname");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            UserCA ca = new UserCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setSurname_Count() {
+        setSurname_Count(null);
+    }
+
+    public void setSurname_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setSurname_Count("surname", opLambda);
+    }
+
+    public void setSurname_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "surname");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setSurname_Cardinality() {
+        setSurname_Cardinality(null);
+    }
+
+    public void setSurname_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setSurname_Cardinality("surname", opLambda);
+    }
+
+    public void setSurname_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "surname");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setSurname_Missing() {
+        setSurname_Missing(null);
+    }
+
+    public void setSurname_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setSurname_Missing("surname", opLambda, null);
+    }
+
+    public void setSurname_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setSurname_Missing("surname", opLambda, aggsLambda);
+    }
+
+    public void setSurname_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "surname");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            UserCA ca = new UserCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setTelephoneNumber_Terms() {
+        setTelephoneNumber_Terms(null);
+    }
+
+    public void setTelephoneNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setTelephoneNumber_Terms("telephoneNumber", opLambda, null);
+    }
+
+    public void setTelephoneNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setTelephoneNumber_Terms("telephoneNumber", opLambda, aggsLambda);
+    }
+
+    public void setTelephoneNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        HistogramAggregationBuilder builder = regHistogramA(name, "uidNumber");
+        TermsAggregationBuilder builder = regTermsA(name, "telephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4792,20 +4759,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUidNumber_Range() {
-        setUidNumber_Range(null);
+    public void setTelephoneNumber_SignificantTerms() {
+        setTelephoneNumber_SignificantTerms(null);
     }
 
-    public void setUidNumber_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
-        setUidNumber_Range("uidNumber", opLambda, null);
+    public void setTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setTelephoneNumber_SignificantTerms("telephoneNumber", opLambda, null);
     }
 
-    public void setUidNumber_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setUidNumber_Range("uidNumber", opLambda, aggsLambda);
+    public void setTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        setTelephoneNumber_SignificantTerms("telephoneNumber", opLambda, aggsLambda);
     }
 
-    public void setUidNumber_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        RangeAggregationBuilder builder = regRangeA(name, "uidNumber");
+    public void setTelephoneNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "telephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4816,50 +4785,101 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setUidNumber_Count() {
-        setUidNumber_Count(null);
+    public void setTelephoneNumber_IpRange() {
+        setTelephoneNumber_IpRange(null);
     }
 
-    public void setUidNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setUidNumber_Count("uidNumber", opLambda);
+    public void setTelephoneNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setTelephoneNumber_IpRange("telephoneNumber", opLambda, null);
     }
 
-    public void setUidNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "uidNumber");
+    public void setTelephoneNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setTelephoneNumber_IpRange("telephoneNumber", opLambda, aggsLambda);
+    }
+
+    public void setTelephoneNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "telephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            UserCA ca = new UserCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setUidNumber_Cardinality() {
-        setUidNumber_Cardinality(null);
+    public void setTelephoneNumber_Count() {
+        setTelephoneNumber_Count(null);
     }
 
-    public void setUidNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setUidNumber_Cardinality("uidNumber", opLambda);
+    public void setTelephoneNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setTelephoneNumber_Count("telephoneNumber", opLambda);
     }
 
-    public void setUidNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "uidNumber");
+    public void setTelephoneNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "telephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUidNumber_Missing() {
-        setUidNumber_Missing(null);
+    public void setTelephoneNumber_Cardinality() {
+        setTelephoneNumber_Cardinality(null);
     }
 
-    public void setUidNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setUidNumber_Missing("uidNumber", opLambda, null);
+    public void setTelephoneNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setTelephoneNumber_Cardinality("telephoneNumber", opLambda);
     }
 
-    public void setUidNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setUidNumber_Missing("uidNumber", opLambda, aggsLambda);
+    public void setTelephoneNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "telephoneNumber");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTelephoneNumber_Missing() {
+        setTelephoneNumber_Missing(null);
+    }
+
+    public void setTelephoneNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setTelephoneNumber_Missing("telephoneNumber", opLambda, null);
+    }
+
+    public void setTelephoneNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setTelephoneNumber_Missing("telephoneNumber", opLambda, aggsLambda);
+    }
+
+    public void setTelephoneNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "telephoneNumber");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+        if (aggsLambda != null) {
+            UserCA ca = new UserCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setTeletexTerminalIdentifier_Terms() {
+        setTeletexTerminalIdentifier_Terms(null);
+    }
+
+    public void setTeletexTerminalIdentifier_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setTeletexTerminalIdentifier_Terms("teletexTerminalIdentifier", opLambda, null);
+    }
+
+    public void setTeletexTerminalIdentifier_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setTeletexTerminalIdentifier_Terms("teletexTerminalIdentifier", opLambda, aggsLambda);
     }
 
-    public void setUidNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "uidNumber");
+    public void setTeletexTerminalIdentifier_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "teletexTerminalIdentifier");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4870,141 +4890,154 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setGidNumber_Avg() {
-        setGidNumber_Avg(null);
-    }
-
-    public void setGidNumber_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        setGidNumber_Avg("gidNumber", opLambda);
-    }
-
-    public void setGidNumber_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
-        AvgAggregationBuilder builder = regAvgA(name, "gidNumber");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setTeletexTerminalIdentifier_SignificantTerms() {
+        setTeletexTerminalIdentifier_SignificantTerms(null);
     }
 
-    public void setGidNumber_Max() {
-        setGidNumber_Max(null);
+    public void setTeletexTerminalIdentifier_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setTeletexTerminalIdentifier_SignificantTerms("teletexTerminalIdentifier", opLambda, null);
     }
 
-    public void setGidNumber_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        setGidNumber_Max("gidNumber", opLambda);
+    public void setTeletexTerminalIdentifier_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        setTeletexTerminalIdentifier_SignificantTerms("teletexTerminalIdentifier", opLambda, aggsLambda);
     }
 
-    public void setGidNumber_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
-        MaxAggregationBuilder builder = regMaxA(name, "gidNumber");
+    public void setTeletexTerminalIdentifier_SignificantTerms(String name,
+            ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "teletexTerminalIdentifier");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            UserCA ca = new UserCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setGidNumber_Min() {
-        setGidNumber_Min(null);
-    }
-
-    public void setGidNumber_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        setGidNumber_Min("gidNumber", opLambda);
-    }
-
-    public void setGidNumber_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
-        MinAggregationBuilder builder = regMinA(name, "gidNumber");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setTeletexTerminalIdentifier_IpRange() {
+        setTeletexTerminalIdentifier_IpRange(null);
     }
 
-    public void setGidNumber_Sum() {
-        setGidNumber_Sum(null);
+    public void setTeletexTerminalIdentifier_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setTeletexTerminalIdentifier_IpRange("teletexTerminalIdentifier", opLambda, null);
     }
 
-    public void setGidNumber_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        setGidNumber_Sum("gidNumber", opLambda);
+    public void setTeletexTerminalIdentifier_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        setTeletexTerminalIdentifier_IpRange("teletexTerminalIdentifier", opLambda, aggsLambda);
     }
 
-    public void setGidNumber_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
-        SumAggregationBuilder builder = regSumA(name, "gidNumber");
+    public void setTeletexTerminalIdentifier_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "teletexTerminalIdentifier");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            UserCA ca = new UserCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setGidNumber_ExtendedStats() {
-        setGidNumber_ExtendedStats(null);
+    public void setTeletexTerminalIdentifier_Count() {
+        setTeletexTerminalIdentifier_Count(null);
     }
 
-    public void setGidNumber_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        setGidNumber_ExtendedStats("gidNumber", opLambda);
+    public void setTeletexTerminalIdentifier_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setTeletexTerminalIdentifier_Count("teletexTerminalIdentifier", opLambda);
     }
 
-    public void setGidNumber_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
-        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "gidNumber");
+    public void setTeletexTerminalIdentifier_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "teletexTerminalIdentifier");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_Stats() {
-        setGidNumber_Stats(null);
+    public void setTeletexTerminalIdentifier_Cardinality() {
+        setTeletexTerminalIdentifier_Cardinality(null);
     }
 
-    public void setGidNumber_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        setGidNumber_Stats("gidNumber", opLambda);
+    public void setTeletexTerminalIdentifier_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setTeletexTerminalIdentifier_Cardinality("teletexTerminalIdentifier", opLambda);
     }
 
-    public void setGidNumber_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
-        StatsAggregationBuilder builder = regStatsA(name, "gidNumber");
+    public void setTeletexTerminalIdentifier_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "teletexTerminalIdentifier");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_Percentiles() {
-        setGidNumber_Percentiles(null);
+    public void setTeletexTerminalIdentifier_Missing() {
+        setTeletexTerminalIdentifier_Missing(null);
     }
 
-    public void setGidNumber_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        setGidNumber_Percentiles("gidNumber", opLambda);
+    public void setTeletexTerminalIdentifier_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setTeletexTerminalIdentifier_Missing("teletexTerminalIdentifier", opLambda, null);
     }
 
-    public void setGidNumber_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
-        PercentilesAggregationBuilder builder = regPercentilesA(name, "gidNumber");
+    public void setTeletexTerminalIdentifier_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        setTeletexTerminalIdentifier_Missing("teletexTerminalIdentifier", opLambda, aggsLambda);
+    }
+
+    public void setTeletexTerminalIdentifier_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "teletexTerminalIdentifier");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            UserCA ca = new UserCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
+    }
+
+    public void setTitle_Terms() {
+        setTitle_Terms(null);
     }
 
-    public void setGidNumber_PercentileRanks() {
-        setGidNumber_PercentileRanks(null);
+    public void setTitle_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setTitle_Terms("title", opLambda, null);
     }
 
-    public void setGidNumber_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        setGidNumber_PercentileRanks("gidNumber", opLambda);
+    public void setTitle_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setTitle_Terms("title", opLambda, aggsLambda);
     }
 
-    public void setGidNumber_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
-        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "gidNumber");
+    public void setTitle_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "title");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
+        if (aggsLambda != null) {
+            UserCA ca = new UserCA();
+            aggsLambda.callback(ca);
+            ca.getAggregationBuilderList().forEach(builder::subAggregation);
+        }
     }
 
-    public void setGidNumber_Histogram() {
-        setGidNumber_Histogram(null);
+    public void setTitle_SignificantTerms() {
+        setTitle_SignificantTerms(null);
     }
 
-    public void setGidNumber_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
-        setGidNumber_Histogram("gidNumber", opLambda, null);
+    public void setTitle_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setTitle_SignificantTerms("title", opLambda, null);
     }
 
-    public void setGidNumber_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setGidNumber_Histogram("gidNumber", opLambda, aggsLambda);
+    public void setTitle_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        setTitle_SignificantTerms("title", opLambda, aggsLambda);
     }
 
-    public void setGidNumber_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+    public void setTitle_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        HistogramAggregationBuilder builder = regHistogramA(name, "gidNumber");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "title");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5015,20 +5048,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setGidNumber_Range() {
-        setGidNumber_Range(null);
+    public void setTitle_IpRange() {
+        setTitle_IpRange(null);
     }
 
-    public void setGidNumber_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
-        setGidNumber_Range("gidNumber", opLambda, null);
+    public void setTitle_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setTitle_IpRange("title", opLambda, null);
     }
 
-    public void setGidNumber_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setGidNumber_Range("gidNumber", opLambda, aggsLambda);
+    public void setTitle_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setTitle_IpRange("title", opLambda, aggsLambda);
     }
 
-    public void setGidNumber_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        RangeAggregationBuilder builder = regRangeA(name, "gidNumber");
+    public void setTitle_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "title");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5039,50 +5072,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setGidNumber_Count() {
-        setGidNumber_Count(null);
+    public void setTitle_Count() {
+        setTitle_Count(null);
     }
 
-    public void setGidNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setGidNumber_Count("gidNumber", opLambda);
+    public void setTitle_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setTitle_Count("title", opLambda);
     }
 
-    public void setGidNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "gidNumber");
+    public void setTitle_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "title");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_Cardinality() {
-        setGidNumber_Cardinality(null);
+    public void setTitle_Cardinality() {
+        setTitle_Cardinality(null);
     }
 
-    public void setGidNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setGidNumber_Cardinality("gidNumber", opLambda);
+    public void setTitle_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setTitle_Cardinality("title", opLambda);
     }
 
-    public void setGidNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "gidNumber");
+    public void setTitle_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "title");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_Missing() {
-        setGidNumber_Missing(null);
+    public void setTitle_Missing() {
+        setTitle_Missing(null);
     }
 
-    public void setGidNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setGidNumber_Missing("gidNumber", opLambda, null);
+    public void setTitle_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setTitle_Missing("title", opLambda, null);
     }
 
-    public void setGidNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setGidNumber_Missing("gidNumber", opLambda, aggsLambda);
+    public void setTitle_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setTitle_Missing("title", opLambda, aggsLambda);
     }
 
-    public void setGidNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "gidNumber");
+    public void setTitle_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "title");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5093,176 +5126,141 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setHomeDirectory_Terms() {
-        setHomeDirectory_Terms(null);
-    }
-
-    public void setHomeDirectory_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setHomeDirectory_Terms("homeDirectory", opLambda, null);
+    public void setUidNumber_Avg() {
+        setUidNumber_Avg(null);
     }
 
-    public void setHomeDirectory_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setHomeDirectory_Terms("homeDirectory", opLambda, aggsLambda);
+    public void setUidNumber_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        setUidNumber_Avg("uidNumber", opLambda);
     }
 
-    public void setHomeDirectory_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "homeDirectory");
+    public void setUidNumber_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            UserCA ca = new UserCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setHomeDirectory_SignificantTerms() {
-        setHomeDirectory_SignificantTerms(null);
+    public void setUidNumber_Max() {
+        setUidNumber_Max(null);
     }
 
-    public void setHomeDirectory_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setHomeDirectory_SignificantTerms("homeDirectory", opLambda, null);
+    public void setUidNumber_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        setUidNumber_Max("uidNumber", opLambda);
     }
 
-    public void setHomeDirectory_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        setHomeDirectory_SignificantTerms("homeDirectory", opLambda, aggsLambda);
+    public void setUidNumber_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "uidNumber");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUidNumber_Min() {
+        setUidNumber_Min(null);
+    }
+
+    public void setUidNumber_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        setUidNumber_Min("uidNumber", opLambda);
     }
 
-    public void setHomeDirectory_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "homeDirectory");
+    public void setUidNumber_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            UserCA ca = new UserCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setHomeDirectory_IpRange() {
-        setHomeDirectory_IpRange(null);
     }
 
-    public void setHomeDirectory_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setHomeDirectory_IpRange("homeDirectory", opLambda, null);
+    public void setUidNumber_Sum() {
+        setUidNumber_Sum(null);
     }
 
-    public void setHomeDirectory_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setHomeDirectory_IpRange("homeDirectory", opLambda, aggsLambda);
+    public void setUidNumber_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        setUidNumber_Sum("uidNumber", opLambda);
     }
 
-    public void setHomeDirectory_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "homeDirectory");
+    public void setUidNumber_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            UserCA ca = new UserCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setHomeDirectory_Count() {
-        setHomeDirectory_Count(null);
+    public void setUidNumber_ExtendedStats() {
+        setUidNumber_ExtendedStats(null);
     }
 
-    public void setHomeDirectory_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setHomeDirectory_Count("homeDirectory", opLambda);
+    public void setUidNumber_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        setUidNumber_ExtendedStats("uidNumber", opLambda);
     }
 
-    public void setHomeDirectory_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "homeDirectory");
+    public void setUidNumber_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_Cardinality() {
-        setHomeDirectory_Cardinality(null);
+    public void setUidNumber_Stats() {
+        setUidNumber_Stats(null);
     }
 
-    public void setHomeDirectory_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setHomeDirectory_Cardinality("homeDirectory", opLambda);
+    public void setUidNumber_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        setUidNumber_Stats("uidNumber", opLambda);
     }
 
-    public void setHomeDirectory_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "homeDirectory");
+    public void setUidNumber_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_Missing() {
-        setHomeDirectory_Missing(null);
-    }
-
-    public void setHomeDirectory_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setHomeDirectory_Missing("homeDirectory", opLambda, null);
+    public void setUidNumber_Percentiles() {
+        setUidNumber_Percentiles(null);
     }
 
-    public void setHomeDirectory_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setHomeDirectory_Missing("homeDirectory", opLambda, aggsLambda);
+    public void setUidNumber_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        setUidNumber_Percentiles("uidNumber", opLambda);
     }
 
-    public void setHomeDirectory_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "homeDirectory");
+    public void setUidNumber_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            UserCA ca = new UserCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
-    }
-
-    public void setGroups_Terms() {
-        setGroups_Terms(null);
     }
 
-    public void setGroups_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setGroups_Terms("groups", opLambda, null);
+    public void setUidNumber_PercentileRanks(double[] values) {
+        setUidNumber_PercentileRanks(values, null);
     }
 
-    public void setGroups_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setGroups_Terms("groups", opLambda, aggsLambda);
+    public void setUidNumber_PercentileRanks(double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        setUidNumber_PercentileRanks("uidNumber", values, opLambda);
     }
 
-    public void setGroups_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "groups");
+    public void setUidNumber_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "uidNumber", values);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
-        if (aggsLambda != null) {
-            UserCA ca = new UserCA();
-            aggsLambda.callback(ca);
-            ca.getAggregationBuilderList().forEach(builder::subAggregation);
-        }
     }
 
-    public void setGroups_SignificantTerms() {
-        setGroups_SignificantTerms(null);
+    public void setUidNumber_Histogram() {
+        setUidNumber_Histogram(null);
     }
 
-    public void setGroups_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setGroups_SignificantTerms("groups", opLambda, null);
+    public void setUidNumber_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
+        setUidNumber_Histogram("uidNumber", opLambda, null);
     }
 
-    public void setGroups_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        setGroups_SignificantTerms("groups", opLambda, aggsLambda);
+    public void setUidNumber_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setUidNumber_Histogram("uidNumber", opLambda, aggsLambda);
     }
 
-    public void setGroups_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setUidNumber_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "groups");
+        HistogramAggregationBuilder builder = regHistogramA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5273,20 +5271,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setGroups_IpRange() {
-        setGroups_IpRange(null);
+    public void setUidNumber_Range() {
+        setUidNumber_Range(null);
     }
 
-    public void setGroups_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setGroups_IpRange("groups", opLambda, null);
+    public void setUidNumber_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
+        setUidNumber_Range("uidNumber", opLambda, null);
     }
 
-    public void setGroups_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setGroups_IpRange("groups", opLambda, aggsLambda);
+    public void setUidNumber_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setUidNumber_Range("uidNumber", opLambda, aggsLambda);
     }
 
-    public void setGroups_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "groups");
+    public void setUidNumber_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5297,50 +5295,50 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setGroups_Count() {
-        setGroups_Count(null);
+    public void setUidNumber_Count() {
+        setUidNumber_Count(null);
     }
 
-    public void setGroups_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setGroups_Count("groups", opLambda);
+    public void setUidNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setUidNumber_Count("uidNumber", opLambda);
     }
 
-    public void setGroups_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "groups");
+    public void setUidNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGroups_Cardinality() {
-        setGroups_Cardinality(null);
+    public void setUidNumber_Cardinality() {
+        setUidNumber_Cardinality(null);
     }
 
-    public void setGroups_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setGroups_Cardinality("groups", opLambda);
+    public void setUidNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setUidNumber_Cardinality("uidNumber", opLambda);
     }
 
-    public void setGroups_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "groups");
+    public void setUidNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGroups_Missing() {
-        setGroups_Missing(null);
+    public void setUidNumber_Missing() {
+        setUidNumber_Missing(null);
     }
 
-    public void setGroups_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setGroups_Missing("groups", opLambda, null);
+    public void setUidNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setUidNumber_Missing("uidNumber", opLambda, null);
     }
 
-    public void setGroups_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setGroups_Missing("groups", opLambda, aggsLambda);
+    public void setUidNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setUidNumber_Missing("uidNumber", opLambda, aggsLambda);
     }
 
-    public void setGroups_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "groups");
+    public void setUidNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5351,20 +5349,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setRoles_Terms() {
-        setRoles_Terms(null);
+    public void setX121Address_Terms() {
+        setX121Address_Terms(null);
     }
 
-    public void setRoles_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
-        setRoles_Terms("roles", opLambda, null);
+    public void setX121Address_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
+        setX121Address_Terms("x121Address", opLambda, null);
     }
 
-    public void setRoles_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setRoles_Terms("roles", opLambda, aggsLambda);
+    public void setX121Address_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setX121Address_Terms("x121Address", opLambda, aggsLambda);
     }
 
-    public void setRoles_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsAggregationBuilder builder = regTermsA(name, "roles");
+    public void setX121Address_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "x121Address");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5375,22 +5373,22 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setRoles_SignificantTerms() {
-        setRoles_SignificantTerms(null);
+    public void setX121Address_SignificantTerms() {
+        setX121Address_SignificantTerms(null);
     }
 
-    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
-        setRoles_SignificantTerms("roles", opLambda, null);
+    public void setX121Address_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
+        setX121Address_SignificantTerms("x121Address", opLambda, null);
     }
 
-    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setX121Address_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        setRoles_SignificantTerms("roles", opLambda, aggsLambda);
+        setX121Address_SignificantTerms("x121Address", opLambda, aggsLambda);
     }
 
-    public void setRoles_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+    public void setX121Address_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roles");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "x121Address");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5401,20 +5399,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setRoles_IpRange() {
-        setRoles_IpRange(null);
+    public void setX121Address_IpRange() {
+        setX121Address_IpRange(null);
     }
 
-    public void setRoles_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
-        setRoles_IpRange("roles", opLambda, null);
+    public void setX121Address_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
+        setX121Address_IpRange("x121Address", opLambda, null);
     }
 
-    public void setRoles_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setRoles_IpRange("roles", opLambda, aggsLambda);
+    public void setX121Address_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setX121Address_IpRange("x121Address", opLambda, aggsLambda);
     }
 
-    public void setRoles_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IpRangeAggregationBuilder builder = regIpRangeA(name, "roles");
+    public void setX121Address_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "x121Address");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5425,50 +5424,51 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void setRoles_Count() {
-        setRoles_Count(null);
+    public void setX121Address_Count() {
+        setX121Address_Count(null);
     }
 
-    public void setRoles_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        setRoles_Count("roles", opLambda);
+    public void setX121Address_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        setX121Address_Count("x121Address", opLambda);
     }
 
-    public void setRoles_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
-        ValueCountAggregationBuilder builder = regCountA(name, "roles");
+    public void setX121Address_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "x121Address");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_Cardinality() {
-        setRoles_Cardinality(null);
+    public void setX121Address_Cardinality() {
+        setX121Address_Cardinality(null);
     }
 
-    public void setRoles_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        setRoles_Cardinality("roles", opLambda);
+    public void setX121Address_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        setX121Address_Cardinality("x121Address", opLambda);
     }
 
-    public void setRoles_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
-        CardinalityAggregationBuilder builder = regCardinalityA(name, "roles");
+    public void setX121Address_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "x121Address");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_Missing() {
-        setRoles_Missing(null);
+    public void setX121Address_Missing() {
+        setX121Address_Missing(null);
     }
 
-    public void setRoles_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
-        setRoles_Missing("roles", opLambda, null);
+    public void setX121Address_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
+        setX121Address_Missing("x121Address", opLambda, null);
     }
 
-    public void setRoles_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        setRoles_Missing("roles", opLambda, aggsLambda);
+    public void setX121Address_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        setX121Address_Missing("x121Address", opLambda, aggsLambda);
     }
 
-    public void setRoles_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingAggregationBuilder builder = regMissingA(name, "roles");
+    public void setX121Address_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "x121Address");
         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 8a874de42871d1aff03d3314c6e692885c41c661..2a8e79d6e4f040838f0b8e4618f11f68729d6c5e 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
@@ -185,403 +185,403 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
+    public void setGidNumber_Equal(Long gidNumber) {
+        setGidNumber_Term(gidNumber, null);
     }
 
-    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setName_Term(name, opLambda);
+    public void setGidNumber_Equal(Long gidNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setGidNumber_Term(gidNumber, opLambda);
     }
 
-    public void setName_Term(String name) {
-        setName_Term(name, null);
+    public void setGidNumber_Term(Long gidNumber) {
+        setGidNumber_Term(gidNumber, null);
     }
 
-    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("name", name);
+    public void setGidNumber_Term(Long gidNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_NotEqual(String name) {
-        setName_NotTerm(name, null);
+    public void setGidNumber_NotEqual(Long gidNumber) {
+        setGidNumber_NotTerm(gidNumber, null);
     }
 
-    public void setName_NotTerm(String name) {
-        setName_NotTerm(name, null);
+    public void setGidNumber_NotTerm(Long gidNumber) {
+        setGidNumber_NotTerm(gidNumber, null);
     }
 
-    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setName_NotTerm(name, opLambda);
+    public void setGidNumber_NotEqual(Long gidNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setGidNumber_NotTerm(gidNumber, opLambda);
     }
 
-    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setName_Term(name), opLambda);
+    public void setGidNumber_NotTerm(Long gidNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setGidNumber_Term(gidNumber), opLambda);
     }
 
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
+    public void setGidNumber_Terms(Collection<Long> gidNumberList) {
+        setGidNumber_Terms(gidNumberList, null);
     }
 
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("name", nameList);
+    public void setGidNumber_Terms(Collection<Long> gidNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("gidNumber", gidNumberList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
+    public void setGidNumber_InScope(Collection<Long> gidNumberList) {
+        setGidNumber_Terms(gidNumberList, null);
     }
 
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
+    public void setGidNumber_InScope(Collection<Long> gidNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setGidNumber_Terms(gidNumberList, opLambda);
     }
 
-    public void setName_Match(String name) {
-        setName_Match(name, null);
+    public void setGidNumber_Match(Long gidNumber) {
+        setGidNumber_Match(gidNumber, null);
     }
 
-    public void setName_Match(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("name", name);
+    public void setGidNumber_Match(Long gidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_MatchPhrase(String name) {
-        setName_MatchPhrase(name, null);
+    public void setGidNumber_MatchPhrase(Long gidNumber) {
+        setGidNumber_MatchPhrase(gidNumber, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setGidNumber_MatchPhrase(Long gidNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_MatchPhrasePrefix(String name) {
-        setName_MatchPhrasePrefix(name, null);
+    public void setGidNumber_MatchPhrasePrefix(Long gidNumber) {
+        setGidNumber_MatchPhrasePrefix(gidNumber, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setGidNumber_MatchPhrasePrefix(Long gidNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Fuzzy(String name) {
-        setName_Fuzzy(name, null);
+    public void setGidNumber_Fuzzy(Long gidNumber) {
+        setGidNumber_Fuzzy(gidNumber, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("name", name);
+    public void setGidNumber_Fuzzy(Long gidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
+    public void setGidNumber_GreaterThan(Long gidNumber) {
+        setGidNumber_GreaterThan(gidNumber, null);
     }
 
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("name", name);
+    public void setGidNumber_GreaterThan(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Wildcard(String name) {
-        setName_Wildcard(name, null);
+    public void setGidNumber_LessThan(Long gidNumber) {
+        setGidNumber_LessThan(gidNumber, null);
     }
 
-    public void setName_Wildcard(String name, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("name", name);
+    public void setGidNumber_LessThan(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Regexp(String name) {
-        setName_Regexp(name, null);
+    public void setGidNumber_GreaterEqual(Long gidNumber) {
+        setGidNumber_GreaterEqual(gidNumber, null);
     }
 
-    public void setName_Regexp(String name, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("name", name);
+    public void setGidNumber_GreaterEqual(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_SpanTerm(String name) {
-        setName_SpanTerm("name", null);
+    public void setGidNumber_LessEqual(Long gidNumber) {
+        setGidNumber_LessEqual(gidNumber, null);
     }
 
-    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+    public void setGidNumber_LessEqual(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
+    public void setGidNumber_Exists() {
+        setGidNumber_Exists(null);
     }
 
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = name;
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
+    public void setGidNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
+    public void setGidNumber_CommonTerms(Long gidNumber) {
+        setGidNumber_CommonTerms(gidNumber, null);
     }
 
-    public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = name;
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
+    public void setGidNumber_CommonTerms(Long gidNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
+    public BsGroupCQ addOrderBy_GidNumber_Asc() {
+        regOBA("gidNumber");
+        return this;
     }
 
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = name;
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public BsGroupCQ addOrderBy_GidNumber_Desc() {
+        regOBD("gidNumber");
+        return this;
     }
 
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
+    public void setName_Equal(String name) {
+        setName_Term(name, null);
     }
 
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = name;
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setName_Term(name, opLambda);
     }
 
-    public void setName_Exists() {
-        setName_Exists(null);
+    public void setName_Term(String name) {
+        setName_Term(name, null);
     }
 
-    public void setName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("name");
+    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_CommonTerms(String name) {
-        setName_CommonTerms(name, null);
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public BsGroupCQ addOrderBy_Name_Asc() {
-        regOBA("name");
-        return this;
+    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
     }
 
-    public BsGroupCQ addOrderBy_Name_Desc() {
-        regOBD("name");
-        return this;
+    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setName_Term(name), opLambda);
     }
 
-    public void setGidNumber_Equal(Long gidNumber) {
-        setGidNumber_Term(gidNumber, null);
+    public void setName_Terms(Collection<String> nameList) {
+        setName_Terms(nameList, null);
     }
 
-    public void setGidNumber_Equal(Long gidNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setGidNumber_Term(gidNumber, opLambda);
+    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("name", nameList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setGidNumber_Term(Long gidNumber) {
-        setGidNumber_Term(gidNumber, null);
+    public void setName_InScope(Collection<String> nameList) {
+        setName_Terms(nameList, null);
     }
 
-    public void setGidNumber_Term(Long gidNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("gidNumber", gidNumber);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setName_Terms(nameList, opLambda);
     }
 
-    public void setGidNumber_NotEqual(Long gidNumber) {
-        setGidNumber_NotTerm(gidNumber, null);
+    public void setName_Match(String name) {
+        setName_Match(name, null);
     }
 
-    public void setGidNumber_NotTerm(Long gidNumber) {
-        setGidNumber_NotTerm(gidNumber, null);
+    public void setName_Match(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setGidNumber_NotEqual(Long gidNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setGidNumber_NotTerm(gidNumber, opLambda);
+    public void setName_MatchPhrase(String name) {
+        setName_MatchPhrase(name, null);
     }
 
-    public void setGidNumber_NotTerm(Long gidNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setGidNumber_Term(gidNumber), opLambda);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setGidNumber_Terms(Collection<Long> gidNumberList) {
-        setGidNumber_Terms(gidNumberList, null);
+    public void setName_MatchPhrasePrefix(String name) {
+        setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setGidNumber_Terms(Collection<Long> gidNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("gidNumber", gidNumberList);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_InScope(Collection<Long> gidNumberList) {
-        setGidNumber_Terms(gidNumberList, null);
+    public void setName_Fuzzy(String name) {
+        setName_Fuzzy(name, null);
     }
 
-    public void setGidNumber_InScope(Collection<Long> gidNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setGidNumber_Terms(gidNumberList, opLambda);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setGidNumber_Match(Long gidNumber) {
-        setGidNumber_Match(gidNumber, null);
+    public void setName_Prefix(String name) {
+        setName_Prefix(name, null);
     }
 
-    public void setGidNumber_Match(Long gidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("gidNumber", gidNumber);
+    public void setName_Prefix(String name, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_MatchPhrase(Long gidNumber) {
-        setGidNumber_MatchPhrase(gidNumber, null);
+    public void setName_Wildcard(String name) {
+        setName_Wildcard(name, null);
     }
 
-    public void setGidNumber_MatchPhrase(Long gidNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("gidNumber", gidNumber);
+    public void setName_Wildcard(String name, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_MatchPhrasePrefix(Long gidNumber) {
-        setGidNumber_MatchPhrasePrefix(gidNumber, null);
+    public void setName_Regexp(String name) {
+        setName_Regexp(name, null);
     }
 
-    public void setGidNumber_MatchPhrasePrefix(Long gidNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("gidNumber", gidNumber);
+    public void setName_Regexp(String name, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_Fuzzy(Long gidNumber) {
-        setGidNumber_Fuzzy(gidNumber, null);
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
     }
 
-    public void setGidNumber_Fuzzy(Long gidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("gidNumber", gidNumber);
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_GreaterThan(Long gidNumber) {
-        setGidNumber_GreaterThan(gidNumber, null);
+    public void setName_GreaterThan(String name) {
+        setName_GreaterThan(name, null);
     }
 
-    public void setGidNumber_GreaterThan(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = gidNumber;
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_THAN, _value);
+    public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_LessThan(Long gidNumber) {
-        setGidNumber_LessThan(gidNumber, null);
+    public void setName_LessThan(String name) {
+        setName_LessThan(name, null);
     }
 
-    public void setGidNumber_LessThan(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = gidNumber;
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_THAN, _value);
+    public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_GreaterEqual(Long gidNumber) {
-        setGidNumber_GreaterEqual(gidNumber, null);
+    public void setName_GreaterEqual(String name) {
+        setName_GreaterEqual(name, null);
     }
 
-    public void setGidNumber_GreaterEqual(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = gidNumber;
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_LessEqual(Long gidNumber) {
-        setGidNumber_LessEqual(gidNumber, null);
+    public void setName_LessEqual(String name) {
+        setName_LessEqual(name, null);
     }
 
-    public void setGidNumber_LessEqual(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = gidNumber;
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_Exists() {
-        setGidNumber_Exists(null);
+    public void setName_Exists() {
+        setName_Exists(null);
     }
 
-    public void setGidNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("gidNumber");
+    public void setName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_CommonTerms(Long gidNumber) {
-        setGidNumber_CommonTerms(gidNumber, null);
+    public void setName_CommonTerms(String name) {
+        setName_CommonTerms(name, null);
     }
 
-    public void setGidNumber_CommonTerms(Long gidNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("gidNumber", gidNumber);
+    public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsGroupCQ addOrderBy_GidNumber_Asc() {
-        regOBA("gidNumber");
+    public BsGroupCQ addOrderBy_Name_Asc() {
+        regOBA("name");
         return this;
     }
 
-    public BsGroupCQ addOrderBy_GidNumber_Desc() {
-        regOBD("gidNumber");
+    public BsGroupCQ addOrderBy_Name_Desc() {
+        regOBD("name");
         return this;
     }
 
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 e03673d4ec03b8990c9939cadc42f389e1d1686b..007106ed96fe00a7cbf25b3fe105d267c7ee83d0 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
@@ -185,4023 +185,3756 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
+    public void setBusinessCategory_Equal(String businessCategory) {
+        setBusinessCategory_Term(businessCategory, null);
     }
 
-    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setName_Term(name, opLambda);
+    public void setBusinessCategory_Equal(String businessCategory, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setBusinessCategory_Term(businessCategory, opLambda);
     }
 
-    public void setName_Term(String name) {
-        setName_Term(name, null);
+    public void setBusinessCategory_Term(String businessCategory) {
+        setBusinessCategory_Term(businessCategory, null);
     }
 
-    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("name", name);
+    public void setBusinessCategory_Term(String businessCategory, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("businessCategory", businessCategory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_NotEqual(String name) {
-        setName_NotTerm(name, null);
+    public void setBusinessCategory_NotEqual(String businessCategory) {
+        setBusinessCategory_NotTerm(businessCategory, null);
     }
 
-    public void setName_NotTerm(String name) {
-        setName_NotTerm(name, null);
+    public void setBusinessCategory_NotTerm(String businessCategory) {
+        setBusinessCategory_NotTerm(businessCategory, null);
     }
 
-    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setName_NotTerm(name, opLambda);
+    public void setBusinessCategory_NotEqual(String businessCategory, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setBusinessCategory_NotTerm(businessCategory, opLambda);
     }
 
-    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setName_Term(name), opLambda);
+    public void setBusinessCategory_NotTerm(String businessCategory, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setBusinessCategory_Term(businessCategory), opLambda);
     }
 
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
+    public void setBusinessCategory_Terms(Collection<String> businessCategoryList) {
+        setBusinessCategory_Terms(businessCategoryList, null);
     }
 
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("name", nameList);
+    public void setBusinessCategory_Terms(Collection<String> businessCategoryList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("businessCategory", businessCategoryList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
+    public void setBusinessCategory_InScope(Collection<String> businessCategoryList) {
+        setBusinessCategory_Terms(businessCategoryList, null);
     }
 
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
+    public void setBusinessCategory_InScope(Collection<String> businessCategoryList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setBusinessCategory_Terms(businessCategoryList, opLambda);
     }
 
-    public void setName_Match(String name) {
-        setName_Match(name, null);
+    public void setBusinessCategory_Match(String businessCategory) {
+        setBusinessCategory_Match(businessCategory, null);
     }
 
-    public void setName_Match(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("name", name);
+    public void setBusinessCategory_Match(String businessCategory, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("businessCategory", businessCategory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_MatchPhrase(String name) {
-        setName_MatchPhrase(name, null);
+    public void setBusinessCategory_MatchPhrase(String businessCategory) {
+        setBusinessCategory_MatchPhrase(businessCategory, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setBusinessCategory_MatchPhrase(String businessCategory, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("businessCategory", businessCategory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_MatchPhrasePrefix(String name) {
-        setName_MatchPhrasePrefix(name, null);
+    public void setBusinessCategory_MatchPhrasePrefix(String businessCategory) {
+        setBusinessCategory_MatchPhrasePrefix(businessCategory, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setBusinessCategory_MatchPhrasePrefix(String businessCategory, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("businessCategory", businessCategory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Fuzzy(String name) {
-        setName_Fuzzy(name, null);
+    public void setBusinessCategory_Fuzzy(String businessCategory) {
+        setBusinessCategory_Fuzzy(businessCategory, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("name", name);
+    public void setBusinessCategory_Fuzzy(String businessCategory, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("businessCategory", businessCategory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
+    public void setBusinessCategory_Prefix(String businessCategory) {
+        setBusinessCategory_Prefix(businessCategory, null);
     }
 
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("name", name);
+    public void setBusinessCategory_Prefix(String businessCategory, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("businessCategory", businessCategory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Wildcard(String name) {
-        setName_Wildcard(name, null);
+    public void setBusinessCategory_Wildcard(String businessCategory) {
+        setBusinessCategory_Wildcard(businessCategory, null);
     }
 
-    public void setName_Wildcard(String name, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("name", name);
+    public void setBusinessCategory_Wildcard(String businessCategory, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("businessCategory", businessCategory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Regexp(String name) {
-        setName_Regexp(name, null);
+    public void setBusinessCategory_Regexp(String businessCategory) {
+        setBusinessCategory_Regexp(businessCategory, null);
     }
 
-    public void setName_Regexp(String name, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("name", name);
+    public void setBusinessCategory_Regexp(String businessCategory, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("businessCategory", businessCategory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_SpanTerm(String name) {
-        setName_SpanTerm("name", null);
+    public void setBusinessCategory_SpanTerm(String businessCategory) {
+        setBusinessCategory_SpanTerm("businessCategory", null);
     }
 
-    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+    public void setBusinessCategory_SpanTerm(String businessCategory, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("businessCategory", businessCategory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
+    public void setBusinessCategory_GreaterThan(String businessCategory) {
+        setBusinessCategory_GreaterThan(businessCategory, null);
     }
 
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = name;
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
+    public void setBusinessCategory_GreaterThan(String businessCategory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = businessCategory;
+        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
+    public void setBusinessCategory_LessThan(String businessCategory) {
+        setBusinessCategory_LessThan(businessCategory, null);
     }
 
-    public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = name;
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
+    public void setBusinessCategory_LessThan(String businessCategory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = businessCategory;
+        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
+    public void setBusinessCategory_GreaterEqual(String businessCategory) {
+        setBusinessCategory_GreaterEqual(businessCategory, null);
     }
 
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = name;
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setBusinessCategory_GreaterEqual(String businessCategory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = businessCategory;
+        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
+    public void setBusinessCategory_LessEqual(String businessCategory) {
+        setBusinessCategory_LessEqual(businessCategory, null);
     }
 
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = name;
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setBusinessCategory_LessEqual(String businessCategory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = businessCategory;
+        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_Exists() {
-        setName_Exists(null);
+    public void setBusinessCategory_Exists() {
+        setBusinessCategory_Exists(null);
     }
 
-    public void setName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("name");
+    public void setBusinessCategory_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("businessCategory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setName_CommonTerms(String name) {
-        setName_CommonTerms(name, null);
+    public void setBusinessCategory_CommonTerms(String businessCategory) {
+        setBusinessCategory_CommonTerms(businessCategory, null);
     }
 
-    public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
+    public void setBusinessCategory_CommonTerms(String businessCategory, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("businessCategory", businessCategory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_Name_Asc() {
-        regOBA("name");
+    public BsUserCQ addOrderBy_BusinessCategory_Asc() {
+        regOBA("businessCategory");
         return this;
     }
 
-    public BsUserCQ addOrderBy_Name_Desc() {
-        regOBD("name");
+    public BsUserCQ addOrderBy_BusinessCategory_Desc() {
+        regOBD("businessCategory");
         return this;
     }
 
-    public void setPassword_Equal(String password) {
-        setPassword_Term(password, null);
+    public void setCarLicense_Equal(String carLicense) {
+        setCarLicense_Term(carLicense, null);
     }
 
-    public void setPassword_Equal(String password, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setPassword_Term(password, opLambda);
+    public void setCarLicense_Equal(String carLicense, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setCarLicense_Term(carLicense, opLambda);
     }
 
-    public void setPassword_Term(String password) {
-        setPassword_Term(password, null);
+    public void setCarLicense_Term(String carLicense) {
+        setCarLicense_Term(carLicense, null);
     }
 
-    public void setPassword_Term(String password, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("password", password);
+    public void setCarLicense_Term(String carLicense, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("carLicense", carLicense);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_NotEqual(String password) {
-        setPassword_NotTerm(password, null);
+    public void setCarLicense_NotEqual(String carLicense) {
+        setCarLicense_NotTerm(carLicense, null);
     }
 
-    public void setPassword_NotTerm(String password) {
-        setPassword_NotTerm(password, null);
+    public void setCarLicense_NotTerm(String carLicense) {
+        setCarLicense_NotTerm(carLicense, null);
     }
 
-    public void setPassword_NotEqual(String password, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setPassword_NotTerm(password, opLambda);
+    public void setCarLicense_NotEqual(String carLicense, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCarLicense_NotTerm(carLicense, opLambda);
     }
 
-    public void setPassword_NotTerm(String password, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setPassword_Term(password), opLambda);
+    public void setCarLicense_NotTerm(String carLicense, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCarLicense_Term(carLicense), opLambda);
     }
 
-    public void setPassword_Terms(Collection<String> passwordList) {
-        setPassword_Terms(passwordList, null);
+    public void setCarLicense_Terms(Collection<String> carLicenseList) {
+        setCarLicense_Terms(carLicenseList, null);
     }
 
-    public void setPassword_Terms(Collection<String> passwordList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("password", passwordList);
+    public void setCarLicense_Terms(Collection<String> carLicenseList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("carLicense", carLicenseList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_InScope(Collection<String> passwordList) {
-        setPassword_Terms(passwordList, null);
+    public void setCarLicense_InScope(Collection<String> carLicenseList) {
+        setCarLicense_Terms(carLicenseList, null);
     }
 
-    public void setPassword_InScope(Collection<String> passwordList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setPassword_Terms(passwordList, opLambda);
+    public void setCarLicense_InScope(Collection<String> carLicenseList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setCarLicense_Terms(carLicenseList, opLambda);
     }
 
-    public void setPassword_Match(String password) {
-        setPassword_Match(password, null);
+    public void setCarLicense_Match(String carLicense) {
+        setCarLicense_Match(carLicense, null);
     }
 
-    public void setPassword_Match(String password, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("password", password);
+    public void setCarLicense_Match(String carLicense, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("carLicense", carLicense);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_MatchPhrase(String password) {
-        setPassword_MatchPhrase(password, null);
+    public void setCarLicense_MatchPhrase(String carLicense) {
+        setCarLicense_MatchPhrase(carLicense, null);
     }
 
-    public void setPassword_MatchPhrase(String password, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("password", password);
+    public void setCarLicense_MatchPhrase(String carLicense, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("carLicense", carLicense);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_MatchPhrasePrefix(String password) {
-        setPassword_MatchPhrasePrefix(password, null);
+    public void setCarLicense_MatchPhrasePrefix(String carLicense) {
+        setCarLicense_MatchPhrasePrefix(carLicense, null);
     }
 
-    public void setPassword_MatchPhrasePrefix(String password, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("password", password);
+    public void setCarLicense_MatchPhrasePrefix(String carLicense, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("carLicense", carLicense);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_Fuzzy(String password) {
-        setPassword_Fuzzy(password, null);
+    public void setCarLicense_Fuzzy(String carLicense) {
+        setCarLicense_Fuzzy(carLicense, null);
     }
 
-    public void setPassword_Fuzzy(String password, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("password", password);
+    public void setCarLicense_Fuzzy(String carLicense, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("carLicense", carLicense);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_Prefix(String password) {
-        setPassword_Prefix(password, null);
+    public void setCarLicense_Prefix(String carLicense) {
+        setCarLicense_Prefix(carLicense, null);
     }
 
-    public void setPassword_Prefix(String password, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("password", password);
+    public void setCarLicense_Prefix(String carLicense, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("carLicense", carLicense);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_Wildcard(String password) {
-        setPassword_Wildcard(password, null);
+    public void setCarLicense_Wildcard(String carLicense) {
+        setCarLicense_Wildcard(carLicense, null);
     }
 
-    public void setPassword_Wildcard(String password, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("password", password);
+    public void setCarLicense_Wildcard(String carLicense, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("carLicense", carLicense);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_Regexp(String password) {
-        setPassword_Regexp(password, null);
+    public void setCarLicense_Regexp(String carLicense) {
+        setCarLicense_Regexp(carLicense, null);
     }
 
-    public void setPassword_Regexp(String password, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("password", password);
+    public void setCarLicense_Regexp(String carLicense, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("carLicense", carLicense);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_SpanTerm(String password) {
-        setPassword_SpanTerm("password", null);
+    public void setCarLicense_SpanTerm(String carLicense) {
+        setCarLicense_SpanTerm("carLicense", null);
     }
 
-    public void setPassword_SpanTerm(String password, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("password", password);
+    public void setCarLicense_SpanTerm(String carLicense, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("carLicense", carLicense);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_GreaterThan(String password) {
-        setPassword_GreaterThan(password, null);
+    public void setCarLicense_GreaterThan(String carLicense) {
+        setCarLicense_GreaterThan(carLicense, null);
     }
 
-    public void setPassword_GreaterThan(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = password;
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_THAN, _value);
+    public void setCarLicense_GreaterThan(String carLicense, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = carLicense;
+        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_LessThan(String password) {
-        setPassword_LessThan(password, null);
+    public void setCarLicense_LessThan(String carLicense) {
+        setCarLicense_LessThan(carLicense, null);
     }
 
-    public void setPassword_LessThan(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = password;
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_THAN, _value);
+    public void setCarLicense_LessThan(String carLicense, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = carLicense;
+        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_GreaterEqual(String password) {
-        setPassword_GreaterEqual(password, null);
+    public void setCarLicense_GreaterEqual(String carLicense) {
+        setCarLicense_GreaterEqual(carLicense, null);
     }
 
-    public void setPassword_GreaterEqual(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = password;
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setCarLicense_GreaterEqual(String carLicense, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = carLicense;
+        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_LessEqual(String password) {
-        setPassword_LessEqual(password, null);
+    public void setCarLicense_LessEqual(String carLicense) {
+        setCarLicense_LessEqual(carLicense, null);
     }
 
-    public void setPassword_LessEqual(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = password;
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setCarLicense_LessEqual(String carLicense, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = carLicense;
+        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_Exists() {
-        setPassword_Exists(null);
+    public void setCarLicense_Exists() {
+        setCarLicense_Exists(null);
     }
 
-    public void setPassword_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("password");
+    public void setCarLicense_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("carLicense");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPassword_CommonTerms(String password) {
-        setPassword_CommonTerms(password, null);
+    public void setCarLicense_CommonTerms(String carLicense) {
+        setCarLicense_CommonTerms(carLicense, null);
     }
 
-    public void setPassword_CommonTerms(String password, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("password", password);
+    public void setCarLicense_CommonTerms(String carLicense, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("carLicense", carLicense);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_Password_Asc() {
-        regOBA("password");
+    public BsUserCQ addOrderBy_CarLicense_Asc() {
+        regOBA("carLicense");
         return this;
     }
 
-    public BsUserCQ addOrderBy_Password_Desc() {
-        regOBD("password");
+    public BsUserCQ addOrderBy_CarLicense_Desc() {
+        regOBD("carLicense");
         return this;
     }
 
-    public void setSurname_Equal(String surname) {
-        setSurname_Term(surname, null);
+    public void setCity_Equal(String city) {
+        setCity_Term(city, null);
     }
 
-    public void setSurname_Equal(String surname, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setSurname_Term(surname, opLambda);
+    public void setCity_Equal(String city, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setCity_Term(city, opLambda);
     }
 
-    public void setSurname_Term(String surname) {
-        setSurname_Term(surname, null);
+    public void setCity_Term(String city) {
+        setCity_Term(city, null);
     }
 
-    public void setSurname_Term(String surname, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("surname", surname);
+    public void setCity_Term(String city, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("city", city);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_NotEqual(String surname) {
-        setSurname_NotTerm(surname, null);
+    public void setCity_NotEqual(String city) {
+        setCity_NotTerm(city, null);
     }
 
-    public void setSurname_NotTerm(String surname) {
-        setSurname_NotTerm(surname, null);
+    public void setCity_NotTerm(String city) {
+        setCity_NotTerm(city, null);
     }
 
-    public void setSurname_NotEqual(String surname, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setSurname_NotTerm(surname, opLambda);
+    public void setCity_NotEqual(String city, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCity_NotTerm(city, opLambda);
     }
 
-    public void setSurname_NotTerm(String surname, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setSurname_Term(surname), opLambda);
+    public void setCity_NotTerm(String city, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCity_Term(city), opLambda);
     }
 
-    public void setSurname_Terms(Collection<String> surnameList) {
-        setSurname_Terms(surnameList, null);
+    public void setCity_Terms(Collection<String> cityList) {
+        setCity_Terms(cityList, null);
     }
 
-    public void setSurname_Terms(Collection<String> surnameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("surname", surnameList);
+    public void setCity_Terms(Collection<String> cityList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("city", cityList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_InScope(Collection<String> surnameList) {
-        setSurname_Terms(surnameList, null);
+    public void setCity_InScope(Collection<String> cityList) {
+        setCity_Terms(cityList, null);
     }
 
-    public void setSurname_InScope(Collection<String> surnameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setSurname_Terms(surnameList, opLambda);
+    public void setCity_InScope(Collection<String> cityList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setCity_Terms(cityList, opLambda);
     }
 
-    public void setSurname_Match(String surname) {
-        setSurname_Match(surname, null);
+    public void setCity_Match(String city) {
+        setCity_Match(city, null);
     }
 
-    public void setSurname_Match(String surname, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("surname", surname);
+    public void setCity_Match(String city, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("city", city);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_MatchPhrase(String surname) {
-        setSurname_MatchPhrase(surname, null);
+    public void setCity_MatchPhrase(String city) {
+        setCity_MatchPhrase(city, null);
     }
 
-    public void setSurname_MatchPhrase(String surname, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("surname", surname);
+    public void setCity_MatchPhrase(String city, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("city", city);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_MatchPhrasePrefix(String surname) {
-        setSurname_MatchPhrasePrefix(surname, null);
+    public void setCity_MatchPhrasePrefix(String city) {
+        setCity_MatchPhrasePrefix(city, null);
     }
 
-    public void setSurname_MatchPhrasePrefix(String surname, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("surname", surname);
+    public void setCity_MatchPhrasePrefix(String city, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("city", city);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_Fuzzy(String surname) {
-        setSurname_Fuzzy(surname, null);
+    public void setCity_Fuzzy(String city) {
+        setCity_Fuzzy(city, null);
     }
 
-    public void setSurname_Fuzzy(String surname, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("surname", surname);
+    public void setCity_Fuzzy(String city, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("city", city);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_Prefix(String surname) {
-        setSurname_Prefix(surname, null);
+    public void setCity_Prefix(String city) {
+        setCity_Prefix(city, null);
     }
 
-    public void setSurname_Prefix(String surname, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("surname", surname);
+    public void setCity_Prefix(String city, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("city", city);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_Wildcard(String surname) {
-        setSurname_Wildcard(surname, null);
+    public void setCity_Wildcard(String city) {
+        setCity_Wildcard(city, null);
     }
 
-    public void setSurname_Wildcard(String surname, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("surname", surname);
+    public void setCity_Wildcard(String city, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("city", city);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_Regexp(String surname) {
-        setSurname_Regexp(surname, null);
+    public void setCity_Regexp(String city) {
+        setCity_Regexp(city, null);
     }
 
-    public void setSurname_Regexp(String surname, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("surname", surname);
+    public void setCity_Regexp(String city, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("city", city);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_SpanTerm(String surname) {
-        setSurname_SpanTerm("surname", null);
+    public void setCity_SpanTerm(String city) {
+        setCity_SpanTerm("city", null);
     }
 
-    public void setSurname_SpanTerm(String surname, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("surname", surname);
+    public void setCity_SpanTerm(String city, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("city", city);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_GreaterThan(String surname) {
-        setSurname_GreaterThan(surname, null);
+    public void setCity_GreaterThan(String city) {
+        setCity_GreaterThan(city, null);
     }
 
-    public void setSurname_GreaterThan(String surname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = surname;
-        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_GREATER_THAN, _value);
+    public void setCity_GreaterThan(String city, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = city;
+        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_LessThan(String surname) {
-        setSurname_LessThan(surname, null);
+    public void setCity_LessThan(String city) {
+        setCity_LessThan(city, null);
     }
 
-    public void setSurname_LessThan(String surname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = surname;
-        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_LESS_THAN, _value);
+    public void setCity_LessThan(String city, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = city;
+        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_GreaterEqual(String surname) {
-        setSurname_GreaterEqual(surname, null);
+    public void setCity_GreaterEqual(String city) {
+        setCity_GreaterEqual(city, null);
     }
 
-    public void setSurname_GreaterEqual(String surname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = surname;
-        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setCity_GreaterEqual(String city, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = city;
+        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_LessEqual(String surname) {
-        setSurname_LessEqual(surname, null);
+    public void setCity_LessEqual(String city) {
+        setCity_LessEqual(city, null);
     }
 
-    public void setSurname_LessEqual(String surname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = surname;
-        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setCity_LessEqual(String city, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = city;
+        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_Exists() {
-        setSurname_Exists(null);
+    public void setCity_Exists() {
+        setCity_Exists(null);
     }
 
-    public void setSurname_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("surname");
+    public void setCity_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("city");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSurname_CommonTerms(String surname) {
-        setSurname_CommonTerms(surname, null);
+    public void setCity_CommonTerms(String city) {
+        setCity_CommonTerms(city, null);
     }
 
-    public void setSurname_CommonTerms(String surname, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("surname", surname);
+    public void setCity_CommonTerms(String city, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("city", city);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_Surname_Asc() {
-        regOBA("surname");
+    public BsUserCQ addOrderBy_City_Asc() {
+        regOBA("city");
         return this;
     }
 
-    public BsUserCQ addOrderBy_Surname_Desc() {
-        regOBD("surname");
+    public BsUserCQ addOrderBy_City_Desc() {
+        regOBD("city");
         return this;
     }
 
-    public void setGivenName_Equal(String givenName) {
-        setGivenName_Term(givenName, null);
+    public void setDepartmentNumber_Equal(String departmentNumber) {
+        setDepartmentNumber_Term(departmentNumber, null);
     }
 
-    public void setGivenName_Equal(String givenName, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setGivenName_Term(givenName, opLambda);
+    public void setDepartmentNumber_Equal(String departmentNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setDepartmentNumber_Term(departmentNumber, opLambda);
     }
 
-    public void setGivenName_Term(String givenName) {
-        setGivenName_Term(givenName, null);
+    public void setDepartmentNumber_Term(String departmentNumber) {
+        setDepartmentNumber_Term(departmentNumber, null);
     }
 
-    public void setGivenName_Term(String givenName, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("givenName", givenName);
+    public void setDepartmentNumber_Term(String departmentNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("departmentNumber", departmentNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_NotEqual(String givenName) {
-        setGivenName_NotTerm(givenName, null);
+    public void setDepartmentNumber_NotEqual(String departmentNumber) {
+        setDepartmentNumber_NotTerm(departmentNumber, null);
     }
 
-    public void setGivenName_NotTerm(String givenName) {
-        setGivenName_NotTerm(givenName, null);
+    public void setDepartmentNumber_NotTerm(String departmentNumber) {
+        setDepartmentNumber_NotTerm(departmentNumber, null);
     }
 
-    public void setGivenName_NotEqual(String givenName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setGivenName_NotTerm(givenName, opLambda);
+    public void setDepartmentNumber_NotEqual(String departmentNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setDepartmentNumber_NotTerm(departmentNumber, opLambda);
     }
 
-    public void setGivenName_NotTerm(String givenName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setGivenName_Term(givenName), opLambda);
+    public void setDepartmentNumber_NotTerm(String departmentNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setDepartmentNumber_Term(departmentNumber), opLambda);
     }
 
-    public void setGivenName_Terms(Collection<String> givenNameList) {
-        setGivenName_Terms(givenNameList, null);
+    public void setDepartmentNumber_Terms(Collection<String> departmentNumberList) {
+        setDepartmentNumber_Terms(departmentNumberList, null);
     }
 
-    public void setGivenName_Terms(Collection<String> givenNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("givenName", givenNameList);
+    public void setDepartmentNumber_Terms(Collection<String> departmentNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("departmentNumber", departmentNumberList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_InScope(Collection<String> givenNameList) {
-        setGivenName_Terms(givenNameList, null);
+    public void setDepartmentNumber_InScope(Collection<String> departmentNumberList) {
+        setDepartmentNumber_Terms(departmentNumberList, null);
     }
 
-    public void setGivenName_InScope(Collection<String> givenNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setGivenName_Terms(givenNameList, opLambda);
+    public void setDepartmentNumber_InScope(Collection<String> departmentNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setDepartmentNumber_Terms(departmentNumberList, opLambda);
     }
 
-    public void setGivenName_Match(String givenName) {
-        setGivenName_Match(givenName, null);
+    public void setDepartmentNumber_Match(String departmentNumber) {
+        setDepartmentNumber_Match(departmentNumber, null);
     }
 
-    public void setGivenName_Match(String givenName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("givenName", givenName);
+    public void setDepartmentNumber_Match(String departmentNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("departmentNumber", departmentNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_MatchPhrase(String givenName) {
-        setGivenName_MatchPhrase(givenName, null);
+    public void setDepartmentNumber_MatchPhrase(String departmentNumber) {
+        setDepartmentNumber_MatchPhrase(departmentNumber, null);
     }
 
-    public void setGivenName_MatchPhrase(String givenName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("givenName", givenName);
+    public void setDepartmentNumber_MatchPhrase(String departmentNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("departmentNumber", departmentNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_MatchPhrasePrefix(String givenName) {
-        setGivenName_MatchPhrasePrefix(givenName, null);
+    public void setDepartmentNumber_MatchPhrasePrefix(String departmentNumber) {
+        setDepartmentNumber_MatchPhrasePrefix(departmentNumber, null);
     }
 
-    public void setGivenName_MatchPhrasePrefix(String givenName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("givenName", givenName);
+    public void setDepartmentNumber_MatchPhrasePrefix(String departmentNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("departmentNumber", departmentNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_Fuzzy(String givenName) {
-        setGivenName_Fuzzy(givenName, null);
+    public void setDepartmentNumber_Fuzzy(String departmentNumber) {
+        setDepartmentNumber_Fuzzy(departmentNumber, null);
     }
 
-    public void setGivenName_Fuzzy(String givenName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("givenName", givenName);
+    public void setDepartmentNumber_Fuzzy(String departmentNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("departmentNumber", departmentNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_Prefix(String givenName) {
-        setGivenName_Prefix(givenName, null);
+    public void setDepartmentNumber_Prefix(String departmentNumber) {
+        setDepartmentNumber_Prefix(departmentNumber, null);
     }
 
-    public void setGivenName_Prefix(String givenName, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("givenName", givenName);
+    public void setDepartmentNumber_Prefix(String departmentNumber, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("departmentNumber", departmentNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_Wildcard(String givenName) {
-        setGivenName_Wildcard(givenName, null);
+    public void setDepartmentNumber_Wildcard(String departmentNumber) {
+        setDepartmentNumber_Wildcard(departmentNumber, null);
     }
 
-    public void setGivenName_Wildcard(String givenName, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("givenName", givenName);
+    public void setDepartmentNumber_Wildcard(String departmentNumber, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("departmentNumber", departmentNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_Regexp(String givenName) {
-        setGivenName_Regexp(givenName, null);
+    public void setDepartmentNumber_Regexp(String departmentNumber) {
+        setDepartmentNumber_Regexp(departmentNumber, null);
     }
 
-    public void setGivenName_Regexp(String givenName, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("givenName", givenName);
+    public void setDepartmentNumber_Regexp(String departmentNumber, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("departmentNumber", departmentNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_SpanTerm(String givenName) {
-        setGivenName_SpanTerm("givenName", null);
+    public void setDepartmentNumber_SpanTerm(String departmentNumber) {
+        setDepartmentNumber_SpanTerm("departmentNumber", null);
     }
 
-    public void setGivenName_SpanTerm(String givenName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("givenName", givenName);
+    public void setDepartmentNumber_SpanTerm(String departmentNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("departmentNumber", departmentNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_GreaterThan(String givenName) {
-        setGivenName_GreaterThan(givenName, null);
+    public void setDepartmentNumber_GreaterThan(String departmentNumber) {
+        setDepartmentNumber_GreaterThan(departmentNumber, null);
     }
 
-    public void setGivenName_GreaterThan(String givenName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = givenName;
-        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_GREATER_THAN, _value);
+    public void setDepartmentNumber_GreaterThan(String departmentNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = departmentNumber;
+        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_LessThan(String givenName) {
-        setGivenName_LessThan(givenName, null);
+    public void setDepartmentNumber_LessThan(String departmentNumber) {
+        setDepartmentNumber_LessThan(departmentNumber, null);
     }
 
-    public void setGivenName_LessThan(String givenName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = givenName;
-        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_LESS_THAN, _value);
+    public void setDepartmentNumber_LessThan(String departmentNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = departmentNumber;
+        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_GreaterEqual(String givenName) {
-        setGivenName_GreaterEqual(givenName, null);
+    public void setDepartmentNumber_GreaterEqual(String departmentNumber) {
+        setDepartmentNumber_GreaterEqual(departmentNumber, null);
     }
 
-    public void setGivenName_GreaterEqual(String givenName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = givenName;
-        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setDepartmentNumber_GreaterEqual(String departmentNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = departmentNumber;
+        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_LessEqual(String givenName) {
-        setGivenName_LessEqual(givenName, null);
+    public void setDepartmentNumber_LessEqual(String departmentNumber) {
+        setDepartmentNumber_LessEqual(departmentNumber, null);
     }
 
-    public void setGivenName_LessEqual(String givenName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = givenName;
-        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setDepartmentNumber_LessEqual(String departmentNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = departmentNumber;
+        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_Exists() {
-        setGivenName_Exists(null);
+    public void setDepartmentNumber_Exists() {
+        setDepartmentNumber_Exists(null);
     }
 
-    public void setGivenName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("givenName");
+    public void setDepartmentNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("departmentNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGivenName_CommonTerms(String givenName) {
-        setGivenName_CommonTerms(givenName, null);
+    public void setDepartmentNumber_CommonTerms(String departmentNumber) {
+        setDepartmentNumber_CommonTerms(departmentNumber, null);
     }
 
-    public void setGivenName_CommonTerms(String givenName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("givenName", givenName);
+    public void setDepartmentNumber_CommonTerms(String departmentNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("departmentNumber", departmentNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_GivenName_Asc() {
-        regOBA("givenName");
+    public BsUserCQ addOrderBy_DepartmentNumber_Asc() {
+        regOBA("departmentNumber");
         return this;
     }
 
-    public BsUserCQ addOrderBy_GivenName_Desc() {
-        regOBD("givenName");
+    public BsUserCQ addOrderBy_DepartmentNumber_Desc() {
+        regOBD("departmentNumber");
         return this;
     }
 
-    public void setEmployeeNumber_Equal(String employeeNumber) {
-        setEmployeeNumber_Term(employeeNumber, null);
+    public void setDescription_Equal(String description) {
+        setDescription_Term(description, null);
     }
 
-    public void setEmployeeNumber_Equal(String employeeNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setEmployeeNumber_Term(employeeNumber, opLambda);
+    public void setDescription_Equal(String description, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setDescription_Term(description, opLambda);
     }
 
-    public void setEmployeeNumber_Term(String employeeNumber) {
-        setEmployeeNumber_Term(employeeNumber, null);
+    public void setDescription_Term(String description) {
+        setDescription_Term(description, null);
     }
 
-    public void setEmployeeNumber_Term(String employeeNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("employeeNumber", employeeNumber);
+    public void setDescription_Term(String description, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("description", description);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_NotEqual(String employeeNumber) {
-        setEmployeeNumber_NotTerm(employeeNumber, null);
+    public void setDescription_NotEqual(String description) {
+        setDescription_NotTerm(description, null);
     }
 
-    public void setEmployeeNumber_NotTerm(String employeeNumber) {
-        setEmployeeNumber_NotTerm(employeeNumber, null);
+    public void setDescription_NotTerm(String description) {
+        setDescription_NotTerm(description, null);
     }
 
-    public void setEmployeeNumber_NotEqual(String employeeNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setEmployeeNumber_NotTerm(employeeNumber, opLambda);
+    public void setDescription_NotEqual(String description, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setDescription_NotTerm(description, opLambda);
     }
 
-    public void setEmployeeNumber_NotTerm(String employeeNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setEmployeeNumber_Term(employeeNumber), opLambda);
+    public void setDescription_NotTerm(String description, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setDescription_Term(description), opLambda);
     }
 
-    public void setEmployeeNumber_Terms(Collection<String> employeeNumberList) {
-        setEmployeeNumber_Terms(employeeNumberList, null);
+    public void setDescription_Terms(Collection<String> descriptionList) {
+        setDescription_Terms(descriptionList, null);
     }
 
-    public void setEmployeeNumber_Terms(Collection<String> employeeNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("employeeNumber", employeeNumberList);
+    public void setDescription_Terms(Collection<String> descriptionList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("description", descriptionList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_InScope(Collection<String> employeeNumberList) {
-        setEmployeeNumber_Terms(employeeNumberList, null);
+    public void setDescription_InScope(Collection<String> descriptionList) {
+        setDescription_Terms(descriptionList, null);
     }
 
-    public void setEmployeeNumber_InScope(Collection<String> employeeNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setEmployeeNumber_Terms(employeeNumberList, opLambda);
+    public void setDescription_InScope(Collection<String> descriptionList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setDescription_Terms(descriptionList, opLambda);
     }
 
-    public void setEmployeeNumber_Match(String employeeNumber) {
-        setEmployeeNumber_Match(employeeNumber, null);
+    public void setDescription_Match(String description) {
+        setDescription_Match(description, null);
     }
 
-    public void setEmployeeNumber_Match(String employeeNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("employeeNumber", employeeNumber);
+    public void setDescription_Match(String description, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("description", description);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_MatchPhrase(String employeeNumber) {
-        setEmployeeNumber_MatchPhrase(employeeNumber, null);
+    public void setDescription_MatchPhrase(String description) {
+        setDescription_MatchPhrase(description, null);
     }
 
-    public void setEmployeeNumber_MatchPhrase(String employeeNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("employeeNumber", employeeNumber);
+    public void setDescription_MatchPhrase(String description, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("description", description);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_MatchPhrasePrefix(String employeeNumber) {
-        setEmployeeNumber_MatchPhrasePrefix(employeeNumber, null);
+    public void setDescription_MatchPhrasePrefix(String description) {
+        setDescription_MatchPhrasePrefix(description, null);
     }
 
-    public void setEmployeeNumber_MatchPhrasePrefix(String employeeNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("employeeNumber", employeeNumber);
+    public void setDescription_MatchPhrasePrefix(String description, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("description", description);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_Fuzzy(String employeeNumber) {
-        setEmployeeNumber_Fuzzy(employeeNumber, null);
+    public void setDescription_Fuzzy(String description) {
+        setDescription_Fuzzy(description, null);
     }
 
-    public void setEmployeeNumber_Fuzzy(String employeeNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("employeeNumber", employeeNumber);
+    public void setDescription_Fuzzy(String description, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("description", description);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_Prefix(String employeeNumber) {
-        setEmployeeNumber_Prefix(employeeNumber, null);
+    public void setDescription_Prefix(String description) {
+        setDescription_Prefix(description, null);
     }
 
-    public void setEmployeeNumber_Prefix(String employeeNumber, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("employeeNumber", employeeNumber);
+    public void setDescription_Prefix(String description, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("description", description);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_Wildcard(String employeeNumber) {
-        setEmployeeNumber_Wildcard(employeeNumber, null);
+    public void setDescription_Wildcard(String description) {
+        setDescription_Wildcard(description, null);
     }
 
-    public void setEmployeeNumber_Wildcard(String employeeNumber, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("employeeNumber", employeeNumber);
+    public void setDescription_Wildcard(String description, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("description", description);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_Regexp(String employeeNumber) {
-        setEmployeeNumber_Regexp(employeeNumber, null);
+    public void setDescription_Regexp(String description) {
+        setDescription_Regexp(description, null);
     }
 
-    public void setEmployeeNumber_Regexp(String employeeNumber, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("employeeNumber", employeeNumber);
+    public void setDescription_Regexp(String description, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("description", description);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_SpanTerm(String employeeNumber) {
-        setEmployeeNumber_SpanTerm("employeeNumber", null);
+    public void setDescription_SpanTerm(String description) {
+        setDescription_SpanTerm("description", null);
     }
 
-    public void setEmployeeNumber_SpanTerm(String employeeNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("employeeNumber", employeeNumber);
+    public void setDescription_SpanTerm(String description, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("description", description);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_GreaterThan(String employeeNumber) {
-        setEmployeeNumber_GreaterThan(employeeNumber, null);
+    public void setDescription_GreaterThan(String description) {
+        setDescription_GreaterThan(description, null);
     }
 
-    public void setEmployeeNumber_GreaterThan(String employeeNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = employeeNumber;
-        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_GREATER_THAN, _value);
+    public void setDescription_GreaterThan(String description, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = description;
+        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_LessThan(String employeeNumber) {
-        setEmployeeNumber_LessThan(employeeNumber, null);
+    public void setDescription_LessThan(String description) {
+        setDescription_LessThan(description, null);
     }
 
-    public void setEmployeeNumber_LessThan(String employeeNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = employeeNumber;
-        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_LESS_THAN, _value);
+    public void setDescription_LessThan(String description, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = description;
+        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_GreaterEqual(String employeeNumber) {
-        setEmployeeNumber_GreaterEqual(employeeNumber, null);
+    public void setDescription_GreaterEqual(String description) {
+        setDescription_GreaterEqual(description, null);
     }
 
-    public void setEmployeeNumber_GreaterEqual(String employeeNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = employeeNumber;
-        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setDescription_GreaterEqual(String description, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = description;
+        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_LessEqual(String employeeNumber) {
-        setEmployeeNumber_LessEqual(employeeNumber, null);
+    public void setDescription_LessEqual(String description) {
+        setDescription_LessEqual(description, null);
     }
 
-    public void setEmployeeNumber_LessEqual(String employeeNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = employeeNumber;
-        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setDescription_LessEqual(String description, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = description;
+        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_Exists() {
-        setEmployeeNumber_Exists(null);
+    public void setDescription_Exists() {
+        setDescription_Exists(null);
     }
 
-    public void setEmployeeNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("employeeNumber");
+    public void setDescription_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("description");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeNumber_CommonTerms(String employeeNumber) {
-        setEmployeeNumber_CommonTerms(employeeNumber, null);
+    public void setDescription_CommonTerms(String description) {
+        setDescription_CommonTerms(description, null);
     }
 
-    public void setEmployeeNumber_CommonTerms(String employeeNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("employeeNumber", employeeNumber);
+    public void setDescription_CommonTerms(String description, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("description", description);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_EmployeeNumber_Asc() {
-        regOBA("employeeNumber");
+    public BsUserCQ addOrderBy_Description_Asc() {
+        regOBA("description");
         return this;
     }
 
-    public BsUserCQ addOrderBy_EmployeeNumber_Desc() {
-        regOBD("employeeNumber");
+    public BsUserCQ addOrderBy_Description_Desc() {
+        regOBD("description");
         return this;
     }
 
-    public void setMail_Equal(String mail) {
-        setMail_Term(mail, null);
+    public void setDestinationIndicator_Equal(String destinationIndicator) {
+        setDestinationIndicator_Term(destinationIndicator, null);
     }
 
-    public void setMail_Equal(String mail, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setMail_Term(mail, opLambda);
+    public void setDestinationIndicator_Equal(String destinationIndicator, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setDestinationIndicator_Term(destinationIndicator, opLambda);
     }
 
-    public void setMail_Term(String mail) {
-        setMail_Term(mail, null);
+    public void setDestinationIndicator_Term(String destinationIndicator) {
+        setDestinationIndicator_Term(destinationIndicator, null);
     }
 
-    public void setMail_Term(String mail, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("mail", mail);
+    public void setDestinationIndicator_Term(String destinationIndicator, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("destinationIndicator", destinationIndicator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_NotEqual(String mail) {
-        setMail_NotTerm(mail, null);
+    public void setDestinationIndicator_NotEqual(String destinationIndicator) {
+        setDestinationIndicator_NotTerm(destinationIndicator, null);
     }
 
-    public void setMail_NotTerm(String mail) {
-        setMail_NotTerm(mail, null);
+    public void setDestinationIndicator_NotTerm(String destinationIndicator) {
+        setDestinationIndicator_NotTerm(destinationIndicator, null);
     }
 
-    public void setMail_NotEqual(String mail, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setMail_NotTerm(mail, opLambda);
+    public void setDestinationIndicator_NotEqual(String destinationIndicator, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setDestinationIndicator_NotTerm(destinationIndicator, opLambda);
     }
 
-    public void setMail_NotTerm(String mail, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setMail_Term(mail), opLambda);
+    public void setDestinationIndicator_NotTerm(String destinationIndicator, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setDestinationIndicator_Term(destinationIndicator), opLambda);
     }
 
-    public void setMail_Terms(Collection<String> mailList) {
-        setMail_Terms(mailList, null);
+    public void setDestinationIndicator_Terms(Collection<String> destinationIndicatorList) {
+        setDestinationIndicator_Terms(destinationIndicatorList, null);
     }
 
-    public void setMail_Terms(Collection<String> mailList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("mail", mailList);
+    public void setDestinationIndicator_Terms(Collection<String> destinationIndicatorList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("destinationIndicator", destinationIndicatorList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_InScope(Collection<String> mailList) {
-        setMail_Terms(mailList, null);
+    public void setDestinationIndicator_InScope(Collection<String> destinationIndicatorList) {
+        setDestinationIndicator_Terms(destinationIndicatorList, null);
     }
 
-    public void setMail_InScope(Collection<String> mailList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setMail_Terms(mailList, opLambda);
+    public void setDestinationIndicator_InScope(Collection<String> destinationIndicatorList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setDestinationIndicator_Terms(destinationIndicatorList, opLambda);
     }
 
-    public void setMail_Match(String mail) {
-        setMail_Match(mail, null);
+    public void setDestinationIndicator_Match(String destinationIndicator) {
+        setDestinationIndicator_Match(destinationIndicator, null);
     }
 
-    public void setMail_Match(String mail, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("mail", mail);
+    public void setDestinationIndicator_Match(String destinationIndicator, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("destinationIndicator", destinationIndicator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_MatchPhrase(String mail) {
-        setMail_MatchPhrase(mail, null);
+    public void setDestinationIndicator_MatchPhrase(String destinationIndicator) {
+        setDestinationIndicator_MatchPhrase(destinationIndicator, null);
     }
 
-    public void setMail_MatchPhrase(String mail, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("mail", mail);
+    public void setDestinationIndicator_MatchPhrase(String destinationIndicator, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("destinationIndicator", destinationIndicator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_MatchPhrasePrefix(String mail) {
-        setMail_MatchPhrasePrefix(mail, null);
+    public void setDestinationIndicator_MatchPhrasePrefix(String destinationIndicator) {
+        setDestinationIndicator_MatchPhrasePrefix(destinationIndicator, null);
     }
 
-    public void setMail_MatchPhrasePrefix(String mail, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("mail", mail);
+    public void setDestinationIndicator_MatchPhrasePrefix(String destinationIndicator,
+            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("destinationIndicator", destinationIndicator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_Fuzzy(String mail) {
-        setMail_Fuzzy(mail, null);
+    public void setDestinationIndicator_Fuzzy(String destinationIndicator) {
+        setDestinationIndicator_Fuzzy(destinationIndicator, null);
     }
 
-    public void setMail_Fuzzy(String mail, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("mail", mail);
+    public void setDestinationIndicator_Fuzzy(String destinationIndicator, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("destinationIndicator", destinationIndicator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_Prefix(String mail) {
-        setMail_Prefix(mail, null);
+    public void setDestinationIndicator_Prefix(String destinationIndicator) {
+        setDestinationIndicator_Prefix(destinationIndicator, null);
     }
 
-    public void setMail_Prefix(String mail, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("mail", mail);
+    public void setDestinationIndicator_Prefix(String destinationIndicator, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("destinationIndicator", destinationIndicator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_Wildcard(String mail) {
-        setMail_Wildcard(mail, null);
+    public void setDestinationIndicator_Wildcard(String destinationIndicator) {
+        setDestinationIndicator_Wildcard(destinationIndicator, null);
     }
 
-    public void setMail_Wildcard(String mail, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("mail", mail);
+    public void setDestinationIndicator_Wildcard(String destinationIndicator, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("destinationIndicator", destinationIndicator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_Regexp(String mail) {
-        setMail_Regexp(mail, null);
+    public void setDestinationIndicator_Regexp(String destinationIndicator) {
+        setDestinationIndicator_Regexp(destinationIndicator, null);
     }
 
-    public void setMail_Regexp(String mail, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("mail", mail);
+    public void setDestinationIndicator_Regexp(String destinationIndicator, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("destinationIndicator", destinationIndicator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_SpanTerm(String mail) {
-        setMail_SpanTerm("mail", null);
+    public void setDestinationIndicator_SpanTerm(String destinationIndicator) {
+        setDestinationIndicator_SpanTerm("destinationIndicator", null);
     }
 
-    public void setMail_SpanTerm(String mail, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("mail", mail);
+    public void setDestinationIndicator_SpanTerm(String destinationIndicator, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("destinationIndicator", destinationIndicator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_GreaterThan(String mail) {
-        setMail_GreaterThan(mail, null);
+    public void setDestinationIndicator_GreaterThan(String destinationIndicator) {
+        setDestinationIndicator_GreaterThan(destinationIndicator, null);
     }
 
-    public void setMail_GreaterThan(String mail, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = mail;
-        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_GREATER_THAN, _value);
+    public void setDestinationIndicator_GreaterThan(String destinationIndicator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = destinationIndicator;
+        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_LessThan(String mail) {
-        setMail_LessThan(mail, null);
+    public void setDestinationIndicator_LessThan(String destinationIndicator) {
+        setDestinationIndicator_LessThan(destinationIndicator, null);
     }
 
-    public void setMail_LessThan(String mail, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = mail;
-        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_LESS_THAN, _value);
+    public void setDestinationIndicator_LessThan(String destinationIndicator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = destinationIndicator;
+        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_GreaterEqual(String mail) {
-        setMail_GreaterEqual(mail, null);
+    public void setDestinationIndicator_GreaterEqual(String destinationIndicator) {
+        setDestinationIndicator_GreaterEqual(destinationIndicator, null);
     }
 
-    public void setMail_GreaterEqual(String mail, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = mail;
-        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setDestinationIndicator_GreaterEqual(String destinationIndicator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = destinationIndicator;
+        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_LessEqual(String mail) {
-        setMail_LessEqual(mail, null);
+    public void setDestinationIndicator_LessEqual(String destinationIndicator) {
+        setDestinationIndicator_LessEqual(destinationIndicator, null);
     }
 
-    public void setMail_LessEqual(String mail, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = mail;
-        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setDestinationIndicator_LessEqual(String destinationIndicator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = destinationIndicator;
+        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_Exists() {
-        setMail_Exists(null);
+    public void setDestinationIndicator_Exists() {
+        setDestinationIndicator_Exists(null);
     }
 
-    public void setMail_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("mail");
+    public void setDestinationIndicator_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("destinationIndicator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMail_CommonTerms(String mail) {
-        setMail_CommonTerms(mail, null);
+    public void setDestinationIndicator_CommonTerms(String destinationIndicator) {
+        setDestinationIndicator_CommonTerms(destinationIndicator, null);
     }
 
-    public void setMail_CommonTerms(String mail, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("mail", mail);
+    public void setDestinationIndicator_CommonTerms(String destinationIndicator, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("destinationIndicator", destinationIndicator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_Mail_Asc() {
-        regOBA("mail");
+    public BsUserCQ addOrderBy_DestinationIndicator_Asc() {
+        regOBA("destinationIndicator");
         return this;
     }
 
-    public BsUserCQ addOrderBy_Mail_Desc() {
-        regOBD("mail");
+    public BsUserCQ addOrderBy_DestinationIndicator_Desc() {
+        regOBD("destinationIndicator");
         return this;
     }
 
-    public void setTelephoneNumber_Equal(String telephoneNumber) {
-        setTelephoneNumber_Term(telephoneNumber, null);
+    public void setDisplayName_Equal(String displayName) {
+        setDisplayName_Term(displayName, null);
     }
 
-    public void setTelephoneNumber_Equal(String telephoneNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setTelephoneNumber_Term(telephoneNumber, opLambda);
+    public void setDisplayName_Equal(String displayName, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setDisplayName_Term(displayName, opLambda);
     }
 
-    public void setTelephoneNumber_Term(String telephoneNumber) {
-        setTelephoneNumber_Term(telephoneNumber, null);
+    public void setDisplayName_Term(String displayName) {
+        setDisplayName_Term(displayName, null);
     }
 
-    public void setTelephoneNumber_Term(String telephoneNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("telephoneNumber", telephoneNumber);
+    public void setDisplayName_Term(String displayName, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("displayName", displayName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_NotEqual(String telephoneNumber) {
-        setTelephoneNumber_NotTerm(telephoneNumber, null);
+    public void setDisplayName_NotEqual(String displayName) {
+        setDisplayName_NotTerm(displayName, null);
     }
 
-    public void setTelephoneNumber_NotTerm(String telephoneNumber) {
-        setTelephoneNumber_NotTerm(telephoneNumber, null);
+    public void setDisplayName_NotTerm(String displayName) {
+        setDisplayName_NotTerm(displayName, null);
     }
 
-    public void setTelephoneNumber_NotEqual(String telephoneNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setTelephoneNumber_NotTerm(telephoneNumber, opLambda);
+    public void setDisplayName_NotEqual(String displayName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setDisplayName_NotTerm(displayName, opLambda);
     }
 
-    public void setTelephoneNumber_NotTerm(String telephoneNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setTelephoneNumber_Term(telephoneNumber), opLambda);
+    public void setDisplayName_NotTerm(String displayName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setDisplayName_Term(displayName), opLambda);
     }
 
-    public void setTelephoneNumber_Terms(Collection<String> telephoneNumberList) {
-        setTelephoneNumber_Terms(telephoneNumberList, null);
+    public void setDisplayName_Terms(Collection<String> displayNameList) {
+        setDisplayName_Terms(displayNameList, null);
     }
 
-    public void setTelephoneNumber_Terms(Collection<String> telephoneNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("telephoneNumber", telephoneNumberList);
+    public void setDisplayName_Terms(Collection<String> displayNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("displayName", displayNameList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_InScope(Collection<String> telephoneNumberList) {
-        setTelephoneNumber_Terms(telephoneNumberList, null);
+    public void setDisplayName_InScope(Collection<String> displayNameList) {
+        setDisplayName_Terms(displayNameList, null);
     }
 
-    public void setTelephoneNumber_InScope(Collection<String> telephoneNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setTelephoneNumber_Terms(telephoneNumberList, opLambda);
+    public void setDisplayName_InScope(Collection<String> displayNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setDisplayName_Terms(displayNameList, opLambda);
     }
 
-    public void setTelephoneNumber_Match(String telephoneNumber) {
-        setTelephoneNumber_Match(telephoneNumber, null);
+    public void setDisplayName_Match(String displayName) {
+        setDisplayName_Match(displayName, null);
     }
 
-    public void setTelephoneNumber_Match(String telephoneNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("telephoneNumber", telephoneNumber);
+    public void setDisplayName_Match(String displayName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("displayName", displayName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_MatchPhrase(String telephoneNumber) {
-        setTelephoneNumber_MatchPhrase(telephoneNumber, null);
+    public void setDisplayName_MatchPhrase(String displayName) {
+        setDisplayName_MatchPhrase(displayName, null);
     }
 
-    public void setTelephoneNumber_MatchPhrase(String telephoneNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("telephoneNumber", telephoneNumber);
+    public void setDisplayName_MatchPhrase(String displayName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("displayName", displayName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_MatchPhrasePrefix(String telephoneNumber) {
-        setTelephoneNumber_MatchPhrasePrefix(telephoneNumber, null);
+    public void setDisplayName_MatchPhrasePrefix(String displayName) {
+        setDisplayName_MatchPhrasePrefix(displayName, null);
     }
 
-    public void setTelephoneNumber_MatchPhrasePrefix(String telephoneNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("telephoneNumber", telephoneNumber);
+    public void setDisplayName_MatchPhrasePrefix(String displayName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("displayName", displayName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_Fuzzy(String telephoneNumber) {
-        setTelephoneNumber_Fuzzy(telephoneNumber, null);
+    public void setDisplayName_Fuzzy(String displayName) {
+        setDisplayName_Fuzzy(displayName, null);
     }
 
-    public void setTelephoneNumber_Fuzzy(String telephoneNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("telephoneNumber", telephoneNumber);
+    public void setDisplayName_Fuzzy(String displayName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("displayName", displayName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_Prefix(String telephoneNumber) {
-        setTelephoneNumber_Prefix(telephoneNumber, null);
+    public void setDisplayName_Prefix(String displayName) {
+        setDisplayName_Prefix(displayName, null);
     }
 
-    public void setTelephoneNumber_Prefix(String telephoneNumber, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("telephoneNumber", telephoneNumber);
+    public void setDisplayName_Prefix(String displayName, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("displayName", displayName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_Wildcard(String telephoneNumber) {
-        setTelephoneNumber_Wildcard(telephoneNumber, null);
+    public void setDisplayName_Wildcard(String displayName) {
+        setDisplayName_Wildcard(displayName, null);
     }
 
-    public void setTelephoneNumber_Wildcard(String telephoneNumber, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("telephoneNumber", telephoneNumber);
+    public void setDisplayName_Wildcard(String displayName, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("displayName", displayName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_Regexp(String telephoneNumber) {
-        setTelephoneNumber_Regexp(telephoneNumber, null);
+    public void setDisplayName_Regexp(String displayName) {
+        setDisplayName_Regexp(displayName, null);
     }
 
-    public void setTelephoneNumber_Regexp(String telephoneNumber, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("telephoneNumber", telephoneNumber);
+    public void setDisplayName_Regexp(String displayName, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("displayName", displayName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_SpanTerm(String telephoneNumber) {
-        setTelephoneNumber_SpanTerm("telephoneNumber", null);
+    public void setDisplayName_SpanTerm(String displayName) {
+        setDisplayName_SpanTerm("displayName", null);
     }
 
-    public void setTelephoneNumber_SpanTerm(String telephoneNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("telephoneNumber", telephoneNumber);
+    public void setDisplayName_SpanTerm(String displayName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("displayName", displayName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_GreaterThan(String telephoneNumber) {
-        setTelephoneNumber_GreaterThan(telephoneNumber, null);
+    public void setDisplayName_GreaterThan(String displayName) {
+        setDisplayName_GreaterThan(displayName, null);
     }
 
-    public void setTelephoneNumber_GreaterThan(String telephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = telephoneNumber;
-        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_GREATER_THAN, _value);
+    public void setDisplayName_GreaterThan(String displayName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = displayName;
+        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_LessThan(String telephoneNumber) {
-        setTelephoneNumber_LessThan(telephoneNumber, null);
+    public void setDisplayName_LessThan(String displayName) {
+        setDisplayName_LessThan(displayName, null);
     }
 
-    public void setTelephoneNumber_LessThan(String telephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = telephoneNumber;
-        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_LESS_THAN, _value);
+    public void setDisplayName_LessThan(String displayName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = displayName;
+        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_GreaterEqual(String telephoneNumber) {
-        setTelephoneNumber_GreaterEqual(telephoneNumber, null);
+    public void setDisplayName_GreaterEqual(String displayName) {
+        setDisplayName_GreaterEqual(displayName, null);
     }
 
-    public void setTelephoneNumber_GreaterEqual(String telephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = telephoneNumber;
-        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setDisplayName_GreaterEqual(String displayName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = displayName;
+        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_LessEqual(String telephoneNumber) {
-        setTelephoneNumber_LessEqual(telephoneNumber, null);
+    public void setDisplayName_LessEqual(String displayName) {
+        setDisplayName_LessEqual(displayName, null);
     }
 
-    public void setTelephoneNumber_LessEqual(String telephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = telephoneNumber;
-        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setDisplayName_LessEqual(String displayName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = displayName;
+        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_Exists() {
-        setTelephoneNumber_Exists(null);
+    public void setDisplayName_Exists() {
+        setDisplayName_Exists(null);
     }
 
-    public void setTelephoneNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("telephoneNumber");
+    public void setDisplayName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("displayName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTelephoneNumber_CommonTerms(String telephoneNumber) {
-        setTelephoneNumber_CommonTerms(telephoneNumber, null);
+    public void setDisplayName_CommonTerms(String displayName) {
+        setDisplayName_CommonTerms(displayName, null);
     }
 
-    public void setTelephoneNumber_CommonTerms(String telephoneNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("telephoneNumber", telephoneNumber);
+    public void setDisplayName_CommonTerms(String displayName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("displayName", displayName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_TelephoneNumber_Asc() {
-        regOBA("telephoneNumber");
+    public BsUserCQ addOrderBy_DisplayName_Asc() {
+        regOBA("displayName");
         return this;
     }
 
-    public BsUserCQ addOrderBy_TelephoneNumber_Desc() {
-        regOBD("telephoneNumber");
+    public BsUserCQ addOrderBy_DisplayName_Desc() {
+        regOBD("displayName");
         return this;
     }
 
-    public void setHomePhone_Equal(String homePhone) {
-        setHomePhone_Term(homePhone, null);
+    public void setEmployeeNumber_Equal(String employeeNumber) {
+        setEmployeeNumber_Term(employeeNumber, null);
     }
 
-    public void setHomePhone_Equal(String homePhone, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setHomePhone_Term(homePhone, opLambda);
+    public void setEmployeeNumber_Equal(String employeeNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setEmployeeNumber_Term(employeeNumber, opLambda);
     }
 
-    public void setHomePhone_Term(String homePhone) {
-        setHomePhone_Term(homePhone, null);
+    public void setEmployeeNumber_Term(String employeeNumber) {
+        setEmployeeNumber_Term(employeeNumber, null);
     }
 
-    public void setHomePhone_Term(String homePhone, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("homePhone", homePhone);
+    public void setEmployeeNumber_Term(String employeeNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("employeeNumber", employeeNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_NotEqual(String homePhone) {
-        setHomePhone_NotTerm(homePhone, null);
+    public void setEmployeeNumber_NotEqual(String employeeNumber) {
+        setEmployeeNumber_NotTerm(employeeNumber, null);
     }
 
-    public void setHomePhone_NotTerm(String homePhone) {
-        setHomePhone_NotTerm(homePhone, null);
+    public void setEmployeeNumber_NotTerm(String employeeNumber) {
+        setEmployeeNumber_NotTerm(employeeNumber, null);
     }
 
-    public void setHomePhone_NotEqual(String homePhone, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setHomePhone_NotTerm(homePhone, opLambda);
+    public void setEmployeeNumber_NotEqual(String employeeNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setEmployeeNumber_NotTerm(employeeNumber, opLambda);
     }
 
-    public void setHomePhone_NotTerm(String homePhone, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setHomePhone_Term(homePhone), opLambda);
+    public void setEmployeeNumber_NotTerm(String employeeNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setEmployeeNumber_Term(employeeNumber), opLambda);
     }
 
-    public void setHomePhone_Terms(Collection<String> homePhoneList) {
-        setHomePhone_Terms(homePhoneList, null);
+    public void setEmployeeNumber_Terms(Collection<String> employeeNumberList) {
+        setEmployeeNumber_Terms(employeeNumberList, null);
     }
 
-    public void setHomePhone_Terms(Collection<String> homePhoneList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("homePhone", homePhoneList);
+    public void setEmployeeNumber_Terms(Collection<String> employeeNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("employeeNumber", employeeNumberList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_InScope(Collection<String> homePhoneList) {
-        setHomePhone_Terms(homePhoneList, null);
+    public void setEmployeeNumber_InScope(Collection<String> employeeNumberList) {
+        setEmployeeNumber_Terms(employeeNumberList, null);
     }
 
-    public void setHomePhone_InScope(Collection<String> homePhoneList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setHomePhone_Terms(homePhoneList, opLambda);
-    }
+    public void setEmployeeNumber_InScope(Collection<String> employeeNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setEmployeeNumber_Terms(employeeNumberList, opLambda);
+    }
 
-    public void setHomePhone_Match(String homePhone) {
-        setHomePhone_Match(homePhone, null);
+    public void setEmployeeNumber_Match(String employeeNumber) {
+        setEmployeeNumber_Match(employeeNumber, null);
     }
 
-    public void setHomePhone_Match(String homePhone, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("homePhone", homePhone);
+    public void setEmployeeNumber_Match(String employeeNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("employeeNumber", employeeNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_MatchPhrase(String homePhone) {
-        setHomePhone_MatchPhrase(homePhone, null);
+    public void setEmployeeNumber_MatchPhrase(String employeeNumber) {
+        setEmployeeNumber_MatchPhrase(employeeNumber, null);
     }
 
-    public void setHomePhone_MatchPhrase(String homePhone, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("homePhone", homePhone);
+    public void setEmployeeNumber_MatchPhrase(String employeeNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("employeeNumber", employeeNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_MatchPhrasePrefix(String homePhone) {
-        setHomePhone_MatchPhrasePrefix(homePhone, null);
+    public void setEmployeeNumber_MatchPhrasePrefix(String employeeNumber) {
+        setEmployeeNumber_MatchPhrasePrefix(employeeNumber, null);
     }
 
-    public void setHomePhone_MatchPhrasePrefix(String homePhone, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("homePhone", homePhone);
+    public void setEmployeeNumber_MatchPhrasePrefix(String employeeNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("employeeNumber", employeeNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_Fuzzy(String homePhone) {
-        setHomePhone_Fuzzy(homePhone, null);
+    public void setEmployeeNumber_Fuzzy(String employeeNumber) {
+        setEmployeeNumber_Fuzzy(employeeNumber, null);
     }
 
-    public void setHomePhone_Fuzzy(String homePhone, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("homePhone", homePhone);
+    public void setEmployeeNumber_Fuzzy(String employeeNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("employeeNumber", employeeNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_Prefix(String homePhone) {
-        setHomePhone_Prefix(homePhone, null);
+    public void setEmployeeNumber_Prefix(String employeeNumber) {
+        setEmployeeNumber_Prefix(employeeNumber, null);
     }
 
-    public void setHomePhone_Prefix(String homePhone, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("homePhone", homePhone);
+    public void setEmployeeNumber_Prefix(String employeeNumber, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("employeeNumber", employeeNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_Wildcard(String homePhone) {
-        setHomePhone_Wildcard(homePhone, null);
+    public void setEmployeeNumber_Wildcard(String employeeNumber) {
+        setEmployeeNumber_Wildcard(employeeNumber, null);
     }
 
-    public void setHomePhone_Wildcard(String homePhone, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("homePhone", homePhone);
+    public void setEmployeeNumber_Wildcard(String employeeNumber, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("employeeNumber", employeeNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_Regexp(String homePhone) {
-        setHomePhone_Regexp(homePhone, null);
+    public void setEmployeeNumber_Regexp(String employeeNumber) {
+        setEmployeeNumber_Regexp(employeeNumber, null);
     }
 
-    public void setHomePhone_Regexp(String homePhone, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("homePhone", homePhone);
+    public void setEmployeeNumber_Regexp(String employeeNumber, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("employeeNumber", employeeNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_SpanTerm(String homePhone) {
-        setHomePhone_SpanTerm("homePhone", null);
+    public void setEmployeeNumber_SpanTerm(String employeeNumber) {
+        setEmployeeNumber_SpanTerm("employeeNumber", null);
     }
 
-    public void setHomePhone_SpanTerm(String homePhone, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("homePhone", homePhone);
+    public void setEmployeeNumber_SpanTerm(String employeeNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("employeeNumber", employeeNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_GreaterThan(String homePhone) {
-        setHomePhone_GreaterThan(homePhone, null);
+    public void setEmployeeNumber_GreaterThan(String employeeNumber) {
+        setEmployeeNumber_GreaterThan(employeeNumber, null);
     }
 
-    public void setHomePhone_GreaterThan(String homePhone, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = homePhone;
-        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_GREATER_THAN, _value);
+    public void setEmployeeNumber_GreaterThan(String employeeNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = employeeNumber;
+        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_LessThan(String homePhone) {
-        setHomePhone_LessThan(homePhone, null);
+    public void setEmployeeNumber_LessThan(String employeeNumber) {
+        setEmployeeNumber_LessThan(employeeNumber, null);
     }
 
-    public void setHomePhone_LessThan(String homePhone, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = homePhone;
-        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_LESS_THAN, _value);
+    public void setEmployeeNumber_LessThan(String employeeNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = employeeNumber;
+        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_GreaterEqual(String homePhone) {
-        setHomePhone_GreaterEqual(homePhone, null);
+    public void setEmployeeNumber_GreaterEqual(String employeeNumber) {
+        setEmployeeNumber_GreaterEqual(employeeNumber, null);
     }
 
-    public void setHomePhone_GreaterEqual(String homePhone, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = homePhone;
-        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setEmployeeNumber_GreaterEqual(String employeeNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = employeeNumber;
+        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_LessEqual(String homePhone) {
-        setHomePhone_LessEqual(homePhone, null);
+    public void setEmployeeNumber_LessEqual(String employeeNumber) {
+        setEmployeeNumber_LessEqual(employeeNumber, null);
     }
 
-    public void setHomePhone_LessEqual(String homePhone, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = homePhone;
-        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setEmployeeNumber_LessEqual(String employeeNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = employeeNumber;
+        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_Exists() {
-        setHomePhone_Exists(null);
+    public void setEmployeeNumber_Exists() {
+        setEmployeeNumber_Exists(null);
     }
 
-    public void setHomePhone_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("homePhone");
+    public void setEmployeeNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("employeeNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePhone_CommonTerms(String homePhone) {
-        setHomePhone_CommonTerms(homePhone, null);
+    public void setEmployeeNumber_CommonTerms(String employeeNumber) {
+        setEmployeeNumber_CommonTerms(employeeNumber, null);
     }
 
-    public void setHomePhone_CommonTerms(String homePhone, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("homePhone", homePhone);
+    public void setEmployeeNumber_CommonTerms(String employeeNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("employeeNumber", employeeNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_HomePhone_Asc() {
-        regOBA("homePhone");
+    public BsUserCQ addOrderBy_EmployeeNumber_Asc() {
+        regOBA("employeeNumber");
         return this;
     }
 
-    public BsUserCQ addOrderBy_HomePhone_Desc() {
-        regOBD("homePhone");
+    public BsUserCQ addOrderBy_EmployeeNumber_Desc() {
+        regOBD("employeeNumber");
         return this;
     }
 
-    public void setHomePostalAddress_Equal(String homePostalAddress) {
-        setHomePostalAddress_Term(homePostalAddress, null);
+    public void setEmployeeType_Equal(String employeeType) {
+        setEmployeeType_Term(employeeType, null);
     }
 
-    public void setHomePostalAddress_Equal(String homePostalAddress, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setHomePostalAddress_Term(homePostalAddress, opLambda);
+    public void setEmployeeType_Equal(String employeeType, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setEmployeeType_Term(employeeType, opLambda);
     }
 
-    public void setHomePostalAddress_Term(String homePostalAddress) {
-        setHomePostalAddress_Term(homePostalAddress, null);
+    public void setEmployeeType_Term(String employeeType) {
+        setEmployeeType_Term(employeeType, null);
     }
 
-    public void setHomePostalAddress_Term(String homePostalAddress, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("homePostalAddress", homePostalAddress);
+    public void setEmployeeType_Term(String employeeType, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("employeeType", employeeType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_NotEqual(String homePostalAddress) {
-        setHomePostalAddress_NotTerm(homePostalAddress, null);
+    public void setEmployeeType_NotEqual(String employeeType) {
+        setEmployeeType_NotTerm(employeeType, null);
     }
 
-    public void setHomePostalAddress_NotTerm(String homePostalAddress) {
-        setHomePostalAddress_NotTerm(homePostalAddress, null);
+    public void setEmployeeType_NotTerm(String employeeType) {
+        setEmployeeType_NotTerm(employeeType, null);
     }
 
-    public void setHomePostalAddress_NotEqual(String homePostalAddress, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setHomePostalAddress_NotTerm(homePostalAddress, opLambda);
+    public void setEmployeeType_NotEqual(String employeeType, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setEmployeeType_NotTerm(employeeType, opLambda);
     }
 
-    public void setHomePostalAddress_NotTerm(String homePostalAddress, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setHomePostalAddress_Term(homePostalAddress), opLambda);
+    public void setEmployeeType_NotTerm(String employeeType, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setEmployeeType_Term(employeeType), opLambda);
     }
 
-    public void setHomePostalAddress_Terms(Collection<String> homePostalAddressList) {
-        setHomePostalAddress_Terms(homePostalAddressList, null);
+    public void setEmployeeType_Terms(Collection<String> employeeTypeList) {
+        setEmployeeType_Terms(employeeTypeList, null);
     }
 
-    public void setHomePostalAddress_Terms(Collection<String> homePostalAddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("homePostalAddress", homePostalAddressList);
+    public void setEmployeeType_Terms(Collection<String> employeeTypeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("employeeType", employeeTypeList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_InScope(Collection<String> homePostalAddressList) {
-        setHomePostalAddress_Terms(homePostalAddressList, null);
+    public void setEmployeeType_InScope(Collection<String> employeeTypeList) {
+        setEmployeeType_Terms(employeeTypeList, null);
     }
 
-    public void setHomePostalAddress_InScope(Collection<String> homePostalAddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setHomePostalAddress_Terms(homePostalAddressList, opLambda);
+    public void setEmployeeType_InScope(Collection<String> employeeTypeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setEmployeeType_Terms(employeeTypeList, opLambda);
     }
 
-    public void setHomePostalAddress_Match(String homePostalAddress) {
-        setHomePostalAddress_Match(homePostalAddress, null);
+    public void setEmployeeType_Match(String employeeType) {
+        setEmployeeType_Match(employeeType, null);
     }
 
-    public void setHomePostalAddress_Match(String homePostalAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("homePostalAddress", homePostalAddress);
+    public void setEmployeeType_Match(String employeeType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("employeeType", employeeType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_MatchPhrase(String homePostalAddress) {
-        setHomePostalAddress_MatchPhrase(homePostalAddress, null);
+    public void setEmployeeType_MatchPhrase(String employeeType) {
+        setEmployeeType_MatchPhrase(employeeType, null);
     }
 
-    public void setHomePostalAddress_MatchPhrase(String homePostalAddress, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("homePostalAddress", homePostalAddress);
+    public void setEmployeeType_MatchPhrase(String employeeType, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("employeeType", employeeType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_MatchPhrasePrefix(String homePostalAddress) {
-        setHomePostalAddress_MatchPhrasePrefix(homePostalAddress, null);
+    public void setEmployeeType_MatchPhrasePrefix(String employeeType) {
+        setEmployeeType_MatchPhrasePrefix(employeeType, null);
     }
 
-    public void setHomePostalAddress_MatchPhrasePrefix(String homePostalAddress, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("homePostalAddress", homePostalAddress);
+    public void setEmployeeType_MatchPhrasePrefix(String employeeType, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("employeeType", employeeType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_Fuzzy(String homePostalAddress) {
-        setHomePostalAddress_Fuzzy(homePostalAddress, null);
+    public void setEmployeeType_Fuzzy(String employeeType) {
+        setEmployeeType_Fuzzy(employeeType, null);
     }
 
-    public void setHomePostalAddress_Fuzzy(String homePostalAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("homePostalAddress", homePostalAddress);
+    public void setEmployeeType_Fuzzy(String employeeType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("employeeType", employeeType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_Prefix(String homePostalAddress) {
-        setHomePostalAddress_Prefix(homePostalAddress, null);
+    public void setEmployeeType_Prefix(String employeeType) {
+        setEmployeeType_Prefix(employeeType, null);
     }
 
-    public void setHomePostalAddress_Prefix(String homePostalAddress, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("homePostalAddress", homePostalAddress);
+    public void setEmployeeType_Prefix(String employeeType, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("employeeType", employeeType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_Wildcard(String homePostalAddress) {
-        setHomePostalAddress_Wildcard(homePostalAddress, null);
+    public void setEmployeeType_Wildcard(String employeeType) {
+        setEmployeeType_Wildcard(employeeType, null);
     }
 
-    public void setHomePostalAddress_Wildcard(String homePostalAddress, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("homePostalAddress", homePostalAddress);
+    public void setEmployeeType_Wildcard(String employeeType, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("employeeType", employeeType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_Regexp(String homePostalAddress) {
-        setHomePostalAddress_Regexp(homePostalAddress, null);
+    public void setEmployeeType_Regexp(String employeeType) {
+        setEmployeeType_Regexp(employeeType, null);
     }
 
-    public void setHomePostalAddress_Regexp(String homePostalAddress, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("homePostalAddress", homePostalAddress);
+    public void setEmployeeType_Regexp(String employeeType, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("employeeType", employeeType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_SpanTerm(String homePostalAddress) {
-        setHomePostalAddress_SpanTerm("homePostalAddress", null);
+    public void setEmployeeType_SpanTerm(String employeeType) {
+        setEmployeeType_SpanTerm("employeeType", null);
     }
 
-    public void setHomePostalAddress_SpanTerm(String homePostalAddress, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("homePostalAddress", homePostalAddress);
+    public void setEmployeeType_SpanTerm(String employeeType, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("employeeType", employeeType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_GreaterThan(String homePostalAddress) {
-        setHomePostalAddress_GreaterThan(homePostalAddress, null);
+    public void setEmployeeType_GreaterThan(String employeeType) {
+        setEmployeeType_GreaterThan(employeeType, null);
     }
 
-    public void setHomePostalAddress_GreaterThan(String homePostalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = homePostalAddress;
-        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_GREATER_THAN, _value);
+    public void setEmployeeType_GreaterThan(String employeeType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = employeeType;
+        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_LessThan(String homePostalAddress) {
-        setHomePostalAddress_LessThan(homePostalAddress, null);
-    }
+    public void setEmployeeType_LessThan(String employeeType) {
+        setEmployeeType_LessThan(employeeType, null);
+    }
 
-    public void setHomePostalAddress_LessThan(String homePostalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = homePostalAddress;
-        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_LESS_THAN, _value);
+    public void setEmployeeType_LessThan(String employeeType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = employeeType;
+        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_GreaterEqual(String homePostalAddress) {
-        setHomePostalAddress_GreaterEqual(homePostalAddress, null);
+    public void setEmployeeType_GreaterEqual(String employeeType) {
+        setEmployeeType_GreaterEqual(employeeType, null);
     }
 
-    public void setHomePostalAddress_GreaterEqual(String homePostalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = homePostalAddress;
-        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setEmployeeType_GreaterEqual(String employeeType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = employeeType;
+        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_LessEqual(String homePostalAddress) {
-        setHomePostalAddress_LessEqual(homePostalAddress, null);
+    public void setEmployeeType_LessEqual(String employeeType) {
+        setEmployeeType_LessEqual(employeeType, null);
     }
 
-    public void setHomePostalAddress_LessEqual(String homePostalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = homePostalAddress;
-        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setEmployeeType_LessEqual(String employeeType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = employeeType;
+        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_Exists() {
-        setHomePostalAddress_Exists(null);
+    public void setEmployeeType_Exists() {
+        setEmployeeType_Exists(null);
     }
 
-    public void setHomePostalAddress_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("homePostalAddress");
+    public void setEmployeeType_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("employeeType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomePostalAddress_CommonTerms(String homePostalAddress) {
-        setHomePostalAddress_CommonTerms(homePostalAddress, null);
+    public void setEmployeeType_CommonTerms(String employeeType) {
+        setEmployeeType_CommonTerms(employeeType, null);
     }
 
-    public void setHomePostalAddress_CommonTerms(String homePostalAddress, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("homePostalAddress", homePostalAddress);
+    public void setEmployeeType_CommonTerms(String employeeType, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("employeeType", employeeType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_HomePostalAddress_Asc() {
-        regOBA("homePostalAddress");
+    public BsUserCQ addOrderBy_EmployeeType_Asc() {
+        regOBA("employeeType");
         return this;
     }
 
-    public BsUserCQ addOrderBy_HomePostalAddress_Desc() {
-        regOBD("homePostalAddress");
+    public BsUserCQ addOrderBy_EmployeeType_Desc() {
+        regOBD("employeeType");
         return this;
     }
 
-    public void setLabeledURI_Equal(String labeledURI) {
-        setLabeledURI_Term(labeledURI, null);
+    public void setFacsimileTelephoneNumber_Equal(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_Term(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_Equal(String labeledURI, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setLabeledURI_Term(labeledURI, opLambda);
+    public void setFacsimileTelephoneNumber_Equal(String facsimileTelephoneNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setFacsimileTelephoneNumber_Term(facsimileTelephoneNumber, opLambda);
     }
 
-    public void setLabeledURI_Term(String labeledURI) {
-        setLabeledURI_Term(labeledURI, null);
+    public void setFacsimileTelephoneNumber_Term(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_Term(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_Term(String labeledURI, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("labeledURI", labeledURI);
+    public void setFacsimileTelephoneNumber_Term(String facsimileTelephoneNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_NotEqual(String labeledURI) {
-        setLabeledURI_NotTerm(labeledURI, null);
+    public void setFacsimileTelephoneNumber_NotEqual(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_NotTerm(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_NotTerm(String labeledURI) {
-        setLabeledURI_NotTerm(labeledURI, null);
+    public void setFacsimileTelephoneNumber_NotTerm(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_NotTerm(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_NotEqual(String labeledURI, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setLabeledURI_NotTerm(labeledURI, opLambda);
+    public void setFacsimileTelephoneNumber_NotEqual(String facsimileTelephoneNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setFacsimileTelephoneNumber_NotTerm(facsimileTelephoneNumber, opLambda);
     }
 
-    public void setLabeledURI_NotTerm(String labeledURI, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setLabeledURI_Term(labeledURI), opLambda);
+    public void setFacsimileTelephoneNumber_NotTerm(String facsimileTelephoneNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setFacsimileTelephoneNumber_Term(facsimileTelephoneNumber), opLambda);
     }
 
-    public void setLabeledURI_Terms(Collection<String> labeledURIList) {
-        setLabeledURI_Terms(labeledURIList, null);
+    public void setFacsimileTelephoneNumber_Terms(Collection<String> facsimileTelephoneNumberList) {
+        setFacsimileTelephoneNumber_Terms(facsimileTelephoneNumberList, null);
     }
 
-    public void setLabeledURI_Terms(Collection<String> labeledURIList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("labeledURI", labeledURIList);
+    public void setFacsimileTelephoneNumber_Terms(Collection<String> facsimileTelephoneNumberList,
+            ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("facsimileTelephoneNumber", facsimileTelephoneNumberList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_InScope(Collection<String> labeledURIList) {
-        setLabeledURI_Terms(labeledURIList, null);
+    public void setFacsimileTelephoneNumber_InScope(Collection<String> facsimileTelephoneNumberList) {
+        setFacsimileTelephoneNumber_Terms(facsimileTelephoneNumberList, null);
     }
 
-    public void setLabeledURI_InScope(Collection<String> labeledURIList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setLabeledURI_Terms(labeledURIList, opLambda);
+    public void setFacsimileTelephoneNumber_InScope(Collection<String> facsimileTelephoneNumberList,
+            ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setFacsimileTelephoneNumber_Terms(facsimileTelephoneNumberList, opLambda);
     }
 
-    public void setLabeledURI_Match(String labeledURI) {
-        setLabeledURI_Match(labeledURI, null);
+    public void setFacsimileTelephoneNumber_Match(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_Match(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_Match(String labeledURI, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("labeledURI", labeledURI);
+    public void setFacsimileTelephoneNumber_Match(String facsimileTelephoneNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_MatchPhrase(String labeledURI) {
-        setLabeledURI_MatchPhrase(labeledURI, null);
+    public void setFacsimileTelephoneNumber_MatchPhrase(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_MatchPhrase(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_MatchPhrase(String labeledURI, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("labeledURI", labeledURI);
+    public void setFacsimileTelephoneNumber_MatchPhrase(String facsimileTelephoneNumber,
+            ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_MatchPhrasePrefix(String labeledURI) {
-        setLabeledURI_MatchPhrasePrefix(labeledURI, null);
+    public void setFacsimileTelephoneNumber_MatchPhrasePrefix(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_MatchPhrasePrefix(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_MatchPhrasePrefix(String labeledURI, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("labeledURI", labeledURI);
+    public void setFacsimileTelephoneNumber_MatchPhrasePrefix(String facsimileTelephoneNumber,
+            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_Fuzzy(String labeledURI) {
-        setLabeledURI_Fuzzy(labeledURI, null);
+    public void setFacsimileTelephoneNumber_Fuzzy(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_Fuzzy(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_Fuzzy(String labeledURI, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("labeledURI", labeledURI);
+    public void setFacsimileTelephoneNumber_Fuzzy(String facsimileTelephoneNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_Prefix(String labeledURI) {
-        setLabeledURI_Prefix(labeledURI, null);
+    public void setFacsimileTelephoneNumber_Prefix(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_Prefix(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_Prefix(String labeledURI, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("labeledURI", labeledURI);
+    public void setFacsimileTelephoneNumber_Prefix(String facsimileTelephoneNumber, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_Wildcard(String labeledURI) {
-        setLabeledURI_Wildcard(labeledURI, null);
+    public void setFacsimileTelephoneNumber_Wildcard(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_Wildcard(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_Wildcard(String labeledURI, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("labeledURI", labeledURI);
+    public void setFacsimileTelephoneNumber_Wildcard(String facsimileTelephoneNumber, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_Regexp(String labeledURI) {
-        setLabeledURI_Regexp(labeledURI, null);
+    public void setFacsimileTelephoneNumber_Regexp(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_Regexp(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_Regexp(String labeledURI, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("labeledURI", labeledURI);
+    public void setFacsimileTelephoneNumber_Regexp(String facsimileTelephoneNumber, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_SpanTerm(String labeledURI) {
-        setLabeledURI_SpanTerm("labeledURI", null);
+    public void setFacsimileTelephoneNumber_SpanTerm(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_SpanTerm("facsimileTelephoneNumber", null);
     }
 
-    public void setLabeledURI_SpanTerm(String labeledURI, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("labeledURI", labeledURI);
+    public void setFacsimileTelephoneNumber_SpanTerm(String facsimileTelephoneNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_GreaterThan(String labeledURI) {
-        setLabeledURI_GreaterThan(labeledURI, null);
+    public void setFacsimileTelephoneNumber_GreaterThan(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_GreaterThan(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_GreaterThan(String labeledURI, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = labeledURI;
-        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_GREATER_THAN, _value);
+    public void setFacsimileTelephoneNumber_GreaterThan(String facsimileTelephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = facsimileTelephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_LessThan(String labeledURI) {
-        setLabeledURI_LessThan(labeledURI, null);
+    public void setFacsimileTelephoneNumber_LessThan(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_LessThan(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_LessThan(String labeledURI, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = labeledURI;
-        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_LESS_THAN, _value);
+    public void setFacsimileTelephoneNumber_LessThan(String facsimileTelephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = facsimileTelephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_GreaterEqual(String labeledURI) {
-        setLabeledURI_GreaterEqual(labeledURI, null);
+    public void setFacsimileTelephoneNumber_GreaterEqual(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_GreaterEqual(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_GreaterEqual(String labeledURI, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = labeledURI;
-        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setFacsimileTelephoneNumber_GreaterEqual(String facsimileTelephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = facsimileTelephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_LessEqual(String labeledURI) {
-        setLabeledURI_LessEqual(labeledURI, null);
+    public void setFacsimileTelephoneNumber_LessEqual(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_LessEqual(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_LessEqual(String labeledURI, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = labeledURI;
-        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setFacsimileTelephoneNumber_LessEqual(String facsimileTelephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = facsimileTelephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_Exists() {
-        setLabeledURI_Exists(null);
+    public void setFacsimileTelephoneNumber_Exists() {
+        setFacsimileTelephoneNumber_Exists(null);
     }
 
-    public void setLabeledURI_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("labeledURI");
+    public void setFacsimileTelephoneNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("facsimileTelephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setLabeledURI_CommonTerms(String labeledURI) {
-        setLabeledURI_CommonTerms(labeledURI, null);
+    public void setFacsimileTelephoneNumber_CommonTerms(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_CommonTerms(facsimileTelephoneNumber, null);
     }
 
-    public void setLabeledURI_CommonTerms(String labeledURI, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("labeledURI", labeledURI);
+    public void setFacsimileTelephoneNumber_CommonTerms(String facsimileTelephoneNumber,
+            ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_LabeledURI_Asc() {
-        regOBA("labeledURI");
+    public BsUserCQ addOrderBy_FacsimileTelephoneNumber_Asc() {
+        regOBA("facsimileTelephoneNumber");
         return this;
     }
 
-    public BsUserCQ addOrderBy_LabeledURI_Desc() {
-        regOBD("labeledURI");
+    public BsUserCQ addOrderBy_FacsimileTelephoneNumber_Desc() {
+        regOBD("facsimileTelephoneNumber");
         return this;
     }
 
-    public void setRoomNumber_Equal(String roomNumber) {
-        setRoomNumber_Term(roomNumber, null);
+    public void setGidNumber_Equal(Long gidNumber) {
+        setGidNumber_Term(gidNumber, null);
     }
 
-    public void setRoomNumber_Equal(String roomNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setRoomNumber_Term(roomNumber, opLambda);
+    public void setGidNumber_Equal(Long gidNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setGidNumber_Term(gidNumber, opLambda);
     }
 
-    public void setRoomNumber_Term(String roomNumber) {
-        setRoomNumber_Term(roomNumber, null);
+    public void setGidNumber_Term(Long gidNumber) {
+        setGidNumber_Term(gidNumber, null);
     }
 
-    public void setRoomNumber_Term(String roomNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("roomNumber", roomNumber);
+    public void setGidNumber_Term(Long gidNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoomNumber_NotEqual(String roomNumber) {
-        setRoomNumber_NotTerm(roomNumber, null);
+    public void setGidNumber_NotEqual(Long gidNumber) {
+        setGidNumber_NotTerm(gidNumber, null);
     }
 
-    public void setRoomNumber_NotTerm(String roomNumber) {
-        setRoomNumber_NotTerm(roomNumber, null);
+    public void setGidNumber_NotTerm(Long gidNumber) {
+        setGidNumber_NotTerm(gidNumber, null);
     }
 
-    public void setRoomNumber_NotEqual(String roomNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setRoomNumber_NotTerm(roomNumber, opLambda);
+    public void setGidNumber_NotEqual(Long gidNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setGidNumber_NotTerm(gidNumber, opLambda);
     }
 
-    public void setRoomNumber_NotTerm(String roomNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setRoomNumber_Term(roomNumber), opLambda);
+    public void setGidNumber_NotTerm(Long gidNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setGidNumber_Term(gidNumber), opLambda);
     }
 
-    public void setRoomNumber_Terms(Collection<String> roomNumberList) {
-        setRoomNumber_Terms(roomNumberList, null);
+    public void setGidNumber_Terms(Collection<Long> gidNumberList) {
+        setGidNumber_Terms(gidNumberList, null);
     }
 
-    public void setRoomNumber_Terms(Collection<String> roomNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("roomNumber", roomNumberList);
+    public void setGidNumber_Terms(Collection<Long> gidNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("gidNumber", gidNumberList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoomNumber_InScope(Collection<String> roomNumberList) {
-        setRoomNumber_Terms(roomNumberList, null);
-    }
-
-    public void setRoomNumber_InScope(Collection<String> roomNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setRoomNumber_Terms(roomNumberList, opLambda);
-    }
-
-    public void setRoomNumber_Match(String roomNumber) {
-        setRoomNumber_Match(roomNumber, null);
+    public void setGidNumber_InScope(Collection<Long> gidNumberList) {
+        setGidNumber_Terms(gidNumberList, null);
     }
 
-    public void setRoomNumber_Match(String roomNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("roomNumber", roomNumber);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setGidNumber_InScope(Collection<Long> gidNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setGidNumber_Terms(gidNumberList, opLambda);
     }
 
-    public void setRoomNumber_MatchPhrase(String roomNumber) {
-        setRoomNumber_MatchPhrase(roomNumber, null);
+    public void setGidNumber_Match(Long gidNumber) {
+        setGidNumber_Match(gidNumber, null);
     }
 
-    public void setRoomNumber_MatchPhrase(String roomNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("roomNumber", roomNumber);
+    public void setGidNumber_Match(Long gidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoomNumber_MatchPhrasePrefix(String roomNumber) {
-        setRoomNumber_MatchPhrasePrefix(roomNumber, null);
+    public void setGidNumber_MatchPhrase(Long gidNumber) {
+        setGidNumber_MatchPhrase(gidNumber, null);
     }
 
-    public void setRoomNumber_MatchPhrasePrefix(String roomNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("roomNumber", roomNumber);
+    public void setGidNumber_MatchPhrase(Long gidNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoomNumber_Fuzzy(String roomNumber) {
-        setRoomNumber_Fuzzy(roomNumber, null);
+    public void setGidNumber_MatchPhrasePrefix(Long gidNumber) {
+        setGidNumber_MatchPhrasePrefix(gidNumber, null);
     }
 
-    public void setRoomNumber_Fuzzy(String roomNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("roomNumber", roomNumber);
+    public void setGidNumber_MatchPhrasePrefix(Long gidNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoomNumber_Prefix(String roomNumber) {
-        setRoomNumber_Prefix(roomNumber, null);
+    public void setGidNumber_Fuzzy(Long gidNumber) {
+        setGidNumber_Fuzzy(gidNumber, null);
     }
 
-    public void setRoomNumber_Prefix(String roomNumber, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("roomNumber", roomNumber);
+    public void setGidNumber_Fuzzy(Long gidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoomNumber_Wildcard(String roomNumber) {
-        setRoomNumber_Wildcard(roomNumber, null);
+    public void setGidNumber_GreaterThan(Long gidNumber) {
+        setGidNumber_GreaterThan(gidNumber, null);
     }
 
-    public void setRoomNumber_Wildcard(String roomNumber, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("roomNumber", roomNumber);
+    public void setGidNumber_GreaterThan(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoomNumber_Regexp(String roomNumber) {
-        setRoomNumber_Regexp(roomNumber, null);
+    public void setGidNumber_LessThan(Long gidNumber) {
+        setGidNumber_LessThan(gidNumber, null);
     }
 
-    public void setRoomNumber_Regexp(String roomNumber, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("roomNumber", roomNumber);
+    public void setGidNumber_LessThan(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoomNumber_SpanTerm(String roomNumber) {
-        setRoomNumber_SpanTerm("roomNumber", null);
+    public void setGidNumber_GreaterEqual(Long gidNumber) {
+        setGidNumber_GreaterEqual(gidNumber, null);
     }
 
-    public void setRoomNumber_SpanTerm(String roomNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("roomNumber", roomNumber);
+    public void setGidNumber_GreaterEqual(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoomNumber_GreaterThan(String roomNumber) {
-        setRoomNumber_GreaterThan(roomNumber, null);
+    public void setGidNumber_LessEqual(Long gidNumber) {
+        setGidNumber_LessEqual(gidNumber, null);
     }
 
-    public void setRoomNumber_GreaterThan(String roomNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = roomNumber;
-        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_GREATER_THAN, _value);
+    public void setGidNumber_LessEqual(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoomNumber_LessThan(String roomNumber) {
-        setRoomNumber_LessThan(roomNumber, null);
+    public void setGidNumber_Exists() {
+        setGidNumber_Exists(null);
     }
 
-    public void setRoomNumber_LessThan(String roomNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = roomNumber;
-        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_LESS_THAN, _value);
+    public void setGidNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoomNumber_GreaterEqual(String roomNumber) {
-        setRoomNumber_GreaterEqual(roomNumber, null);
+    public void setGidNumber_CommonTerms(Long gidNumber) {
+        setGidNumber_CommonTerms(gidNumber, null);
     }
 
-    public void setRoomNumber_GreaterEqual(String roomNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = roomNumber;
-        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setGidNumber_CommonTerms(Long gidNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoomNumber_LessEqual(String roomNumber) {
-        setRoomNumber_LessEqual(roomNumber, null);
+    public BsUserCQ addOrderBy_GidNumber_Asc() {
+        regOBA("gidNumber");
+        return this;
     }
 
-    public void setRoomNumber_LessEqual(String roomNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = roomNumber;
-        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public BsUserCQ addOrderBy_GidNumber_Desc() {
+        regOBD("gidNumber");
+        return this;
     }
 
-    public void setRoomNumber_Exists() {
-        setRoomNumber_Exists(null);
+    public void setGivenName_Equal(String givenName) {
+        setGivenName_Term(givenName, null);
     }
 
-    public void setRoomNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("roomNumber");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setGivenName_Equal(String givenName, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setGivenName_Term(givenName, opLambda);
     }
 
-    public void setRoomNumber_CommonTerms(String roomNumber) {
-        setRoomNumber_CommonTerms(roomNumber, null);
+    public void setGivenName_Term(String givenName) {
+        setGivenName_Term(givenName, null);
     }
 
-    public void setRoomNumber_CommonTerms(String roomNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("roomNumber", roomNumber);
+    public void setGivenName_Term(String givenName, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("givenName", givenName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_RoomNumber_Asc() {
-        regOBA("roomNumber");
-        return this;
+    public void setGivenName_NotEqual(String givenName) {
+        setGivenName_NotTerm(givenName, null);
     }
 
-    public BsUserCQ addOrderBy_RoomNumber_Desc() {
-        regOBD("roomNumber");
-        return this;
+    public void setGivenName_NotTerm(String givenName) {
+        setGivenName_NotTerm(givenName, null);
     }
 
-    public void setDescription_Equal(String description) {
-        setDescription_Term(description, null);
+    public void setGivenName_NotEqual(String givenName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setGivenName_NotTerm(givenName, opLambda);
     }
 
-    public void setDescription_Equal(String description, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setDescription_Term(description, opLambda);
+    public void setGivenName_NotTerm(String givenName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setGivenName_Term(givenName), opLambda);
     }
 
-    public void setDescription_Term(String description) {
-        setDescription_Term(description, null);
+    public void setGivenName_Terms(Collection<String> givenNameList) {
+        setGivenName_Terms(givenNameList, null);
     }
 
-    public void setDescription_Term(String description, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("description", description);
+    public void setGivenName_Terms(Collection<String> givenNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("givenName", givenNameList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_NotEqual(String description) {
-        setDescription_NotTerm(description, null);
+    public void setGivenName_InScope(Collection<String> givenNameList) {
+        setGivenName_Terms(givenNameList, null);
     }
 
-    public void setDescription_NotTerm(String description) {
-        setDescription_NotTerm(description, null);
+    public void setGivenName_InScope(Collection<String> givenNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setGivenName_Terms(givenNameList, opLambda);
     }
 
-    public void setDescription_NotEqual(String description, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setDescription_NotTerm(description, opLambda);
+    public void setGivenName_Match(String givenName) {
+        setGivenName_Match(givenName, null);
     }
 
-    public void setDescription_NotTerm(String description, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setDescription_Term(description), opLambda);
+    public void setGivenName_Match(String givenName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("givenName", givenName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setDescription_Terms(Collection<String> descriptionList) {
-        setDescription_Terms(descriptionList, null);
+    public void setGivenName_MatchPhrase(String givenName) {
+        setGivenName_MatchPhrase(givenName, null);
     }
 
-    public void setDescription_Terms(Collection<String> descriptionList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("description", descriptionList);
+    public void setGivenName_MatchPhrase(String givenName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("givenName", givenName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_InScope(Collection<String> descriptionList) {
-        setDescription_Terms(descriptionList, null);
+    public void setGivenName_MatchPhrasePrefix(String givenName) {
+        setGivenName_MatchPhrasePrefix(givenName, null);
     }
 
-    public void setDescription_InScope(Collection<String> descriptionList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setDescription_Terms(descriptionList, opLambda);
+    public void setGivenName_MatchPhrasePrefix(String givenName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("givenName", givenName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setDescription_Match(String description) {
-        setDescription_Match(description, null);
+    public void setGivenName_Fuzzy(String givenName) {
+        setGivenName_Fuzzy(givenName, null);
     }
 
-    public void setDescription_Match(String description, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("description", description);
+    public void setGivenName_Fuzzy(String givenName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("givenName", givenName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_MatchPhrase(String description) {
-        setDescription_MatchPhrase(description, null);
+    public void setGivenName_Prefix(String givenName) {
+        setGivenName_Prefix(givenName, null);
     }
 
-    public void setDescription_MatchPhrase(String description, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("description", description);
+    public void setGivenName_Prefix(String givenName, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("givenName", givenName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_MatchPhrasePrefix(String description) {
-        setDescription_MatchPhrasePrefix(description, null);
+    public void setGivenName_Wildcard(String givenName) {
+        setGivenName_Wildcard(givenName, null);
     }
 
-    public void setDescription_MatchPhrasePrefix(String description, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("description", description);
+    public void setGivenName_Wildcard(String givenName, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("givenName", givenName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_Fuzzy(String description) {
-        setDescription_Fuzzy(description, null);
+    public void setGivenName_Regexp(String givenName) {
+        setGivenName_Regexp(givenName, null);
     }
 
-    public void setDescription_Fuzzy(String description, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("description", description);
+    public void setGivenName_Regexp(String givenName, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("givenName", givenName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_Prefix(String description) {
-        setDescription_Prefix(description, null);
-    }
+    public void setGivenName_SpanTerm(String givenName) {
+        setGivenName_SpanTerm("givenName", null);
+    }
 
-    public void setDescription_Prefix(String description, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("description", description);
+    public void setGivenName_SpanTerm(String givenName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("givenName", givenName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_Wildcard(String description) {
-        setDescription_Wildcard(description, null);
+    public void setGivenName_GreaterThan(String givenName) {
+        setGivenName_GreaterThan(givenName, null);
     }
 
-    public void setDescription_Wildcard(String description, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("description", description);
+    public void setGivenName_GreaterThan(String givenName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = givenName;
+        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_Regexp(String description) {
-        setDescription_Regexp(description, null);
+    public void setGivenName_LessThan(String givenName) {
+        setGivenName_LessThan(givenName, null);
     }
 
-    public void setDescription_Regexp(String description, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("description", description);
+    public void setGivenName_LessThan(String givenName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = givenName;
+        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_SpanTerm(String description) {
-        setDescription_SpanTerm("description", null);
+    public void setGivenName_GreaterEqual(String givenName) {
+        setGivenName_GreaterEqual(givenName, null);
     }
 
-    public void setDescription_SpanTerm(String description, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("description", description);
+    public void setGivenName_GreaterEqual(String givenName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = givenName;
+        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_GreaterThan(String description) {
-        setDescription_GreaterThan(description, null);
+    public void setGivenName_LessEqual(String givenName) {
+        setGivenName_LessEqual(givenName, null);
     }
 
-    public void setDescription_GreaterThan(String description, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = description;
-        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_GREATER_THAN, _value);
+    public void setGivenName_LessEqual(String givenName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = givenName;
+        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_LessThan(String description) {
-        setDescription_LessThan(description, null);
+    public void setGivenName_Exists() {
+        setGivenName_Exists(null);
     }
 
-    public void setDescription_LessThan(String description, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = description;
-        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_LESS_THAN, _value);
+    public void setGivenName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("givenName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_GreaterEqual(String description) {
-        setDescription_GreaterEqual(description, null);
+    public void setGivenName_CommonTerms(String givenName) {
+        setGivenName_CommonTerms(givenName, null);
     }
 
-    public void setDescription_GreaterEqual(String description, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = description;
-        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setGivenName_CommonTerms(String givenName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("givenName", givenName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDescription_LessEqual(String description) {
-        setDescription_LessEqual(description, null);
+    public BsUserCQ addOrderBy_GivenName_Asc() {
+        regOBA("givenName");
+        return this;
     }
 
-    public void setDescription_LessEqual(String description, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = description;
-        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public BsUserCQ addOrderBy_GivenName_Desc() {
+        regOBD("givenName");
+        return this;
     }
 
-    public void setDescription_Exists() {
-        setDescription_Exists(null);
+    public void setGroups_Equal(String groups) {
+        setGroups_Term(groups, null);
     }
 
-    public void setDescription_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("description");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setGroups_Equal(String groups, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setGroups_Term(groups, opLambda);
     }
 
-    public void setDescription_CommonTerms(String description) {
-        setDescription_CommonTerms(description, null);
+    public void setGroups_Term(String groups) {
+        setGroups_Term(groups, null);
     }
 
-    public void setDescription_CommonTerms(String description, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("description", description);
+    public void setGroups_Term(String groups, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("groups", groups);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_Description_Asc() {
-        regOBA("description");
-        return this;
+    public void setGroups_NotEqual(String groups) {
+        setGroups_NotTerm(groups, null);
     }
 
-    public BsUserCQ addOrderBy_Description_Desc() {
-        regOBD("description");
-        return this;
+    public void setGroups_NotTerm(String groups) {
+        setGroups_NotTerm(groups, null);
     }
 
-    public void setTitle_Equal(String title) {
-        setTitle_Term(title, null);
+    public void setGroups_NotEqual(String groups, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setGroups_NotTerm(groups, opLambda);
     }
 
-    public void setTitle_Equal(String title, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setTitle_Term(title, opLambda);
+    public void setGroups_NotTerm(String groups, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setGroups_Term(groups), opLambda);
     }
 
-    public void setTitle_Term(String title) {
-        setTitle_Term(title, null);
+    public void setGroups_Terms(Collection<String> groupsList) {
+        setGroups_Terms(groupsList, null);
     }
 
-    public void setTitle_Term(String title, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("title", title);
+    public void setGroups_Terms(Collection<String> groupsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("groups", groupsList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_NotEqual(String title) {
-        setTitle_NotTerm(title, null);
+    public void setGroups_InScope(Collection<String> groupsList) {
+        setGroups_Terms(groupsList, null);
     }
 
-    public void setTitle_NotTerm(String title) {
-        setTitle_NotTerm(title, null);
+    public void setGroups_InScope(Collection<String> groupsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setGroups_Terms(groupsList, opLambda);
     }
 
-    public void setTitle_NotEqual(String title, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setTitle_NotTerm(title, opLambda);
+    public void setGroups_Match(String groups) {
+        setGroups_Match(groups, null);
     }
 
-    public void setTitle_NotTerm(String title, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setTitle_Term(title), opLambda);
+    public void setGroups_Match(String groups, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("groups", groups);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setTitle_Terms(Collection<String> titleList) {
-        setTitle_Terms(titleList, null);
+    public void setGroups_MatchPhrase(String groups) {
+        setGroups_MatchPhrase(groups, null);
     }
 
-    public void setTitle_Terms(Collection<String> titleList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("title", titleList);
+    public void setGroups_MatchPhrase(String groups, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("groups", groups);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_InScope(Collection<String> titleList) {
-        setTitle_Terms(titleList, null);
+    public void setGroups_MatchPhrasePrefix(String groups) {
+        setGroups_MatchPhrasePrefix(groups, null);
     }
 
-    public void setTitle_InScope(Collection<String> titleList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setTitle_Terms(titleList, opLambda);
+    public void setGroups_MatchPhrasePrefix(String groups, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("groups", groups);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setTitle_Match(String title) {
-        setTitle_Match(title, null);
+    public void setGroups_Fuzzy(String groups) {
+        setGroups_Fuzzy(groups, null);
     }
 
-    public void setTitle_Match(String title, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("title", title);
+    public void setGroups_Fuzzy(String groups, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("groups", groups);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_MatchPhrase(String title) {
-        setTitle_MatchPhrase(title, null);
+    public void setGroups_Prefix(String groups) {
+        setGroups_Prefix(groups, null);
     }
 
-    public void setTitle_MatchPhrase(String title, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("title", title);
+    public void setGroups_Prefix(String groups, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("groups", groups);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_MatchPhrasePrefix(String title) {
-        setTitle_MatchPhrasePrefix(title, null);
+    public void setGroups_Wildcard(String groups) {
+        setGroups_Wildcard(groups, null);
     }
 
-    public void setTitle_MatchPhrasePrefix(String title, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("title", title);
+    public void setGroups_Wildcard(String groups, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("groups", groups);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_Fuzzy(String title) {
-        setTitle_Fuzzy(title, null);
+    public void setGroups_Regexp(String groups) {
+        setGroups_Regexp(groups, null);
     }
 
-    public void setTitle_Fuzzy(String title, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("title", title);
+    public void setGroups_Regexp(String groups, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("groups", groups);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_Prefix(String title) {
-        setTitle_Prefix(title, null);
+    public void setGroups_SpanTerm(String groups) {
+        setGroups_SpanTerm("groups", null);
     }
 
-    public void setTitle_Prefix(String title, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("title", title);
+    public void setGroups_SpanTerm(String groups, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("groups", groups);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_Wildcard(String title) {
-        setTitle_Wildcard(title, null);
+    public void setGroups_GreaterThan(String groups) {
+        setGroups_GreaterThan(groups, null);
     }
 
-    public void setTitle_Wildcard(String title, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("title", title);
+    public void setGroups_GreaterThan(String groups, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = groups;
+        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_Regexp(String title) {
-        setTitle_Regexp(title, null);
+    public void setGroups_LessThan(String groups) {
+        setGroups_LessThan(groups, null);
     }
 
-    public void setTitle_Regexp(String title, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("title", title);
+    public void setGroups_LessThan(String groups, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = groups;
+        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_SpanTerm(String title) {
-        setTitle_SpanTerm("title", null);
+    public void setGroups_GreaterEqual(String groups) {
+        setGroups_GreaterEqual(groups, null);
     }
 
-    public void setTitle_SpanTerm(String title, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("title", title);
+    public void setGroups_GreaterEqual(String groups, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = groups;
+        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_GreaterThan(String title) {
-        setTitle_GreaterThan(title, null);
+    public void setGroups_LessEqual(String groups) {
+        setGroups_LessEqual(groups, null);
     }
 
-    public void setTitle_GreaterThan(String title, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = title;
-        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_GREATER_THAN, _value);
+    public void setGroups_LessEqual(String groups, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = groups;
+        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_LessThan(String title) {
-        setTitle_LessThan(title, null);
+    public void setGroups_Exists() {
+        setGroups_Exists(null);
     }
 
-    public void setTitle_LessThan(String title, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = title;
-        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_LESS_THAN, _value);
+    public void setGroups_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("groups");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_GreaterEqual(String title) {
-        setTitle_GreaterEqual(title, null);
+    public void setGroups_CommonTerms(String groups) {
+        setGroups_CommonTerms(groups, null);
     }
 
-    public void setTitle_GreaterEqual(String title, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = title;
-        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setGroups_CommonTerms(String groups, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("groups", groups);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTitle_LessEqual(String title) {
-        setTitle_LessEqual(title, null);
-    }
-
-    public void setTitle_LessEqual(String title, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = title;
-        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTitle_Exists() {
-        setTitle_Exists(null);
-    }
-
-    public void setTitle_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("title");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTitle_CommonTerms(String title) {
-        setTitle_CommonTerms(title, null);
-    }
-
-    public void setTitle_CommonTerms(String title, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("title", title);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsUserCQ addOrderBy_Title_Asc() {
-        regOBA("title");
+    public BsUserCQ addOrderBy_Groups_Asc() {
+        regOBA("groups");
         return this;
     }
 
-    public BsUserCQ addOrderBy_Title_Desc() {
-        regOBD("title");
+    public BsUserCQ addOrderBy_Groups_Desc() {
+        regOBD("groups");
         return this;
     }
 
-    public void setPager_Equal(String pager) {
-        setPager_Term(pager, null);
+    public void setHomeDirectory_Equal(String homeDirectory) {
+        setHomeDirectory_Term(homeDirectory, null);
     }
 
-    public void setPager_Equal(String pager, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setPager_Term(pager, opLambda);
+    public void setHomeDirectory_Equal(String homeDirectory, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setHomeDirectory_Term(homeDirectory, opLambda);
     }
 
-    public void setPager_Term(String pager) {
-        setPager_Term(pager, null);
+    public void setHomeDirectory_Term(String homeDirectory) {
+        setHomeDirectory_Term(homeDirectory, null);
     }
 
-    public void setPager_Term(String pager, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("pager", pager);
+    public void setHomeDirectory_Term(String homeDirectory, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("homeDirectory", homeDirectory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_NotEqual(String pager) {
-        setPager_NotTerm(pager, null);
+    public void setHomeDirectory_NotEqual(String homeDirectory) {
+        setHomeDirectory_NotTerm(homeDirectory, null);
     }
 
-    public void setPager_NotTerm(String pager) {
-        setPager_NotTerm(pager, null);
+    public void setHomeDirectory_NotTerm(String homeDirectory) {
+        setHomeDirectory_NotTerm(homeDirectory, null);
     }
 
-    public void setPager_NotEqual(String pager, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setPager_NotTerm(pager, opLambda);
+    public void setHomeDirectory_NotEqual(String homeDirectory, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setHomeDirectory_NotTerm(homeDirectory, opLambda);
     }
 
-    public void setPager_NotTerm(String pager, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setPager_Term(pager), opLambda);
+    public void setHomeDirectory_NotTerm(String homeDirectory, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setHomeDirectory_Term(homeDirectory), opLambda);
     }
 
-    public void setPager_Terms(Collection<String> pagerList) {
-        setPager_Terms(pagerList, null);
+    public void setHomeDirectory_Terms(Collection<String> homeDirectoryList) {
+        setHomeDirectory_Terms(homeDirectoryList, null);
     }
 
-    public void setPager_Terms(Collection<String> pagerList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("pager", pagerList);
+    public void setHomeDirectory_Terms(Collection<String> homeDirectoryList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("homeDirectory", homeDirectoryList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_InScope(Collection<String> pagerList) {
-        setPager_Terms(pagerList, null);
+    public void setHomeDirectory_InScope(Collection<String> homeDirectoryList) {
+        setHomeDirectory_Terms(homeDirectoryList, null);
     }
 
-    public void setPager_InScope(Collection<String> pagerList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setPager_Terms(pagerList, opLambda);
+    public void setHomeDirectory_InScope(Collection<String> homeDirectoryList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setHomeDirectory_Terms(homeDirectoryList, opLambda);
     }
 
-    public void setPager_Match(String pager) {
-        setPager_Match(pager, null);
+    public void setHomeDirectory_Match(String homeDirectory) {
+        setHomeDirectory_Match(homeDirectory, null);
     }
 
-    public void setPager_Match(String pager, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("pager", pager);
+    public void setHomeDirectory_Match(String homeDirectory, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("homeDirectory", homeDirectory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_MatchPhrase(String pager) {
-        setPager_MatchPhrase(pager, null);
+    public void setHomeDirectory_MatchPhrase(String homeDirectory) {
+        setHomeDirectory_MatchPhrase(homeDirectory, null);
     }
 
-    public void setPager_MatchPhrase(String pager, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("pager", pager);
+    public void setHomeDirectory_MatchPhrase(String homeDirectory, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("homeDirectory", homeDirectory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_MatchPhrasePrefix(String pager) {
-        setPager_MatchPhrasePrefix(pager, null);
+    public void setHomeDirectory_MatchPhrasePrefix(String homeDirectory) {
+        setHomeDirectory_MatchPhrasePrefix(homeDirectory, null);
     }
 
-    public void setPager_MatchPhrasePrefix(String pager, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("pager", pager);
+    public void setHomeDirectory_MatchPhrasePrefix(String homeDirectory, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("homeDirectory", homeDirectory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_Fuzzy(String pager) {
-        setPager_Fuzzy(pager, null);
+    public void setHomeDirectory_Fuzzy(String homeDirectory) {
+        setHomeDirectory_Fuzzy(homeDirectory, null);
     }
 
-    public void setPager_Fuzzy(String pager, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("pager", pager);
+    public void setHomeDirectory_Fuzzy(String homeDirectory, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("homeDirectory", homeDirectory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_Prefix(String pager) {
-        setPager_Prefix(pager, null);
+    public void setHomeDirectory_Prefix(String homeDirectory) {
+        setHomeDirectory_Prefix(homeDirectory, null);
     }
 
-    public void setPager_Prefix(String pager, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("pager", pager);
+    public void setHomeDirectory_Prefix(String homeDirectory, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("homeDirectory", homeDirectory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_Wildcard(String pager) {
-        setPager_Wildcard(pager, null);
+    public void setHomeDirectory_Wildcard(String homeDirectory) {
+        setHomeDirectory_Wildcard(homeDirectory, null);
     }
 
-    public void setPager_Wildcard(String pager, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("pager", pager);
+    public void setHomeDirectory_Wildcard(String homeDirectory, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("homeDirectory", homeDirectory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_Regexp(String pager) {
-        setPager_Regexp(pager, null);
+    public void setHomeDirectory_Regexp(String homeDirectory) {
+        setHomeDirectory_Regexp(homeDirectory, null);
     }
 
-    public void setPager_Regexp(String pager, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("pager", pager);
+    public void setHomeDirectory_Regexp(String homeDirectory, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("homeDirectory", homeDirectory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_SpanTerm(String pager) {
-        setPager_SpanTerm("pager", null);
+    public void setHomeDirectory_SpanTerm(String homeDirectory) {
+        setHomeDirectory_SpanTerm("homeDirectory", null);
     }
 
-    public void setPager_SpanTerm(String pager, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("pager", pager);
+    public void setHomeDirectory_SpanTerm(String homeDirectory, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("homeDirectory", homeDirectory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_GreaterThan(String pager) {
-        setPager_GreaterThan(pager, null);
+    public void setHomeDirectory_GreaterThan(String homeDirectory) {
+        setHomeDirectory_GreaterThan(homeDirectory, null);
     }
 
-    public void setPager_GreaterThan(String pager, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = pager;
-        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_GREATER_THAN, _value);
+    public void setHomeDirectory_GreaterThan(String homeDirectory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = homeDirectory;
+        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_LessThan(String pager) {
-        setPager_LessThan(pager, null);
+    public void setHomeDirectory_LessThan(String homeDirectory) {
+        setHomeDirectory_LessThan(homeDirectory, null);
     }
 
-    public void setPager_LessThan(String pager, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = pager;
-        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_LESS_THAN, _value);
+    public void setHomeDirectory_LessThan(String homeDirectory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = homeDirectory;
+        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_GreaterEqual(String pager) {
-        setPager_GreaterEqual(pager, null);
+    public void setHomeDirectory_GreaterEqual(String homeDirectory) {
+        setHomeDirectory_GreaterEqual(homeDirectory, null);
     }
 
-    public void setPager_GreaterEqual(String pager, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = pager;
-        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setHomeDirectory_GreaterEqual(String homeDirectory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = homeDirectory;
+        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_LessEqual(String pager) {
-        setPager_LessEqual(pager, null);
+    public void setHomeDirectory_LessEqual(String homeDirectory) {
+        setHomeDirectory_LessEqual(homeDirectory, null);
     }
 
-    public void setPager_LessEqual(String pager, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = pager;
-        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setHomeDirectory_LessEqual(String homeDirectory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = homeDirectory;
+        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_Exists() {
-        setPager_Exists(null);
+    public void setHomeDirectory_Exists() {
+        setHomeDirectory_Exists(null);
     }
 
-    public void setPager_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("pager");
+    public void setHomeDirectory_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("homeDirectory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPager_CommonTerms(String pager) {
-        setPager_CommonTerms(pager, null);
+    public void setHomeDirectory_CommonTerms(String homeDirectory) {
+        setHomeDirectory_CommonTerms(homeDirectory, null);
     }
 
-    public void setPager_CommonTerms(String pager, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("pager", pager);
+    public void setHomeDirectory_CommonTerms(String homeDirectory, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("homeDirectory", homeDirectory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_Pager_Asc() {
-        regOBA("pager");
+    public BsUserCQ addOrderBy_HomeDirectory_Asc() {
+        regOBA("homeDirectory");
         return this;
     }
 
-    public BsUserCQ addOrderBy_Pager_Desc() {
-        regOBD("pager");
+    public BsUserCQ addOrderBy_HomeDirectory_Desc() {
+        regOBD("homeDirectory");
         return this;
     }
 
-    public void setStreet_Equal(String street) {
-        setStreet_Term(street, null);
+    public void setHomePhone_Equal(String homePhone) {
+        setHomePhone_Term(homePhone, null);
     }
 
-    public void setStreet_Equal(String street, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setStreet_Term(street, opLambda);
+    public void setHomePhone_Equal(String homePhone, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setHomePhone_Term(homePhone, opLambda);
     }
 
-    public void setStreet_Term(String street) {
-        setStreet_Term(street, null);
+    public void setHomePhone_Term(String homePhone) {
+        setHomePhone_Term(homePhone, null);
     }
 
-    public void setStreet_Term(String street, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("street", street);
+    public void setHomePhone_Term(String homePhone, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("homePhone", homePhone);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_NotEqual(String street) {
-        setStreet_NotTerm(street, null);
+    public void setHomePhone_NotEqual(String homePhone) {
+        setHomePhone_NotTerm(homePhone, null);
     }
 
-    public void setStreet_NotTerm(String street) {
-        setStreet_NotTerm(street, null);
+    public void setHomePhone_NotTerm(String homePhone) {
+        setHomePhone_NotTerm(homePhone, null);
     }
 
-    public void setStreet_NotEqual(String street, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setStreet_NotTerm(street, opLambda);
+    public void setHomePhone_NotEqual(String homePhone, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setHomePhone_NotTerm(homePhone, opLambda);
     }
 
-    public void setStreet_NotTerm(String street, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setStreet_Term(street), opLambda);
+    public void setHomePhone_NotTerm(String homePhone, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setHomePhone_Term(homePhone), opLambda);
     }
 
-    public void setStreet_Terms(Collection<String> streetList) {
-        setStreet_Terms(streetList, null);
+    public void setHomePhone_Terms(Collection<String> homePhoneList) {
+        setHomePhone_Terms(homePhoneList, null);
     }
 
-    public void setStreet_Terms(Collection<String> streetList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("street", streetList);
+    public void setHomePhone_Terms(Collection<String> homePhoneList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("homePhone", homePhoneList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_InScope(Collection<String> streetList) {
-        setStreet_Terms(streetList, null);
+    public void setHomePhone_InScope(Collection<String> homePhoneList) {
+        setHomePhone_Terms(homePhoneList, null);
     }
 
-    public void setStreet_InScope(Collection<String> streetList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setStreet_Terms(streetList, opLambda);
+    public void setHomePhone_InScope(Collection<String> homePhoneList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setHomePhone_Terms(homePhoneList, opLambda);
     }
 
-    public void setStreet_Match(String street) {
-        setStreet_Match(street, null);
+    public void setHomePhone_Match(String homePhone) {
+        setHomePhone_Match(homePhone, null);
     }
 
-    public void setStreet_Match(String street, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("street", street);
+    public void setHomePhone_Match(String homePhone, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("homePhone", homePhone);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_MatchPhrase(String street) {
-        setStreet_MatchPhrase(street, null);
+    public void setHomePhone_MatchPhrase(String homePhone) {
+        setHomePhone_MatchPhrase(homePhone, null);
     }
 
-    public void setStreet_MatchPhrase(String street, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("street", street);
+    public void setHomePhone_MatchPhrase(String homePhone, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("homePhone", homePhone);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_MatchPhrasePrefix(String street) {
-        setStreet_MatchPhrasePrefix(street, null);
+    public void setHomePhone_MatchPhrasePrefix(String homePhone) {
+        setHomePhone_MatchPhrasePrefix(homePhone, null);
     }
 
-    public void setStreet_MatchPhrasePrefix(String street, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("street", street);
+    public void setHomePhone_MatchPhrasePrefix(String homePhone, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("homePhone", homePhone);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_Fuzzy(String street) {
-        setStreet_Fuzzy(street, null);
+    public void setHomePhone_Fuzzy(String homePhone) {
+        setHomePhone_Fuzzy(homePhone, null);
     }
 
-    public void setStreet_Fuzzy(String street, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("street", street);
+    public void setHomePhone_Fuzzy(String homePhone, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("homePhone", homePhone);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_Prefix(String street) {
-        setStreet_Prefix(street, null);
+    public void setHomePhone_Prefix(String homePhone) {
+        setHomePhone_Prefix(homePhone, null);
     }
 
-    public void setStreet_Prefix(String street, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("street", street);
+    public void setHomePhone_Prefix(String homePhone, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("homePhone", homePhone);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_Wildcard(String street) {
-        setStreet_Wildcard(street, null);
+    public void setHomePhone_Wildcard(String homePhone) {
+        setHomePhone_Wildcard(homePhone, null);
     }
 
-    public void setStreet_Wildcard(String street, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("street", street);
+    public void setHomePhone_Wildcard(String homePhone, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("homePhone", homePhone);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_Regexp(String street) {
-        setStreet_Regexp(street, null);
+    public void setHomePhone_Regexp(String homePhone) {
+        setHomePhone_Regexp(homePhone, null);
     }
 
-    public void setStreet_Regexp(String street, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("street", street);
+    public void setHomePhone_Regexp(String homePhone, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("homePhone", homePhone);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_SpanTerm(String street) {
-        setStreet_SpanTerm("street", null);
+    public void setHomePhone_SpanTerm(String homePhone) {
+        setHomePhone_SpanTerm("homePhone", null);
     }
 
-    public void setStreet_SpanTerm(String street, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("street", street);
+    public void setHomePhone_SpanTerm(String homePhone, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("homePhone", homePhone);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_GreaterThan(String street) {
-        setStreet_GreaterThan(street, null);
+    public void setHomePhone_GreaterThan(String homePhone) {
+        setHomePhone_GreaterThan(homePhone, null);
     }
 
-    public void setStreet_GreaterThan(String street, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = street;
-        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_GREATER_THAN, _value);
+    public void setHomePhone_GreaterThan(String homePhone, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = homePhone;
+        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_LessThan(String street) {
-        setStreet_LessThan(street, null);
+    public void setHomePhone_LessThan(String homePhone) {
+        setHomePhone_LessThan(homePhone, null);
     }
 
-    public void setStreet_LessThan(String street, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = street;
-        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_LESS_THAN, _value);
+    public void setHomePhone_LessThan(String homePhone, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = homePhone;
+        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_GreaterEqual(String street) {
-        setStreet_GreaterEqual(street, null);
+    public void setHomePhone_GreaterEqual(String homePhone) {
+        setHomePhone_GreaterEqual(homePhone, null);
     }
 
-    public void setStreet_GreaterEqual(String street, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = street;
-        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setHomePhone_GreaterEqual(String homePhone, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = homePhone;
+        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_LessEqual(String street) {
-        setStreet_LessEqual(street, null);
+    public void setHomePhone_LessEqual(String homePhone) {
+        setHomePhone_LessEqual(homePhone, null);
     }
 
-    public void setStreet_LessEqual(String street, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = street;
-        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setHomePhone_LessEqual(String homePhone, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = homePhone;
+        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_Exists() {
-        setStreet_Exists(null);
+    public void setHomePhone_Exists() {
+        setHomePhone_Exists(null);
     }
 
-    public void setStreet_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("street");
+    public void setHomePhone_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("homePhone");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setStreet_CommonTerms(String street) {
-        setStreet_CommonTerms(street, null);
+    public void setHomePhone_CommonTerms(String homePhone) {
+        setHomePhone_CommonTerms(homePhone, null);
     }
 
-    public void setStreet_CommonTerms(String street, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("street", street);
+    public void setHomePhone_CommonTerms(String homePhone, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("homePhone", homePhone);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_Street_Asc() {
-        regOBA("street");
+    public BsUserCQ addOrderBy_HomePhone_Asc() {
+        regOBA("homePhone");
         return this;
     }
 
-    public BsUserCQ addOrderBy_Street_Desc() {
-        regOBD("street");
+    public BsUserCQ addOrderBy_HomePhone_Desc() {
+        regOBD("homePhone");
         return this;
     }
 
-    public void setPostalCode_Equal(String postalCode) {
-        setPostalCode_Term(postalCode, null);
+    public void setHomePostalAddress_Equal(String homePostalAddress) {
+        setHomePostalAddress_Term(homePostalAddress, null);
     }
 
-    public void setPostalCode_Equal(String postalCode, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setPostalCode_Term(postalCode, opLambda);
+    public void setHomePostalAddress_Equal(String homePostalAddress, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setHomePostalAddress_Term(homePostalAddress, opLambda);
     }
 
-    public void setPostalCode_Term(String postalCode) {
-        setPostalCode_Term(postalCode, null);
+    public void setHomePostalAddress_Term(String homePostalAddress) {
+        setHomePostalAddress_Term(homePostalAddress, null);
     }
 
-    public void setPostalCode_Term(String postalCode, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("postalCode", postalCode);
+    public void setHomePostalAddress_Term(String homePostalAddress, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("homePostalAddress", homePostalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_NotEqual(String postalCode) {
-        setPostalCode_NotTerm(postalCode, null);
+    public void setHomePostalAddress_NotEqual(String homePostalAddress) {
+        setHomePostalAddress_NotTerm(homePostalAddress, null);
     }
 
-    public void setPostalCode_NotTerm(String postalCode) {
-        setPostalCode_NotTerm(postalCode, null);
+    public void setHomePostalAddress_NotTerm(String homePostalAddress) {
+        setHomePostalAddress_NotTerm(homePostalAddress, null);
     }
 
-    public void setPostalCode_NotEqual(String postalCode, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setPostalCode_NotTerm(postalCode, opLambda);
+    public void setHomePostalAddress_NotEqual(String homePostalAddress, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setHomePostalAddress_NotTerm(homePostalAddress, opLambda);
     }
 
-    public void setPostalCode_NotTerm(String postalCode, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setPostalCode_Term(postalCode), opLambda);
+    public void setHomePostalAddress_NotTerm(String homePostalAddress, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setHomePostalAddress_Term(homePostalAddress), opLambda);
     }
 
-    public void setPostalCode_Terms(Collection<String> postalCodeList) {
-        setPostalCode_Terms(postalCodeList, null);
+    public void setHomePostalAddress_Terms(Collection<String> homePostalAddressList) {
+        setHomePostalAddress_Terms(homePostalAddressList, null);
     }
 
-    public void setPostalCode_Terms(Collection<String> postalCodeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("postalCode", postalCodeList);
+    public void setHomePostalAddress_Terms(Collection<String> homePostalAddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("homePostalAddress", homePostalAddressList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_InScope(Collection<String> postalCodeList) {
-        setPostalCode_Terms(postalCodeList, null);
+    public void setHomePostalAddress_InScope(Collection<String> homePostalAddressList) {
+        setHomePostalAddress_Terms(homePostalAddressList, null);
     }
 
-    public void setPostalCode_InScope(Collection<String> postalCodeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setPostalCode_Terms(postalCodeList, opLambda);
+    public void setHomePostalAddress_InScope(Collection<String> homePostalAddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setHomePostalAddress_Terms(homePostalAddressList, opLambda);
     }
 
-    public void setPostalCode_Match(String postalCode) {
-        setPostalCode_Match(postalCode, null);
+    public void setHomePostalAddress_Match(String homePostalAddress) {
+        setHomePostalAddress_Match(homePostalAddress, null);
     }
 
-    public void setPostalCode_Match(String postalCode, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("postalCode", postalCode);
+    public void setHomePostalAddress_Match(String homePostalAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("homePostalAddress", homePostalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_MatchPhrase(String postalCode) {
-        setPostalCode_MatchPhrase(postalCode, null);
+    public void setHomePostalAddress_MatchPhrase(String homePostalAddress) {
+        setHomePostalAddress_MatchPhrase(homePostalAddress, null);
     }
 
-    public void setPostalCode_MatchPhrase(String postalCode, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("postalCode", postalCode);
+    public void setHomePostalAddress_MatchPhrase(String homePostalAddress, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("homePostalAddress", homePostalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_MatchPhrasePrefix(String postalCode) {
-        setPostalCode_MatchPhrasePrefix(postalCode, null);
+    public void setHomePostalAddress_MatchPhrasePrefix(String homePostalAddress) {
+        setHomePostalAddress_MatchPhrasePrefix(homePostalAddress, null);
     }
 
-    public void setPostalCode_MatchPhrasePrefix(String postalCode, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("postalCode", postalCode);
+    public void setHomePostalAddress_MatchPhrasePrefix(String homePostalAddress, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("homePostalAddress", homePostalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_Fuzzy(String postalCode) {
-        setPostalCode_Fuzzy(postalCode, null);
+    public void setHomePostalAddress_Fuzzy(String homePostalAddress) {
+        setHomePostalAddress_Fuzzy(homePostalAddress, null);
     }
 
-    public void setPostalCode_Fuzzy(String postalCode, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("postalCode", postalCode);
+    public void setHomePostalAddress_Fuzzy(String homePostalAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("homePostalAddress", homePostalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_Prefix(String postalCode) {
-        setPostalCode_Prefix(postalCode, null);
+    public void setHomePostalAddress_Prefix(String homePostalAddress) {
+        setHomePostalAddress_Prefix(homePostalAddress, null);
     }
 
-    public void setPostalCode_Prefix(String postalCode, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("postalCode", postalCode);
+    public void setHomePostalAddress_Prefix(String homePostalAddress, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("homePostalAddress", homePostalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_Wildcard(String postalCode) {
-        setPostalCode_Wildcard(postalCode, null);
+    public void setHomePostalAddress_Wildcard(String homePostalAddress) {
+        setHomePostalAddress_Wildcard(homePostalAddress, null);
     }
 
-    public void setPostalCode_Wildcard(String postalCode, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("postalCode", postalCode);
+    public void setHomePostalAddress_Wildcard(String homePostalAddress, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("homePostalAddress", homePostalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_Regexp(String postalCode) {
-        setPostalCode_Regexp(postalCode, null);
+    public void setHomePostalAddress_Regexp(String homePostalAddress) {
+        setHomePostalAddress_Regexp(homePostalAddress, null);
     }
 
-    public void setPostalCode_Regexp(String postalCode, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("postalCode", postalCode);
+    public void setHomePostalAddress_Regexp(String homePostalAddress, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("homePostalAddress", homePostalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_SpanTerm(String postalCode) {
-        setPostalCode_SpanTerm("postalCode", null);
+    public void setHomePostalAddress_SpanTerm(String homePostalAddress) {
+        setHomePostalAddress_SpanTerm("homePostalAddress", null);
     }
 
-    public void setPostalCode_SpanTerm(String postalCode, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("postalCode", postalCode);
+    public void setHomePostalAddress_SpanTerm(String homePostalAddress, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("homePostalAddress", homePostalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_GreaterThan(String postalCode) {
-        setPostalCode_GreaterThan(postalCode, null);
+    public void setHomePostalAddress_GreaterThan(String homePostalAddress) {
+        setHomePostalAddress_GreaterThan(homePostalAddress, null);
     }
 
-    public void setPostalCode_GreaterThan(String postalCode, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = postalCode;
-        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_GREATER_THAN, _value);
-        if (opLambda != null) {
+    public void setHomePostalAddress_GreaterThan(String homePostalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = homePostalAddress;
+        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_LessThan(String postalCode) {
-        setPostalCode_LessThan(postalCode, null);
+    public void setHomePostalAddress_LessThan(String homePostalAddress) {
+        setHomePostalAddress_LessThan(homePostalAddress, null);
     }
 
-    public void setPostalCode_LessThan(String postalCode, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = postalCode;
-        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_LESS_THAN, _value);
+    public void setHomePostalAddress_LessThan(String homePostalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = homePostalAddress;
+        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_GreaterEqual(String postalCode) {
-        setPostalCode_GreaterEqual(postalCode, null);
+    public void setHomePostalAddress_GreaterEqual(String homePostalAddress) {
+        setHomePostalAddress_GreaterEqual(homePostalAddress, null);
     }
 
-    public void setPostalCode_GreaterEqual(String postalCode, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = postalCode;
-        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setHomePostalAddress_GreaterEqual(String homePostalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = homePostalAddress;
+        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_LessEqual(String postalCode) {
-        setPostalCode_LessEqual(postalCode, null);
+    public void setHomePostalAddress_LessEqual(String homePostalAddress) {
+        setHomePostalAddress_LessEqual(homePostalAddress, null);
     }
 
-    public void setPostalCode_LessEqual(String postalCode, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = postalCode;
-        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setHomePostalAddress_LessEqual(String homePostalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = homePostalAddress;
+        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_Exists() {
-        setPostalCode_Exists(null);
+    public void setHomePostalAddress_Exists() {
+        setHomePostalAddress_Exists(null);
     }
 
-    public void setPostalCode_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("postalCode");
+    public void setHomePostalAddress_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("homePostalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalCode_CommonTerms(String postalCode) {
-        setPostalCode_CommonTerms(postalCode, null);
+    public void setHomePostalAddress_CommonTerms(String homePostalAddress) {
+        setHomePostalAddress_CommonTerms(homePostalAddress, null);
     }
 
-    public void setPostalCode_CommonTerms(String postalCode, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("postalCode", postalCode);
+    public void setHomePostalAddress_CommonTerms(String homePostalAddress, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("homePostalAddress", homePostalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_PostalCode_Asc() {
-        regOBA("postalCode");
+    public BsUserCQ addOrderBy_HomePostalAddress_Asc() {
+        regOBA("homePostalAddress");
         return this;
     }
 
-    public BsUserCQ addOrderBy_PostalCode_Desc() {
-        regOBD("postalCode");
+    public BsUserCQ addOrderBy_HomePostalAddress_Desc() {
+        regOBD("homePostalAddress");
         return this;
     }
 
-    public void setPhysicalDeliveryOfficeName_Equal(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_Term(physicalDeliveryOfficeName, null);
+    public void setInitials_Equal(String initials) {
+        setInitials_Term(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Equal(String physicalDeliveryOfficeName, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setPhysicalDeliveryOfficeName_Term(physicalDeliveryOfficeName, opLambda);
+    public void setInitials_Equal(String initials, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setInitials_Term(initials, opLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_Term(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_Term(physicalDeliveryOfficeName, null);
+    public void setInitials_Term(String initials) {
+        setInitials_Term(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Term(String physicalDeliveryOfficeName, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
+    public void setInitials_Term(String initials, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("initials", initials);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_NotEqual(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_NotTerm(physicalDeliveryOfficeName, null);
+    public void setInitials_NotEqual(String initials) {
+        setInitials_NotTerm(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_NotTerm(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_NotTerm(physicalDeliveryOfficeName, null);
+    public void setInitials_NotTerm(String initials) {
+        setInitials_NotTerm(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_NotEqual(String physicalDeliveryOfficeName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setPhysicalDeliveryOfficeName_NotTerm(physicalDeliveryOfficeName, opLambda);
+    public void setInitials_NotEqual(String initials, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setInitials_NotTerm(initials, opLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_NotTerm(String physicalDeliveryOfficeName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setPhysicalDeliveryOfficeName_Term(physicalDeliveryOfficeName), opLambda);
+    public void setInitials_NotTerm(String initials, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setInitials_Term(initials), opLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_Terms(Collection<String> physicalDeliveryOfficeNameList) {
-        setPhysicalDeliveryOfficeName_Terms(physicalDeliveryOfficeNameList, null);
+    public void setInitials_Terms(Collection<String> initialsList) {
+        setInitials_Terms(initialsList, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Terms(Collection<String> physicalDeliveryOfficeNameList,
-            ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("physicalDeliveryOfficeName", physicalDeliveryOfficeNameList);
+    public void setInitials_Terms(Collection<String> initialsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("initials", initialsList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_InScope(Collection<String> physicalDeliveryOfficeNameList) {
-        setPhysicalDeliveryOfficeName_Terms(physicalDeliveryOfficeNameList, null);
+    public void setInitials_InScope(Collection<String> initialsList) {
+        setInitials_Terms(initialsList, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_InScope(Collection<String> physicalDeliveryOfficeNameList,
-            ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setPhysicalDeliveryOfficeName_Terms(physicalDeliveryOfficeNameList, opLambda);
+    public void setInitials_InScope(Collection<String> initialsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setInitials_Terms(initialsList, opLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_Match(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_Match(physicalDeliveryOfficeName, null);
+    public void setInitials_Match(String initials) {
+        setInitials_Match(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Match(String physicalDeliveryOfficeName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
+    public void setInitials_Match(String initials, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("initials", initials);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_MatchPhrase(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_MatchPhrase(physicalDeliveryOfficeName, null);
+    public void setInitials_MatchPhrase(String initials) {
+        setInitials_MatchPhrase(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_MatchPhrase(String physicalDeliveryOfficeName,
-            ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
+    public void setInitials_MatchPhrase(String initials, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("initials", initials);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_MatchPhrasePrefix(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_MatchPhrasePrefix(physicalDeliveryOfficeName, null);
+    public void setInitials_MatchPhrasePrefix(String initials) {
+        setInitials_MatchPhrasePrefix(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_MatchPhrasePrefix(String physicalDeliveryOfficeName,
-            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
+    public void setInitials_MatchPhrasePrefix(String initials, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("initials", initials);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_Fuzzy(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_Fuzzy(physicalDeliveryOfficeName, null);
+    public void setInitials_Fuzzy(String initials) {
+        setInitials_Fuzzy(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Fuzzy(String physicalDeliveryOfficeName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
+    public void setInitials_Fuzzy(String initials, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("initials", initials);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_Prefix(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_Prefix(physicalDeliveryOfficeName, null);
+    public void setInitials_Prefix(String initials) {
+        setInitials_Prefix(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Prefix(String physicalDeliveryOfficeName, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
+    public void setInitials_Prefix(String initials, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("initials", initials);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_Wildcard(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_Wildcard(physicalDeliveryOfficeName, null);
+    public void setInitials_Wildcard(String initials) {
+        setInitials_Wildcard(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Wildcard(String physicalDeliveryOfficeName, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
+    public void setInitials_Wildcard(String initials, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("initials", initials);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_Regexp(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_Regexp(physicalDeliveryOfficeName, null);
+    public void setInitials_Regexp(String initials) {
+        setInitials_Regexp(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Regexp(String physicalDeliveryOfficeName, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
+    public void setInitials_Regexp(String initials, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("initials", initials);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_SpanTerm(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_SpanTerm("physicalDeliveryOfficeName", null);
+    public void setInitials_SpanTerm(String initials) {
+        setInitials_SpanTerm("initials", null);
     }
 
-    public void setPhysicalDeliveryOfficeName_SpanTerm(String physicalDeliveryOfficeName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
+    public void setInitials_SpanTerm(String initials, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("initials", initials);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_GreaterThan(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_GreaterThan(physicalDeliveryOfficeName, null);
+    public void setInitials_GreaterThan(String initials) {
+        setInitials_GreaterThan(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_GreaterThan(String physicalDeliveryOfficeName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = physicalDeliveryOfficeName;
-        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_GREATER_THAN, _value);
+    public void setInitials_GreaterThan(String initials, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = initials;
+        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_LessThan(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_LessThan(physicalDeliveryOfficeName, null);
+    public void setInitials_LessThan(String initials) {
+        setInitials_LessThan(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_LessThan(String physicalDeliveryOfficeName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = physicalDeliveryOfficeName;
-        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_LESS_THAN, _value);
+    public void setInitials_LessThan(String initials, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = initials;
+        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_GreaterEqual(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_GreaterEqual(physicalDeliveryOfficeName, null);
+    public void setInitials_GreaterEqual(String initials) {
+        setInitials_GreaterEqual(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_GreaterEqual(String physicalDeliveryOfficeName,
-            ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = physicalDeliveryOfficeName;
-        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setInitials_GreaterEqual(String initials, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = initials;
+        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_LessEqual(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_LessEqual(physicalDeliveryOfficeName, null);
+    public void setInitials_LessEqual(String initials) {
+        setInitials_LessEqual(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_LessEqual(String physicalDeliveryOfficeName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = physicalDeliveryOfficeName;
-        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setInitials_LessEqual(String initials, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = initials;
+        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_Exists() {
-        setPhysicalDeliveryOfficeName_Exists(null);
+    public void setInitials_Exists() {
+        setInitials_Exists(null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("physicalDeliveryOfficeName");
+    public void setInitials_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("initials");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPhysicalDeliveryOfficeName_CommonTerms(String physicalDeliveryOfficeName) {
-        setPhysicalDeliveryOfficeName_CommonTerms(physicalDeliveryOfficeName, null);
+    public void setInitials_CommonTerms(String initials) {
+        setInitials_CommonTerms(initials, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_CommonTerms(String physicalDeliveryOfficeName,
-            ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
+    public void setInitials_CommonTerms(String initials, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("initials", initials);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_PhysicalDeliveryOfficeName_Asc() {
-        regOBA("physicalDeliveryOfficeName");
+    public BsUserCQ addOrderBy_Initials_Asc() {
+        regOBA("initials");
         return this;
     }
 
-    public BsUserCQ addOrderBy_PhysicalDeliveryOfficeName_Desc() {
-        regOBD("physicalDeliveryOfficeName");
+    public BsUserCQ addOrderBy_Initials_Desc() {
+        regOBD("initials");
         return this;
     }
 
-    public void setDestinationIndicator_Equal(String destinationIndicator) {
-        setDestinationIndicator_Term(destinationIndicator, null);
+    public void setInternationaliSDNNumber_Equal(String internationaliSDNNumber) {
+        setInternationaliSDNNumber_Term(internationaliSDNNumber, null);
     }
 
-    public void setDestinationIndicator_Equal(String destinationIndicator, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setDestinationIndicator_Term(destinationIndicator, opLambda);
+    public void setInternationaliSDNNumber_Equal(String internationaliSDNNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setInternationaliSDNNumber_Term(internationaliSDNNumber, opLambda);
     }
 
-    public void setDestinationIndicator_Term(String destinationIndicator) {
-        setDestinationIndicator_Term(destinationIndicator, null);
+    public void setInternationaliSDNNumber_Term(String internationaliSDNNumber) {
+        setInternationaliSDNNumber_Term(internationaliSDNNumber, null);
     }
 
-    public void setDestinationIndicator_Term(String destinationIndicator, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("destinationIndicator", destinationIndicator);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDestinationIndicator_NotEqual(String destinationIndicator) {
-        setDestinationIndicator_NotTerm(destinationIndicator, null);
-    }
-
-    public void setDestinationIndicator_NotTerm(String destinationIndicator) {
-        setDestinationIndicator_NotTerm(destinationIndicator, null);
-    }
-
-    public void setDestinationIndicator_NotEqual(String destinationIndicator, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setDestinationIndicator_NotTerm(destinationIndicator, opLambda);
-    }
-
-    public void setDestinationIndicator_NotTerm(String destinationIndicator, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setDestinationIndicator_Term(destinationIndicator), opLambda);
-    }
-
-    public void setDestinationIndicator_Terms(Collection<String> destinationIndicatorList) {
-        setDestinationIndicator_Terms(destinationIndicatorList, null);
-    }
-
-    public void setDestinationIndicator_Terms(Collection<String> destinationIndicatorList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("destinationIndicator", destinationIndicatorList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDestinationIndicator_InScope(Collection<String> destinationIndicatorList) {
-        setDestinationIndicator_Terms(destinationIndicatorList, null);
-    }
-
-    public void setDestinationIndicator_InScope(Collection<String> destinationIndicatorList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setDestinationIndicator_Terms(destinationIndicatorList, opLambda);
-    }
-
-    public void setDestinationIndicator_Match(String destinationIndicator) {
-        setDestinationIndicator_Match(destinationIndicator, null);
-    }
-
-    public void setDestinationIndicator_Match(String destinationIndicator, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("destinationIndicator", destinationIndicator);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDestinationIndicator_MatchPhrase(String destinationIndicator) {
-        setDestinationIndicator_MatchPhrase(destinationIndicator, null);
-    }
-
-    public void setDestinationIndicator_MatchPhrase(String destinationIndicator, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("destinationIndicator", destinationIndicator);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDestinationIndicator_MatchPhrasePrefix(String destinationIndicator) {
-        setDestinationIndicator_MatchPhrasePrefix(destinationIndicator, null);
-    }
-
-    public void setDestinationIndicator_MatchPhrasePrefix(String destinationIndicator,
-            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("destinationIndicator", destinationIndicator);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDestinationIndicator_Fuzzy(String destinationIndicator) {
-        setDestinationIndicator_Fuzzy(destinationIndicator, null);
-    }
-
-    public void setDestinationIndicator_Fuzzy(String destinationIndicator, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("destinationIndicator", destinationIndicator);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDestinationIndicator_Prefix(String destinationIndicator) {
-        setDestinationIndicator_Prefix(destinationIndicator, null);
-    }
-
-    public void setDestinationIndicator_Prefix(String destinationIndicator, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("destinationIndicator", destinationIndicator);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDestinationIndicator_Wildcard(String destinationIndicator) {
-        setDestinationIndicator_Wildcard(destinationIndicator, null);
-    }
-
-    public void setDestinationIndicator_Wildcard(String destinationIndicator, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("destinationIndicator", destinationIndicator);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDestinationIndicator_Regexp(String destinationIndicator) {
-        setDestinationIndicator_Regexp(destinationIndicator, null);
-    }
-
-    public void setDestinationIndicator_Regexp(String destinationIndicator, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("destinationIndicator", destinationIndicator);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    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) {
-        final Object _value = destinationIndicator;
-        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_GREATER_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDestinationIndicator_LessThan(String destinationIndicator) {
-        setDestinationIndicator_LessThan(destinationIndicator, null);
-    }
-
-    public void setDestinationIndicator_LessThan(String destinationIndicator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = destinationIndicator;
-        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_LESS_THAN, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDestinationIndicator_GreaterEqual(String destinationIndicator) {
-        setDestinationIndicator_GreaterEqual(destinationIndicator, null);
-    }
-
-    public void setDestinationIndicator_GreaterEqual(String destinationIndicator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = destinationIndicator;
-        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_GREATER_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDestinationIndicator_LessEqual(String destinationIndicator) {
-        setDestinationIndicator_LessEqual(destinationIndicator, null);
-    }
-
-    public void setDestinationIndicator_LessEqual(String destinationIndicator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = destinationIndicator;
-        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDestinationIndicator_Exists() {
-        setDestinationIndicator_Exists(null);
-    }
-
-    public void setDestinationIndicator_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("destinationIndicator");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDestinationIndicator_CommonTerms(String destinationIndicator) {
-        setDestinationIndicator_CommonTerms(destinationIndicator, null);
-    }
-
-    public void setDestinationIndicator_CommonTerms(String destinationIndicator, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("destinationIndicator", destinationIndicator);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsUserCQ addOrderBy_DestinationIndicator_Asc() {
-        regOBA("destinationIndicator");
-        return this;
-    }
-
-    public BsUserCQ addOrderBy_DestinationIndicator_Desc() {
-        regOBD("destinationIndicator");
-        return this;
-    }
-
-    public void setInternationaliSDNNumber_Equal(String internationaliSDNNumber) {
-        setInternationaliSDNNumber_Term(internationaliSDNNumber, null);
-    }
-
-    public void setInternationaliSDNNumber_Equal(String internationaliSDNNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setInternationaliSDNNumber_Term(internationaliSDNNumber, opLambda);
-    }
-
-    public void setInternationaliSDNNumber_Term(String internationaliSDNNumber) {
-        setInternationaliSDNNumber_Term(internationaliSDNNumber, null);
-    }
-
-    public void setInternationaliSDNNumber_Term(String internationaliSDNNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("internationaliSDNNumber", internationaliSDNNumber);
+    public void setInternationaliSDNNumber_Term(String internationaliSDNNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("internationaliSDNNumber", internationaliSDNNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4413,4587 +4146,4854 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    public void setState_Equal(String state) {
-        setState_Term(state, null);
+    public void setLabeledURI_Equal(String labeledURI) {
+        setLabeledURI_Term(labeledURI, null);
     }
 
-    public void setState_Equal(String state, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setState_Term(state, opLambda);
+    public void setLabeledURI_Equal(String labeledURI, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setLabeledURI_Term(labeledURI, opLambda);
     }
 
-    public void setState_Term(String state) {
-        setState_Term(state, null);
+    public void setLabeledURI_Term(String labeledURI) {
+        setLabeledURI_Term(labeledURI, null);
     }
 
-    public void setState_Term(String state, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("state", state);
+    public void setLabeledURI_Term(String labeledURI, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("labeledURI", labeledURI);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_NotEqual(String state) {
-        setState_NotTerm(state, null);
+    public void setLabeledURI_NotEqual(String labeledURI) {
+        setLabeledURI_NotTerm(labeledURI, null);
     }
 
-    public void setState_NotTerm(String state) {
-        setState_NotTerm(state, null);
+    public void setLabeledURI_NotTerm(String labeledURI) {
+        setLabeledURI_NotTerm(labeledURI, null);
     }
 
-    public void setState_NotEqual(String state, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setState_NotTerm(state, opLambda);
+    public void setLabeledURI_NotEqual(String labeledURI, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setLabeledURI_NotTerm(labeledURI, opLambda);
     }
 
-    public void setState_NotTerm(String state, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setState_Term(state), opLambda);
+    public void setLabeledURI_NotTerm(String labeledURI, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setLabeledURI_Term(labeledURI), opLambda);
     }
 
-    public void setState_Terms(Collection<String> stateList) {
-        setState_Terms(stateList, null);
+    public void setLabeledURI_Terms(Collection<String> labeledURIList) {
+        setLabeledURI_Terms(labeledURIList, null);
     }
 
-    public void setState_Terms(Collection<String> stateList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("state", stateList);
+    public void setLabeledURI_Terms(Collection<String> labeledURIList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("labeledURI", labeledURIList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_InScope(Collection<String> stateList) {
-        setState_Terms(stateList, null);
+    public void setLabeledURI_InScope(Collection<String> labeledURIList) {
+        setLabeledURI_Terms(labeledURIList, null);
     }
 
-    public void setState_InScope(Collection<String> stateList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setState_Terms(stateList, opLambda);
+    public void setLabeledURI_InScope(Collection<String> labeledURIList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setLabeledURI_Terms(labeledURIList, opLambda);
     }
 
-    public void setState_Match(String state) {
-        setState_Match(state, null);
+    public void setLabeledURI_Match(String labeledURI) {
+        setLabeledURI_Match(labeledURI, null);
     }
 
-    public void setState_Match(String state, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("state", state);
+    public void setLabeledURI_Match(String labeledURI, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("labeledURI", labeledURI);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_MatchPhrase(String state) {
-        setState_MatchPhrase(state, null);
+    public void setLabeledURI_MatchPhrase(String labeledURI) {
+        setLabeledURI_MatchPhrase(labeledURI, null);
     }
 
-    public void setState_MatchPhrase(String state, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("state", state);
+    public void setLabeledURI_MatchPhrase(String labeledURI, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("labeledURI", labeledURI);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_MatchPhrasePrefix(String state) {
-        setState_MatchPhrasePrefix(state, null);
+    public void setLabeledURI_MatchPhrasePrefix(String labeledURI) {
+        setLabeledURI_MatchPhrasePrefix(labeledURI, null);
     }
 
-    public void setState_MatchPhrasePrefix(String state, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("state", state);
+    public void setLabeledURI_MatchPhrasePrefix(String labeledURI, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("labeledURI", labeledURI);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_Fuzzy(String state) {
-        setState_Fuzzy(state, null);
+    public void setLabeledURI_Fuzzy(String labeledURI) {
+        setLabeledURI_Fuzzy(labeledURI, null);
     }
 
-    public void setState_Fuzzy(String state, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("state", state);
+    public void setLabeledURI_Fuzzy(String labeledURI, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("labeledURI", labeledURI);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_Prefix(String state) {
-        setState_Prefix(state, null);
+    public void setLabeledURI_Prefix(String labeledURI) {
+        setLabeledURI_Prefix(labeledURI, null);
     }
 
-    public void setState_Prefix(String state, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("state", state);
+    public void setLabeledURI_Prefix(String labeledURI, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("labeledURI", labeledURI);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_Wildcard(String state) {
-        setState_Wildcard(state, null);
+    public void setLabeledURI_Wildcard(String labeledURI) {
+        setLabeledURI_Wildcard(labeledURI, null);
     }
 
-    public void setState_Wildcard(String state, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("state", state);
+    public void setLabeledURI_Wildcard(String labeledURI, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("labeledURI", labeledURI);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_Regexp(String state) {
-        setState_Regexp(state, null);
+    public void setLabeledURI_Regexp(String labeledURI) {
+        setLabeledURI_Regexp(labeledURI, null);
     }
 
-    public void setState_Regexp(String state, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("state", state);
+    public void setLabeledURI_Regexp(String labeledURI, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("labeledURI", labeledURI);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_SpanTerm(String state) {
-        setState_SpanTerm("state", null);
+    public void setLabeledURI_SpanTerm(String labeledURI) {
+        setLabeledURI_SpanTerm("labeledURI", null);
     }
 
-    public void setState_SpanTerm(String state, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("state", state);
+    public void setLabeledURI_SpanTerm(String labeledURI, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("labeledURI", labeledURI);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_GreaterThan(String state) {
-        setState_GreaterThan(state, null);
+    public void setLabeledURI_GreaterThan(String labeledURI) {
+        setLabeledURI_GreaterThan(labeledURI, null);
     }
 
-    public void setState_GreaterThan(String state, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = state;
-        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_GREATER_THAN, _value);
+    public void setLabeledURI_GreaterThan(String labeledURI, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = labeledURI;
+        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_LessThan(String state) {
-        setState_LessThan(state, null);
+    public void setLabeledURI_LessThan(String labeledURI) {
+        setLabeledURI_LessThan(labeledURI, null);
     }
 
-    public void setState_LessThan(String state, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = state;
-        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_LESS_THAN, _value);
+    public void setLabeledURI_LessThan(String labeledURI, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = labeledURI;
+        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_GreaterEqual(String state) {
-        setState_GreaterEqual(state, null);
+    public void setLabeledURI_GreaterEqual(String labeledURI) {
+        setLabeledURI_GreaterEqual(labeledURI, null);
     }
 
-    public void setState_GreaterEqual(String state, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = state;
-        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setLabeledURI_GreaterEqual(String labeledURI, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = labeledURI;
+        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_LessEqual(String state) {
-        setState_LessEqual(state, null);
+    public void setLabeledURI_LessEqual(String labeledURI) {
+        setLabeledURI_LessEqual(labeledURI, null);
     }
 
-    public void setState_LessEqual(String state, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = state;
-        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setLabeledURI_LessEqual(String labeledURI, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = labeledURI;
+        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_Exists() {
-        setState_Exists(null);
+    public void setLabeledURI_Exists() {
+        setLabeledURI_Exists(null);
     }
 
-    public void setState_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("state");
+    public void setLabeledURI_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("labeledURI");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setState_CommonTerms(String state) {
-        setState_CommonTerms(state, null);
+    public void setLabeledURI_CommonTerms(String labeledURI) {
+        setLabeledURI_CommonTerms(labeledURI, null);
     }
 
-    public void setState_CommonTerms(String state, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("state", state);
+    public void setLabeledURI_CommonTerms(String labeledURI, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("labeledURI", labeledURI);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_State_Asc() {
-        regOBA("state");
+    public BsUserCQ addOrderBy_LabeledURI_Asc() {
+        regOBA("labeledURI");
         return this;
     }
 
-    public BsUserCQ addOrderBy_State_Desc() {
-        regOBD("state");
+    public BsUserCQ addOrderBy_LabeledURI_Desc() {
+        regOBD("labeledURI");
         return this;
     }
 
-    public void setEmployeeType_Equal(String employeeType) {
-        setEmployeeType_Term(employeeType, null);
+    public void setMail_Equal(String mail) {
+        setMail_Term(mail, null);
     }
 
-    public void setEmployeeType_Equal(String employeeType, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setEmployeeType_Term(employeeType, opLambda);
+    public void setMail_Equal(String mail, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setMail_Term(mail, opLambda);
     }
 
-    public void setEmployeeType_Term(String employeeType) {
-        setEmployeeType_Term(employeeType, null);
+    public void setMail_Term(String mail) {
+        setMail_Term(mail, null);
     }
 
-    public void setEmployeeType_Term(String employeeType, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("employeeType", employeeType);
+    public void setMail_Term(String mail, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("mail", mail);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_NotEqual(String employeeType) {
-        setEmployeeType_NotTerm(employeeType, null);
+    public void setMail_NotEqual(String mail) {
+        setMail_NotTerm(mail, null);
     }
 
-    public void setEmployeeType_NotTerm(String employeeType) {
-        setEmployeeType_NotTerm(employeeType, null);
+    public void setMail_NotTerm(String mail) {
+        setMail_NotTerm(mail, null);
     }
 
-    public void setEmployeeType_NotEqual(String employeeType, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setEmployeeType_NotTerm(employeeType, opLambda);
+    public void setMail_NotEqual(String mail, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setMail_NotTerm(mail, opLambda);
     }
 
-    public void setEmployeeType_NotTerm(String employeeType, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setEmployeeType_Term(employeeType), opLambda);
+    public void setMail_NotTerm(String mail, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setMail_Term(mail), opLambda);
     }
 
-    public void setEmployeeType_Terms(Collection<String> employeeTypeList) {
-        setEmployeeType_Terms(employeeTypeList, null);
+    public void setMail_Terms(Collection<String> mailList) {
+        setMail_Terms(mailList, null);
     }
 
-    public void setEmployeeType_Terms(Collection<String> employeeTypeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("employeeType", employeeTypeList);
+    public void setMail_Terms(Collection<String> mailList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("mail", mailList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_InScope(Collection<String> employeeTypeList) {
-        setEmployeeType_Terms(employeeTypeList, null);
+    public void setMail_InScope(Collection<String> mailList) {
+        setMail_Terms(mailList, null);
     }
 
-    public void setEmployeeType_InScope(Collection<String> employeeTypeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setEmployeeType_Terms(employeeTypeList, opLambda);
+    public void setMail_InScope(Collection<String> mailList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setMail_Terms(mailList, opLambda);
     }
 
-    public void setEmployeeType_Match(String employeeType) {
-        setEmployeeType_Match(employeeType, null);
+    public void setMail_Match(String mail) {
+        setMail_Match(mail, null);
     }
 
-    public void setEmployeeType_Match(String employeeType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("employeeType", employeeType);
+    public void setMail_Match(String mail, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("mail", mail);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_MatchPhrase(String employeeType) {
-        setEmployeeType_MatchPhrase(employeeType, null);
+    public void setMail_MatchPhrase(String mail) {
+        setMail_MatchPhrase(mail, null);
     }
 
-    public void setEmployeeType_MatchPhrase(String employeeType, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("employeeType", employeeType);
+    public void setMail_MatchPhrase(String mail, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("mail", mail);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_MatchPhrasePrefix(String employeeType) {
-        setEmployeeType_MatchPhrasePrefix(employeeType, null);
+    public void setMail_MatchPhrasePrefix(String mail) {
+        setMail_MatchPhrasePrefix(mail, null);
     }
 
-    public void setEmployeeType_MatchPhrasePrefix(String employeeType, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("employeeType", employeeType);
+    public void setMail_MatchPhrasePrefix(String mail, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("mail", mail);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_Fuzzy(String employeeType) {
-        setEmployeeType_Fuzzy(employeeType, null);
+    public void setMail_Fuzzy(String mail) {
+        setMail_Fuzzy(mail, null);
     }
 
-    public void setEmployeeType_Fuzzy(String employeeType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("employeeType", employeeType);
+    public void setMail_Fuzzy(String mail, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("mail", mail);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_Prefix(String employeeType) {
-        setEmployeeType_Prefix(employeeType, null);
+    public void setMail_Prefix(String mail) {
+        setMail_Prefix(mail, null);
     }
 
-    public void setEmployeeType_Prefix(String employeeType, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("employeeType", employeeType);
+    public void setMail_Prefix(String mail, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("mail", mail);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_Wildcard(String employeeType) {
-        setEmployeeType_Wildcard(employeeType, null);
+    public void setMail_Wildcard(String mail) {
+        setMail_Wildcard(mail, null);
     }
 
-    public void setEmployeeType_Wildcard(String employeeType, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("employeeType", employeeType);
+    public void setMail_Wildcard(String mail, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("mail", mail);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_Regexp(String employeeType) {
-        setEmployeeType_Regexp(employeeType, null);
+    public void setMail_Regexp(String mail) {
+        setMail_Regexp(mail, null);
     }
 
-    public void setEmployeeType_Regexp(String employeeType, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("employeeType", employeeType);
+    public void setMail_Regexp(String mail, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("mail", mail);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_SpanTerm(String employeeType) {
-        setEmployeeType_SpanTerm("employeeType", null);
+    public void setMail_SpanTerm(String mail) {
+        setMail_SpanTerm("mail", null);
     }
 
-    public void setEmployeeType_SpanTerm(String employeeType, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("employeeType", employeeType);
+    public void setMail_SpanTerm(String mail, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("mail", mail);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_GreaterThan(String employeeType) {
-        setEmployeeType_GreaterThan(employeeType, null);
+    public void setMail_GreaterThan(String mail) {
+        setMail_GreaterThan(mail, null);
     }
 
-    public void setEmployeeType_GreaterThan(String employeeType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = employeeType;
-        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_GREATER_THAN, _value);
+    public void setMail_GreaterThan(String mail, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = mail;
+        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_LessThan(String employeeType) {
-        setEmployeeType_LessThan(employeeType, null);
+    public void setMail_LessThan(String mail) {
+        setMail_LessThan(mail, null);
     }
 
-    public void setEmployeeType_LessThan(String employeeType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = employeeType;
-        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_LESS_THAN, _value);
+    public void setMail_LessThan(String mail, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = mail;
+        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_GreaterEqual(String employeeType) {
-        setEmployeeType_GreaterEqual(employeeType, null);
+    public void setMail_GreaterEqual(String mail) {
+        setMail_GreaterEqual(mail, null);
     }
 
-    public void setEmployeeType_GreaterEqual(String employeeType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = employeeType;
-        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setMail_GreaterEqual(String mail, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = mail;
+        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_LessEqual(String employeeType) {
-        setEmployeeType_LessEqual(employeeType, null);
+    public void setMail_LessEqual(String mail) {
+        setMail_LessEqual(mail, null);
     }
 
-    public void setEmployeeType_LessEqual(String employeeType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = employeeType;
-        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setMail_LessEqual(String mail, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = mail;
+        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_Exists() {
-        setEmployeeType_Exists(null);
+    public void setMail_Exists() {
+        setMail_Exists(null);
     }
 
-    public void setEmployeeType_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("employeeType");
+    public void setMail_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("mail");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setEmployeeType_CommonTerms(String employeeType) {
-        setEmployeeType_CommonTerms(employeeType, null);
+    public void setMail_CommonTerms(String mail) {
+        setMail_CommonTerms(mail, null);
     }
 
-    public void setEmployeeType_CommonTerms(String employeeType, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("employeeType", employeeType);
+    public void setMail_CommonTerms(String mail, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("mail", mail);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_EmployeeType_Asc() {
-        regOBA("employeeType");
+    public BsUserCQ addOrderBy_Mail_Asc() {
+        regOBA("mail");
         return this;
     }
 
-    public BsUserCQ addOrderBy_EmployeeType_Desc() {
-        regOBD("employeeType");
+    public BsUserCQ addOrderBy_Mail_Desc() {
+        regOBD("mail");
         return this;
     }
 
-    public void setFacsimileTelephoneNumber_Equal(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_Term(facsimileTelephoneNumber, null);
+    public void setMobile_Equal(String mobile) {
+        setMobile_Term(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_Equal(String facsimileTelephoneNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setFacsimileTelephoneNumber_Term(facsimileTelephoneNumber, opLambda);
+    public void setMobile_Equal(String mobile, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setMobile_Term(mobile, opLambda);
     }
 
-    public void setFacsimileTelephoneNumber_Term(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_Term(facsimileTelephoneNumber, null);
+    public void setMobile_Term(String mobile) {
+        setMobile_Term(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_Term(String facsimileTelephoneNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
+    public void setMobile_Term(String mobile, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("mobile", mobile);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_NotEqual(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_NotTerm(facsimileTelephoneNumber, null);
+    public void setMobile_NotEqual(String mobile) {
+        setMobile_NotTerm(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_NotTerm(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_NotTerm(facsimileTelephoneNumber, null);
+    public void setMobile_NotTerm(String mobile) {
+        setMobile_NotTerm(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_NotEqual(String facsimileTelephoneNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setFacsimileTelephoneNumber_NotTerm(facsimileTelephoneNumber, opLambda);
+    public void setMobile_NotEqual(String mobile, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setMobile_NotTerm(mobile, opLambda);
     }
 
-    public void setFacsimileTelephoneNumber_NotTerm(String facsimileTelephoneNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setFacsimileTelephoneNumber_Term(facsimileTelephoneNumber), opLambda);
+    public void setMobile_NotTerm(String mobile, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setMobile_Term(mobile), opLambda);
     }
 
-    public void setFacsimileTelephoneNumber_Terms(Collection<String> facsimileTelephoneNumberList) {
-        setFacsimileTelephoneNumber_Terms(facsimileTelephoneNumberList, null);
+    public void setMobile_Terms(Collection<String> mobileList) {
+        setMobile_Terms(mobileList, null);
     }
 
-    public void setFacsimileTelephoneNumber_Terms(Collection<String> facsimileTelephoneNumberList,
-            ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("facsimileTelephoneNumber", facsimileTelephoneNumberList);
+    public void setMobile_Terms(Collection<String> mobileList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("mobile", mobileList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_InScope(Collection<String> facsimileTelephoneNumberList) {
-        setFacsimileTelephoneNumber_Terms(facsimileTelephoneNumberList, null);
+    public void setMobile_InScope(Collection<String> mobileList) {
+        setMobile_Terms(mobileList, null);
     }
 
-    public void setFacsimileTelephoneNumber_InScope(Collection<String> facsimileTelephoneNumberList,
-            ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setFacsimileTelephoneNumber_Terms(facsimileTelephoneNumberList, opLambda);
+    public void setMobile_InScope(Collection<String> mobileList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setMobile_Terms(mobileList, opLambda);
     }
 
-    public void setFacsimileTelephoneNumber_Match(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_Match(facsimileTelephoneNumber, null);
+    public void setMobile_Match(String mobile) {
+        setMobile_Match(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_Match(String facsimileTelephoneNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
+    public void setMobile_Match(String mobile, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("mobile", mobile);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_MatchPhrase(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_MatchPhrase(facsimileTelephoneNumber, null);
+    public void setMobile_MatchPhrase(String mobile) {
+        setMobile_MatchPhrase(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_MatchPhrase(String facsimileTelephoneNumber,
-            ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
+    public void setMobile_MatchPhrase(String mobile, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("mobile", mobile);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_MatchPhrasePrefix(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_MatchPhrasePrefix(facsimileTelephoneNumber, null);
+    public void setMobile_MatchPhrasePrefix(String mobile) {
+        setMobile_MatchPhrasePrefix(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_MatchPhrasePrefix(String facsimileTelephoneNumber,
-            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
+    public void setMobile_MatchPhrasePrefix(String mobile, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("mobile", mobile);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_Fuzzy(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_Fuzzy(facsimileTelephoneNumber, null);
+    public void setMobile_Fuzzy(String mobile) {
+        setMobile_Fuzzy(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_Fuzzy(String facsimileTelephoneNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
+    public void setMobile_Fuzzy(String mobile, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("mobile", mobile);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_Prefix(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_Prefix(facsimileTelephoneNumber, null);
+    public void setMobile_Prefix(String mobile) {
+        setMobile_Prefix(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_Prefix(String facsimileTelephoneNumber, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
+    public void setMobile_Prefix(String mobile, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("mobile", mobile);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_Wildcard(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_Wildcard(facsimileTelephoneNumber, null);
+    public void setMobile_Wildcard(String mobile) {
+        setMobile_Wildcard(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_Wildcard(String facsimileTelephoneNumber, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
+    public void setMobile_Wildcard(String mobile, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("mobile", mobile);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_Regexp(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_Regexp(facsimileTelephoneNumber, null);
+    public void setMobile_Regexp(String mobile) {
+        setMobile_Regexp(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_Regexp(String facsimileTelephoneNumber, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
+    public void setMobile_Regexp(String mobile, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("mobile", mobile);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_SpanTerm(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_SpanTerm("facsimileTelephoneNumber", null);
+    public void setMobile_SpanTerm(String mobile) {
+        setMobile_SpanTerm("mobile", null);
     }
 
-    public void setFacsimileTelephoneNumber_SpanTerm(String facsimileTelephoneNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
+    public void setMobile_SpanTerm(String mobile, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("mobile", mobile);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_GreaterThan(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_GreaterThan(facsimileTelephoneNumber, null);
+    public void setMobile_GreaterThan(String mobile) {
+        setMobile_GreaterThan(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_GreaterThan(String facsimileTelephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = facsimileTelephoneNumber;
-        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_GREATER_THAN, _value);
+    public void setMobile_GreaterThan(String mobile, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = mobile;
+        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_LessThan(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_LessThan(facsimileTelephoneNumber, null);
+    public void setMobile_LessThan(String mobile) {
+        setMobile_LessThan(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_LessThan(String facsimileTelephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = facsimileTelephoneNumber;
-        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_LESS_THAN, _value);
+    public void setMobile_LessThan(String mobile, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = mobile;
+        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_GreaterEqual(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_GreaterEqual(facsimileTelephoneNumber, null);
+    public void setMobile_GreaterEqual(String mobile) {
+        setMobile_GreaterEqual(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_GreaterEqual(String facsimileTelephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = facsimileTelephoneNumber;
-        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setMobile_GreaterEqual(String mobile, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = mobile;
+        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_LessEqual(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_LessEqual(facsimileTelephoneNumber, null);
+    public void setMobile_LessEqual(String mobile) {
+        setMobile_LessEqual(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_LessEqual(String facsimileTelephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = facsimileTelephoneNumber;
-        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setMobile_LessEqual(String mobile, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = mobile;
+        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_Exists() {
-        setFacsimileTelephoneNumber_Exists(null);
+    public void setMobile_Exists() {
+        setMobile_Exists(null);
     }
 
-    public void setFacsimileTelephoneNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("facsimileTelephoneNumber");
+    public void setMobile_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("mobile");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setFacsimileTelephoneNumber_CommonTerms(String facsimileTelephoneNumber) {
-        setFacsimileTelephoneNumber_CommonTerms(facsimileTelephoneNumber, null);
+    public void setMobile_CommonTerms(String mobile) {
+        setMobile_CommonTerms(mobile, null);
     }
 
-    public void setFacsimileTelephoneNumber_CommonTerms(String facsimileTelephoneNumber,
-            ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
+    public void setMobile_CommonTerms(String mobile, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("mobile", mobile);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_FacsimileTelephoneNumber_Asc() {
-        regOBA("facsimileTelephoneNumber");
+    public BsUserCQ addOrderBy_Mobile_Asc() {
+        regOBA("mobile");
         return this;
     }
 
-    public BsUserCQ addOrderBy_FacsimileTelephoneNumber_Desc() {
-        regOBD("facsimileTelephoneNumber");
+    public BsUserCQ addOrderBy_Mobile_Desc() {
+        regOBD("mobile");
         return this;
     }
 
-    public void setPostOfficeBox_Equal(String postOfficeBox) {
-        setPostOfficeBox_Term(postOfficeBox, null);
+    public void setName_Equal(String name) {
+        setName_Term(name, null);
     }
 
-    public void setPostOfficeBox_Equal(String postOfficeBox, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setPostOfficeBox_Term(postOfficeBox, opLambda);
+    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setName_Term(name, opLambda);
     }
 
-    public void setPostOfficeBox_Term(String postOfficeBox) {
-        setPostOfficeBox_Term(postOfficeBox, null);
+    public void setName_Term(String name) {
+        setName_Term(name, null);
     }
 
-    public void setPostOfficeBox_Term(String postOfficeBox, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("postOfficeBox", postOfficeBox);
+    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_NotEqual(String postOfficeBox) {
-        setPostOfficeBox_NotTerm(postOfficeBox, null);
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public void setPostOfficeBox_NotTerm(String postOfficeBox) {
-        setPostOfficeBox_NotTerm(postOfficeBox, null);
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public void setPostOfficeBox_NotEqual(String postOfficeBox, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setPostOfficeBox_NotTerm(postOfficeBox, opLambda);
+    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
     }
 
-    public void setPostOfficeBox_NotTerm(String postOfficeBox, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setPostOfficeBox_Term(postOfficeBox), opLambda);
+    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setName_Term(name), opLambda);
     }
 
-    public void setPostOfficeBox_Terms(Collection<String> postOfficeBoxList) {
-        setPostOfficeBox_Terms(postOfficeBoxList, null);
+    public void setName_Terms(Collection<String> nameList) {
+        setName_Terms(nameList, null);
     }
 
-    public void setPostOfficeBox_Terms(Collection<String> postOfficeBoxList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("postOfficeBox", postOfficeBoxList);
+    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("name", nameList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_InScope(Collection<String> postOfficeBoxList) {
-        setPostOfficeBox_Terms(postOfficeBoxList, null);
+    public void setName_InScope(Collection<String> nameList) {
+        setName_Terms(nameList, null);
     }
 
-    public void setPostOfficeBox_InScope(Collection<String> postOfficeBoxList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setPostOfficeBox_Terms(postOfficeBoxList, opLambda);
+    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setName_Terms(nameList, opLambda);
     }
 
-    public void setPostOfficeBox_Match(String postOfficeBox) {
-        setPostOfficeBox_Match(postOfficeBox, null);
+    public void setName_Match(String name) {
+        setName_Match(name, null);
     }
 
-    public void setPostOfficeBox_Match(String postOfficeBox, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("postOfficeBox", postOfficeBox);
+    public void setName_Match(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_MatchPhrase(String postOfficeBox) {
-        setPostOfficeBox_MatchPhrase(postOfficeBox, null);
+    public void setName_MatchPhrase(String name) {
+        setName_MatchPhrase(name, null);
     }
 
-    public void setPostOfficeBox_MatchPhrase(String postOfficeBox, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("postOfficeBox", postOfficeBox);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_MatchPhrasePrefix(String postOfficeBox) {
-        setPostOfficeBox_MatchPhrasePrefix(postOfficeBox, null);
+    public void setName_MatchPhrasePrefix(String name) {
+        setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setPostOfficeBox_MatchPhrasePrefix(String postOfficeBox, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("postOfficeBox", postOfficeBox);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_Fuzzy(String postOfficeBox) {
-        setPostOfficeBox_Fuzzy(postOfficeBox, null);
+    public void setName_Fuzzy(String name) {
+        setName_Fuzzy(name, null);
     }
 
-    public void setPostOfficeBox_Fuzzy(String postOfficeBox, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("postOfficeBox", postOfficeBox);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_Prefix(String postOfficeBox) {
-        setPostOfficeBox_Prefix(postOfficeBox, null);
+    public void setName_Prefix(String name) {
+        setName_Prefix(name, null);
     }
 
-    public void setPostOfficeBox_Prefix(String postOfficeBox, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("postOfficeBox", postOfficeBox);
+    public void setName_Prefix(String name, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_Wildcard(String postOfficeBox) {
-        setPostOfficeBox_Wildcard(postOfficeBox, null);
+    public void setName_Wildcard(String name) {
+        setName_Wildcard(name, null);
     }
 
-    public void setPostOfficeBox_Wildcard(String postOfficeBox, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("postOfficeBox", postOfficeBox);
+    public void setName_Wildcard(String name, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_Regexp(String postOfficeBox) {
-        setPostOfficeBox_Regexp(postOfficeBox, null);
+    public void setName_Regexp(String name) {
+        setName_Regexp(name, null);
     }
 
-    public void setPostOfficeBox_Regexp(String postOfficeBox, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("postOfficeBox", postOfficeBox);
+    public void setName_Regexp(String name, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_SpanTerm(String postOfficeBox) {
-        setPostOfficeBox_SpanTerm("postOfficeBox", null);
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
     }
 
-    public void setPostOfficeBox_SpanTerm(String postOfficeBox, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("postOfficeBox", postOfficeBox);
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_GreaterThan(String postOfficeBox) {
-        setPostOfficeBox_GreaterThan(postOfficeBox, null);
+    public void setName_GreaterThan(String name) {
+        setName_GreaterThan(name, null);
     }
 
-    public void setPostOfficeBox_GreaterThan(String postOfficeBox, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = postOfficeBox;
-        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_GREATER_THAN, _value);
+    public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_LessThan(String postOfficeBox) {
-        setPostOfficeBox_LessThan(postOfficeBox, null);
+    public void setName_LessThan(String name) {
+        setName_LessThan(name, null);
     }
 
-    public void setPostOfficeBox_LessThan(String postOfficeBox, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = postOfficeBox;
-        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_LESS_THAN, _value);
+    public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_GreaterEqual(String postOfficeBox) {
-        setPostOfficeBox_GreaterEqual(postOfficeBox, null);
+    public void setName_GreaterEqual(String name) {
+        setName_GreaterEqual(name, null);
     }
 
-    public void setPostOfficeBox_GreaterEqual(String postOfficeBox, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = postOfficeBox;
-        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_LessEqual(String postOfficeBox) {
-        setPostOfficeBox_LessEqual(postOfficeBox, null);
+    public void setName_LessEqual(String name) {
+        setName_LessEqual(name, null);
     }
 
-    public void setPostOfficeBox_LessEqual(String postOfficeBox, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = postOfficeBox;
-        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_Exists() {
-        setPostOfficeBox_Exists(null);
+    public void setName_Exists() {
+        setName_Exists(null);
     }
 
-    public void setPostOfficeBox_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("postOfficeBox");
+    public void setName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostOfficeBox_CommonTerms(String postOfficeBox) {
-        setPostOfficeBox_CommonTerms(postOfficeBox, null);
+    public void setName_CommonTerms(String name) {
+        setName_CommonTerms(name, null);
     }
 
-    public void setPostOfficeBox_CommonTerms(String postOfficeBox, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("postOfficeBox", postOfficeBox);
+    public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_PostOfficeBox_Asc() {
-        regOBA("postOfficeBox");
+    public BsUserCQ addOrderBy_Name_Asc() {
+        regOBA("name");
         return this;
     }
 
-    public BsUserCQ addOrderBy_PostOfficeBox_Desc() {
-        regOBD("postOfficeBox");
+    public BsUserCQ addOrderBy_Name_Desc() {
+        regOBD("name");
         return this;
     }
 
-    public void setInitials_Equal(String initials) {
-        setInitials_Term(initials, null);
+    public void setPager_Equal(String pager) {
+        setPager_Term(pager, null);
     }
 
-    public void setInitials_Equal(String initials, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setInitials_Term(initials, opLambda);
+    public void setPager_Equal(String pager, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setPager_Term(pager, opLambda);
     }
 
-    public void setInitials_Term(String initials) {
-        setInitials_Term(initials, null);
+    public void setPager_Term(String pager) {
+        setPager_Term(pager, null);
     }
 
-    public void setInitials_Term(String initials, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("initials", initials);
+    public void setPager_Term(String pager, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("pager", pager);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_NotEqual(String initials) {
-        setInitials_NotTerm(initials, null);
+    public void setPager_NotEqual(String pager) {
+        setPager_NotTerm(pager, null);
     }
 
-    public void setInitials_NotTerm(String initials) {
-        setInitials_NotTerm(initials, null);
+    public void setPager_NotTerm(String pager) {
+        setPager_NotTerm(pager, null);
     }
 
-    public void setInitials_NotEqual(String initials, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setInitials_NotTerm(initials, opLambda);
+    public void setPager_NotEqual(String pager, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPager_NotTerm(pager, opLambda);
     }
 
-    public void setInitials_NotTerm(String initials, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setInitials_Term(initials), opLambda);
+    public void setPager_NotTerm(String pager, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPager_Term(pager), opLambda);
     }
 
-    public void setInitials_Terms(Collection<String> initialsList) {
-        setInitials_Terms(initialsList, null);
+    public void setPager_Terms(Collection<String> pagerList) {
+        setPager_Terms(pagerList, null);
     }
 
-    public void setInitials_Terms(Collection<String> initialsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("initials", initialsList);
+    public void setPager_Terms(Collection<String> pagerList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("pager", pagerList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_InScope(Collection<String> initialsList) {
-        setInitials_Terms(initialsList, null);
+    public void setPager_InScope(Collection<String> pagerList) {
+        setPager_Terms(pagerList, null);
     }
 
-    public void setInitials_InScope(Collection<String> initialsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setInitials_Terms(initialsList, opLambda);
+    public void setPager_InScope(Collection<String> pagerList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setPager_Terms(pagerList, opLambda);
     }
 
-    public void setInitials_Match(String initials) {
-        setInitials_Match(initials, null);
+    public void setPager_Match(String pager) {
+        setPager_Match(pager, null);
     }
 
-    public void setInitials_Match(String initials, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("initials", initials);
+    public void setPager_Match(String pager, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("pager", pager);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_MatchPhrase(String initials) {
-        setInitials_MatchPhrase(initials, null);
+    public void setPager_MatchPhrase(String pager) {
+        setPager_MatchPhrase(pager, null);
     }
 
-    public void setInitials_MatchPhrase(String initials, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("initials", initials);
+    public void setPager_MatchPhrase(String pager, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("pager", pager);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_MatchPhrasePrefix(String initials) {
-        setInitials_MatchPhrasePrefix(initials, null);
+    public void setPager_MatchPhrasePrefix(String pager) {
+        setPager_MatchPhrasePrefix(pager, null);
     }
 
-    public void setInitials_MatchPhrasePrefix(String initials, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("initials", initials);
+    public void setPager_MatchPhrasePrefix(String pager, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("pager", pager);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_Fuzzy(String initials) {
-        setInitials_Fuzzy(initials, null);
+    public void setPager_Fuzzy(String pager) {
+        setPager_Fuzzy(pager, null);
     }
 
-    public void setInitials_Fuzzy(String initials, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("initials", initials);
+    public void setPager_Fuzzy(String pager, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("pager", pager);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_Prefix(String initials) {
-        setInitials_Prefix(initials, null);
+    public void setPager_Prefix(String pager) {
+        setPager_Prefix(pager, null);
     }
 
-    public void setInitials_Prefix(String initials, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("initials", initials);
+    public void setPager_Prefix(String pager, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("pager", pager);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_Wildcard(String initials) {
-        setInitials_Wildcard(initials, null);
+    public void setPager_Wildcard(String pager) {
+        setPager_Wildcard(pager, null);
     }
 
-    public void setInitials_Wildcard(String initials, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("initials", initials);
+    public void setPager_Wildcard(String pager, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("pager", pager);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_Regexp(String initials) {
-        setInitials_Regexp(initials, null);
+    public void setPager_Regexp(String pager) {
+        setPager_Regexp(pager, null);
     }
 
-    public void setInitials_Regexp(String initials, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("initials", initials);
+    public void setPager_Regexp(String pager, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("pager", pager);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_SpanTerm(String initials) {
-        setInitials_SpanTerm("initials", null);
+    public void setPager_SpanTerm(String pager) {
+        setPager_SpanTerm("pager", null);
     }
 
-    public void setInitials_SpanTerm(String initials, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("initials", initials);
+    public void setPager_SpanTerm(String pager, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("pager", pager);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_GreaterThan(String initials) {
-        setInitials_GreaterThan(initials, null);
+    public void setPager_GreaterThan(String pager) {
+        setPager_GreaterThan(pager, null);
     }
 
-    public void setInitials_GreaterThan(String initials, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = initials;
-        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_GREATER_THAN, _value);
+    public void setPager_GreaterThan(String pager, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = pager;
+        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_LessThan(String initials) {
-        setInitials_LessThan(initials, null);
+    public void setPager_LessThan(String pager) {
+        setPager_LessThan(pager, null);
     }
 
-    public void setInitials_LessThan(String initials, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = initials;
-        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_LESS_THAN, _value);
+    public void setPager_LessThan(String pager, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = pager;
+        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_GreaterEqual(String initials) {
-        setInitials_GreaterEqual(initials, null);
+    public void setPager_GreaterEqual(String pager) {
+        setPager_GreaterEqual(pager, null);
     }
 
-    public void setInitials_GreaterEqual(String initials, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = initials;
-        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setPager_GreaterEqual(String pager, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = pager;
+        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_LessEqual(String initials) {
-        setInitials_LessEqual(initials, null);
+    public void setPager_LessEqual(String pager) {
+        setPager_LessEqual(pager, null);
     }
 
-    public void setInitials_LessEqual(String initials, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = initials;
-        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setPager_LessEqual(String pager, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = pager;
+        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_Exists() {
-        setInitials_Exists(null);
+    public void setPager_Exists() {
+        setPager_Exists(null);
     }
 
-    public void setInitials_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("initials");
+    public void setPager_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("pager");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setInitials_CommonTerms(String initials) {
-        setInitials_CommonTerms(initials, null);
+    public void setPager_CommonTerms(String pager) {
+        setPager_CommonTerms(pager, null);
     }
 
-    public void setInitials_CommonTerms(String initials, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("initials", initials);
+    public void setPager_CommonTerms(String pager, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("pager", pager);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_Initials_Asc() {
-        regOBA("initials");
+    public BsUserCQ addOrderBy_Pager_Asc() {
+        regOBA("pager");
         return this;
     }
 
-    public BsUserCQ addOrderBy_Initials_Desc() {
-        regOBD("initials");
+    public BsUserCQ addOrderBy_Pager_Desc() {
+        regOBD("pager");
         return this;
     }
 
-    public void setCarLicense_Equal(String carLicense) {
-        setCarLicense_Term(carLicense, null);
+    public void setPassword_Equal(String password) {
+        setPassword_Term(password, null);
     }
 
-    public void setCarLicense_Equal(String carLicense, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setCarLicense_Term(carLicense, opLambda);
+    public void setPassword_Equal(String password, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setPassword_Term(password, opLambda);
     }
 
-    public void setCarLicense_Term(String carLicense) {
-        setCarLicense_Term(carLicense, null);
+    public void setPassword_Term(String password) {
+        setPassword_Term(password, null);
     }
 
-    public void setCarLicense_Term(String carLicense, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("carLicense", carLicense);
+    public void setPassword_Term(String password, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_NotEqual(String carLicense) {
-        setCarLicense_NotTerm(carLicense, null);
+    public void setPassword_NotEqual(String password) {
+        setPassword_NotTerm(password, null);
     }
 
-    public void setCarLicense_NotTerm(String carLicense) {
-        setCarLicense_NotTerm(carLicense, null);
+    public void setPassword_NotTerm(String password) {
+        setPassword_NotTerm(password, null);
     }
 
-    public void setCarLicense_NotEqual(String carLicense, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setCarLicense_NotTerm(carLicense, opLambda);
+    public void setPassword_NotEqual(String password, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPassword_NotTerm(password, opLambda);
     }
 
-    public void setCarLicense_NotTerm(String carLicense, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setCarLicense_Term(carLicense), opLambda);
+    public void setPassword_NotTerm(String password, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPassword_Term(password), opLambda);
     }
 
-    public void setCarLicense_Terms(Collection<String> carLicenseList) {
-        setCarLicense_Terms(carLicenseList, null);
+    public void setPassword_Terms(Collection<String> passwordList) {
+        setPassword_Terms(passwordList, null);
     }
 
-    public void setCarLicense_Terms(Collection<String> carLicenseList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("carLicense", carLicenseList);
+    public void setPassword_Terms(Collection<String> passwordList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("password", passwordList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_InScope(Collection<String> carLicenseList) {
-        setCarLicense_Terms(carLicenseList, null);
+    public void setPassword_InScope(Collection<String> passwordList) {
+        setPassword_Terms(passwordList, null);
     }
 
-    public void setCarLicense_InScope(Collection<String> carLicenseList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setCarLicense_Terms(carLicenseList, opLambda);
+    public void setPassword_InScope(Collection<String> passwordList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setPassword_Terms(passwordList, opLambda);
     }
 
-    public void setCarLicense_Match(String carLicense) {
-        setCarLicense_Match(carLicense, null);
+    public void setPassword_Match(String password) {
+        setPassword_Match(password, null);
     }
 
-    public void setCarLicense_Match(String carLicense, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("carLicense", carLicense);
+    public void setPassword_Match(String password, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_MatchPhrase(String carLicense) {
-        setCarLicense_MatchPhrase(carLicense, null);
+    public void setPassword_MatchPhrase(String password) {
+        setPassword_MatchPhrase(password, null);
     }
 
-    public void setCarLicense_MatchPhrase(String carLicense, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("carLicense", carLicense);
+    public void setPassword_MatchPhrase(String password, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_MatchPhrasePrefix(String carLicense) {
-        setCarLicense_MatchPhrasePrefix(carLicense, null);
+    public void setPassword_MatchPhrasePrefix(String password) {
+        setPassword_MatchPhrasePrefix(password, null);
     }
 
-    public void setCarLicense_MatchPhrasePrefix(String carLicense, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("carLicense", carLicense);
+    public void setPassword_MatchPhrasePrefix(String password, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_Fuzzy(String carLicense) {
-        setCarLicense_Fuzzy(carLicense, null);
+    public void setPassword_Fuzzy(String password) {
+        setPassword_Fuzzy(password, null);
     }
 
-    public void setCarLicense_Fuzzy(String carLicense, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("carLicense", carLicense);
+    public void setPassword_Fuzzy(String password, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_Prefix(String carLicense) {
-        setCarLicense_Prefix(carLicense, null);
+    public void setPassword_Prefix(String password) {
+        setPassword_Prefix(password, null);
     }
 
-    public void setCarLicense_Prefix(String carLicense, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("carLicense", carLicense);
+    public void setPassword_Prefix(String password, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_Wildcard(String carLicense) {
-        setCarLicense_Wildcard(carLicense, null);
+    public void setPassword_Wildcard(String password) {
+        setPassword_Wildcard(password, null);
     }
 
-    public void setCarLicense_Wildcard(String carLicense, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("carLicense", carLicense);
+    public void setPassword_Wildcard(String password, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_Regexp(String carLicense) {
-        setCarLicense_Regexp(carLicense, null);
+    public void setPassword_Regexp(String password) {
+        setPassword_Regexp(password, null);
     }
 
-    public void setCarLicense_Regexp(String carLicense, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("carLicense", carLicense);
+    public void setPassword_Regexp(String password, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_SpanTerm(String carLicense) {
-        setCarLicense_SpanTerm("carLicense", null);
+    public void setPassword_SpanTerm(String password) {
+        setPassword_SpanTerm("password", null);
     }
 
-    public void setCarLicense_SpanTerm(String carLicense, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("carLicense", carLicense);
+    public void setPassword_SpanTerm(String password, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_GreaterThan(String carLicense) {
-        setCarLicense_GreaterThan(carLicense, null);
+    public void setPassword_GreaterThan(String password) {
+        setPassword_GreaterThan(password, null);
     }
 
-    public void setCarLicense_GreaterThan(String carLicense, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = carLicense;
-        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_GREATER_THAN, _value);
+    public void setPassword_GreaterThan(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_LessThan(String carLicense) {
-        setCarLicense_LessThan(carLicense, null);
+    public void setPassword_LessThan(String password) {
+        setPassword_LessThan(password, null);
     }
 
-    public void setCarLicense_LessThan(String carLicense, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = carLicense;
-        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_LESS_THAN, _value);
+    public void setPassword_LessThan(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_GreaterEqual(String carLicense) {
-        setCarLicense_GreaterEqual(carLicense, null);
+    public void setPassword_GreaterEqual(String password) {
+        setPassword_GreaterEqual(password, null);
     }
 
-    public void setCarLicense_GreaterEqual(String carLicense, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = carLicense;
-        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setPassword_GreaterEqual(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_LessEqual(String carLicense) {
-        setCarLicense_LessEqual(carLicense, null);
+    public void setPassword_LessEqual(String password) {
+        setPassword_LessEqual(password, null);
     }
 
-    public void setCarLicense_LessEqual(String carLicense, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = carLicense;
-        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setPassword_LessEqual(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_Exists() {
-        setCarLicense_Exists(null);
+    public void setPassword_Exists() {
+        setPassword_Exists(null);
     }
 
-    public void setCarLicense_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("carLicense");
+    public void setPassword_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCarLicense_CommonTerms(String carLicense) {
-        setCarLicense_CommonTerms(carLicense, null);
+    public void setPassword_CommonTerms(String password) {
+        setPassword_CommonTerms(password, null);
     }
 
-    public void setCarLicense_CommonTerms(String carLicense, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("carLicense", carLicense);
+    public void setPassword_CommonTerms(String password, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_CarLicense_Asc() {
-        regOBA("carLicense");
+    public BsUserCQ addOrderBy_Password_Asc() {
+        regOBA("password");
         return this;
     }
 
-    public BsUserCQ addOrderBy_CarLicense_Desc() {
-        regOBD("carLicense");
+    public BsUserCQ addOrderBy_Password_Desc() {
+        regOBD("password");
         return this;
     }
 
-    public void setMobile_Equal(String mobile) {
-        setMobile_Term(mobile, null);
+    public void setPhysicalDeliveryOfficeName_Equal(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_Term(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_Equal(String mobile, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setMobile_Term(mobile, opLambda);
+    public void setPhysicalDeliveryOfficeName_Equal(String physicalDeliveryOfficeName, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setPhysicalDeliveryOfficeName_Term(physicalDeliveryOfficeName, opLambda);
     }
 
-    public void setMobile_Term(String mobile) {
-        setMobile_Term(mobile, null);
+    public void setPhysicalDeliveryOfficeName_Term(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_Term(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_Term(String mobile, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("mobile", mobile);
+    public void setPhysicalDeliveryOfficeName_Term(String physicalDeliveryOfficeName, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_NotEqual(String mobile) {
-        setMobile_NotTerm(mobile, null);
+    public void setPhysicalDeliveryOfficeName_NotEqual(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_NotTerm(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_NotTerm(String mobile) {
-        setMobile_NotTerm(mobile, null);
+    public void setPhysicalDeliveryOfficeName_NotTerm(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_NotTerm(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_NotEqual(String mobile, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setMobile_NotTerm(mobile, opLambda);
+    public void setPhysicalDeliveryOfficeName_NotEqual(String physicalDeliveryOfficeName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPhysicalDeliveryOfficeName_NotTerm(physicalDeliveryOfficeName, opLambda);
     }
 
-    public void setMobile_NotTerm(String mobile, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setMobile_Term(mobile), opLambda);
+    public void setPhysicalDeliveryOfficeName_NotTerm(String physicalDeliveryOfficeName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPhysicalDeliveryOfficeName_Term(physicalDeliveryOfficeName), opLambda);
     }
 
-    public void setMobile_Terms(Collection<String> mobileList) {
-        setMobile_Terms(mobileList, null);
+    public void setPhysicalDeliveryOfficeName_Terms(Collection<String> physicalDeliveryOfficeNameList) {
+        setPhysicalDeliveryOfficeName_Terms(physicalDeliveryOfficeNameList, null);
     }
 
-    public void setMobile_Terms(Collection<String> mobileList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("mobile", mobileList);
+    public void setPhysicalDeliveryOfficeName_Terms(Collection<String> physicalDeliveryOfficeNameList,
+            ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("physicalDeliveryOfficeName", physicalDeliveryOfficeNameList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_InScope(Collection<String> mobileList) {
-        setMobile_Terms(mobileList, null);
+    public void setPhysicalDeliveryOfficeName_InScope(Collection<String> physicalDeliveryOfficeNameList) {
+        setPhysicalDeliveryOfficeName_Terms(physicalDeliveryOfficeNameList, null);
     }
 
-    public void setMobile_InScope(Collection<String> mobileList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setMobile_Terms(mobileList, opLambda);
+    public void setPhysicalDeliveryOfficeName_InScope(Collection<String> physicalDeliveryOfficeNameList,
+            ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setPhysicalDeliveryOfficeName_Terms(physicalDeliveryOfficeNameList, opLambda);
     }
 
-    public void setMobile_Match(String mobile) {
-        setMobile_Match(mobile, null);
+    public void setPhysicalDeliveryOfficeName_Match(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_Match(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_Match(String mobile, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("mobile", mobile);
+    public void setPhysicalDeliveryOfficeName_Match(String physicalDeliveryOfficeName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_MatchPhrase(String mobile) {
-        setMobile_MatchPhrase(mobile, null);
+    public void setPhysicalDeliveryOfficeName_MatchPhrase(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_MatchPhrase(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_MatchPhrase(String mobile, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("mobile", mobile);
+    public void setPhysicalDeliveryOfficeName_MatchPhrase(String physicalDeliveryOfficeName,
+            ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_MatchPhrasePrefix(String mobile) {
-        setMobile_MatchPhrasePrefix(mobile, null);
+    public void setPhysicalDeliveryOfficeName_MatchPhrasePrefix(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_MatchPhrasePrefix(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_MatchPhrasePrefix(String mobile, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("mobile", mobile);
+    public void setPhysicalDeliveryOfficeName_MatchPhrasePrefix(String physicalDeliveryOfficeName,
+            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_Fuzzy(String mobile) {
-        setMobile_Fuzzy(mobile, null);
+    public void setPhysicalDeliveryOfficeName_Fuzzy(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_Fuzzy(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_Fuzzy(String mobile, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("mobile", mobile);
+    public void setPhysicalDeliveryOfficeName_Fuzzy(String physicalDeliveryOfficeName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_Prefix(String mobile) {
-        setMobile_Prefix(mobile, null);
+    public void setPhysicalDeliveryOfficeName_Prefix(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_Prefix(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_Prefix(String mobile, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("mobile", mobile);
+    public void setPhysicalDeliveryOfficeName_Prefix(String physicalDeliveryOfficeName, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_Wildcard(String mobile) {
-        setMobile_Wildcard(mobile, null);
+    public void setPhysicalDeliveryOfficeName_Wildcard(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_Wildcard(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_Wildcard(String mobile, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("mobile", mobile);
+    public void setPhysicalDeliveryOfficeName_Wildcard(String physicalDeliveryOfficeName, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_Regexp(String mobile) {
-        setMobile_Regexp(mobile, null);
+    public void setPhysicalDeliveryOfficeName_Regexp(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_Regexp(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_Regexp(String mobile, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("mobile", mobile);
+    public void setPhysicalDeliveryOfficeName_Regexp(String physicalDeliveryOfficeName, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_SpanTerm(String mobile) {
-        setMobile_SpanTerm("mobile", null);
+    public void setPhysicalDeliveryOfficeName_SpanTerm(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_SpanTerm("physicalDeliveryOfficeName", null);
     }
 
-    public void setMobile_SpanTerm(String mobile, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("mobile", mobile);
+    public void setPhysicalDeliveryOfficeName_SpanTerm(String physicalDeliveryOfficeName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_GreaterThan(String mobile) {
-        setMobile_GreaterThan(mobile, null);
+    public void setPhysicalDeliveryOfficeName_GreaterThan(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_GreaterThan(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_GreaterThan(String mobile, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = mobile;
-        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_GREATER_THAN, _value);
+    public void setPhysicalDeliveryOfficeName_GreaterThan(String physicalDeliveryOfficeName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = physicalDeliveryOfficeName;
+        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_LessThan(String mobile) {
-        setMobile_LessThan(mobile, null);
+    public void setPhysicalDeliveryOfficeName_LessThan(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_LessThan(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_LessThan(String mobile, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = mobile;
-        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_LESS_THAN, _value);
+    public void setPhysicalDeliveryOfficeName_LessThan(String physicalDeliveryOfficeName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = physicalDeliveryOfficeName;
+        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_GreaterEqual(String mobile) {
-        setMobile_GreaterEqual(mobile, null);
+    public void setPhysicalDeliveryOfficeName_GreaterEqual(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_GreaterEqual(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_GreaterEqual(String mobile, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = mobile;
-        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setPhysicalDeliveryOfficeName_GreaterEqual(String physicalDeliveryOfficeName,
+            ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = physicalDeliveryOfficeName;
+        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_LessEqual(String mobile) {
-        setMobile_LessEqual(mobile, null);
+    public void setPhysicalDeliveryOfficeName_LessEqual(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_LessEqual(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_LessEqual(String mobile, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = mobile;
-        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setPhysicalDeliveryOfficeName_LessEqual(String physicalDeliveryOfficeName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = physicalDeliveryOfficeName;
+        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_Exists() {
-        setMobile_Exists(null);
+    public void setPhysicalDeliveryOfficeName_Exists() {
+        setPhysicalDeliveryOfficeName_Exists(null);
     }
 
-    public void setMobile_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("mobile");
+    public void setPhysicalDeliveryOfficeName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("physicalDeliveryOfficeName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setMobile_CommonTerms(String mobile) {
-        setMobile_CommonTerms(mobile, null);
+    public void setPhysicalDeliveryOfficeName_CommonTerms(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_CommonTerms(physicalDeliveryOfficeName, null);
     }
 
-    public void setMobile_CommonTerms(String mobile, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("mobile", mobile);
+    public void setPhysicalDeliveryOfficeName_CommonTerms(String physicalDeliveryOfficeName,
+            ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_Mobile_Asc() {
-        regOBA("mobile");
+    public BsUserCQ addOrderBy_PhysicalDeliveryOfficeName_Asc() {
+        regOBA("physicalDeliveryOfficeName");
         return this;
     }
 
-    public BsUserCQ addOrderBy_Mobile_Desc() {
-        regOBD("mobile");
+    public BsUserCQ addOrderBy_PhysicalDeliveryOfficeName_Desc() {
+        regOBD("physicalDeliveryOfficeName");
         return this;
     }
 
-    public void setPostalAddress_Equal(String postalAddress) {
-        setPostalAddress_Term(postalAddress, null);
+    public void setPostOfficeBox_Equal(String postOfficeBox) {
+        setPostOfficeBox_Term(postOfficeBox, null);
     }
 
-    public void setPostalAddress_Equal(String postalAddress, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setPostalAddress_Term(postalAddress, opLambda);
+    public void setPostOfficeBox_Equal(String postOfficeBox, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setPostOfficeBox_Term(postOfficeBox, opLambda);
     }
 
-    public void setPostalAddress_Term(String postalAddress) {
-        setPostalAddress_Term(postalAddress, null);
+    public void setPostOfficeBox_Term(String postOfficeBox) {
+        setPostOfficeBox_Term(postOfficeBox, null);
     }
 
-    public void setPostalAddress_Term(String postalAddress, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("postalAddress", postalAddress);
+    public void setPostOfficeBox_Term(String postOfficeBox, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("postOfficeBox", postOfficeBox);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_NotEqual(String postalAddress) {
-        setPostalAddress_NotTerm(postalAddress, null);
+    public void setPostOfficeBox_NotEqual(String postOfficeBox) {
+        setPostOfficeBox_NotTerm(postOfficeBox, null);
     }
 
-    public void setPostalAddress_NotTerm(String postalAddress) {
-        setPostalAddress_NotTerm(postalAddress, null);
+    public void setPostOfficeBox_NotTerm(String postOfficeBox) {
+        setPostOfficeBox_NotTerm(postOfficeBox, null);
     }
 
-    public void setPostalAddress_NotEqual(String postalAddress, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setPostalAddress_NotTerm(postalAddress, opLambda);
+    public void setPostOfficeBox_NotEqual(String postOfficeBox, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPostOfficeBox_NotTerm(postOfficeBox, opLambda);
     }
 
-    public void setPostalAddress_NotTerm(String postalAddress, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setPostalAddress_Term(postalAddress), opLambda);
+    public void setPostOfficeBox_NotTerm(String postOfficeBox, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPostOfficeBox_Term(postOfficeBox), opLambda);
     }
 
-    public void setPostalAddress_Terms(Collection<String> postalAddressList) {
-        setPostalAddress_Terms(postalAddressList, null);
+    public void setPostOfficeBox_Terms(Collection<String> postOfficeBoxList) {
+        setPostOfficeBox_Terms(postOfficeBoxList, null);
     }
 
-    public void setPostalAddress_Terms(Collection<String> postalAddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("postalAddress", postalAddressList);
+    public void setPostOfficeBox_Terms(Collection<String> postOfficeBoxList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("postOfficeBox", postOfficeBoxList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_InScope(Collection<String> postalAddressList) {
-        setPostalAddress_Terms(postalAddressList, null);
+    public void setPostOfficeBox_InScope(Collection<String> postOfficeBoxList) {
+        setPostOfficeBox_Terms(postOfficeBoxList, null);
     }
 
-    public void setPostalAddress_InScope(Collection<String> postalAddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setPostalAddress_Terms(postalAddressList, opLambda);
+    public void setPostOfficeBox_InScope(Collection<String> postOfficeBoxList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setPostOfficeBox_Terms(postOfficeBoxList, opLambda);
     }
 
-    public void setPostalAddress_Match(String postalAddress) {
-        setPostalAddress_Match(postalAddress, null);
+    public void setPostOfficeBox_Match(String postOfficeBox) {
+        setPostOfficeBox_Match(postOfficeBox, null);
     }
 
-    public void setPostalAddress_Match(String postalAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("postalAddress", postalAddress);
+    public void setPostOfficeBox_Match(String postOfficeBox, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("postOfficeBox", postOfficeBox);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_MatchPhrase(String postalAddress) {
-        setPostalAddress_MatchPhrase(postalAddress, null);
+    public void setPostOfficeBox_MatchPhrase(String postOfficeBox) {
+        setPostOfficeBox_MatchPhrase(postOfficeBox, null);
     }
 
-    public void setPostalAddress_MatchPhrase(String postalAddress, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("postalAddress", postalAddress);
+    public void setPostOfficeBox_MatchPhrase(String postOfficeBox, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("postOfficeBox", postOfficeBox);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_MatchPhrasePrefix(String postalAddress) {
-        setPostalAddress_MatchPhrasePrefix(postalAddress, null);
+    public void setPostOfficeBox_MatchPhrasePrefix(String postOfficeBox) {
+        setPostOfficeBox_MatchPhrasePrefix(postOfficeBox, null);
     }
 
-    public void setPostalAddress_MatchPhrasePrefix(String postalAddress, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("postalAddress", postalAddress);
+    public void setPostOfficeBox_MatchPhrasePrefix(String postOfficeBox, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("postOfficeBox", postOfficeBox);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_Fuzzy(String postalAddress) {
-        setPostalAddress_Fuzzy(postalAddress, null);
+    public void setPostOfficeBox_Fuzzy(String postOfficeBox) {
+        setPostOfficeBox_Fuzzy(postOfficeBox, null);
     }
 
-    public void setPostalAddress_Fuzzy(String postalAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("postalAddress", postalAddress);
+    public void setPostOfficeBox_Fuzzy(String postOfficeBox, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("postOfficeBox", postOfficeBox);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_Prefix(String postalAddress) {
-        setPostalAddress_Prefix(postalAddress, null);
+    public void setPostOfficeBox_Prefix(String postOfficeBox) {
+        setPostOfficeBox_Prefix(postOfficeBox, null);
     }
 
-    public void setPostalAddress_Prefix(String postalAddress, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("postalAddress", postalAddress);
+    public void setPostOfficeBox_Prefix(String postOfficeBox, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("postOfficeBox", postOfficeBox);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_Wildcard(String postalAddress) {
-        setPostalAddress_Wildcard(postalAddress, null);
+    public void setPostOfficeBox_Wildcard(String postOfficeBox) {
+        setPostOfficeBox_Wildcard(postOfficeBox, null);
     }
 
-    public void setPostalAddress_Wildcard(String postalAddress, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("postalAddress", postalAddress);
+    public void setPostOfficeBox_Wildcard(String postOfficeBox, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("postOfficeBox", postOfficeBox);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_Regexp(String postalAddress) {
-        setPostalAddress_Regexp(postalAddress, null);
+    public void setPostOfficeBox_Regexp(String postOfficeBox) {
+        setPostOfficeBox_Regexp(postOfficeBox, null);
     }
 
-    public void setPostalAddress_Regexp(String postalAddress, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("postalAddress", postalAddress);
+    public void setPostOfficeBox_Regexp(String postOfficeBox, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("postOfficeBox", postOfficeBox);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_SpanTerm(String postalAddress) {
-        setPostalAddress_SpanTerm("postalAddress", null);
+    public void setPostOfficeBox_SpanTerm(String postOfficeBox) {
+        setPostOfficeBox_SpanTerm("postOfficeBox", null);
     }
 
-    public void setPostalAddress_SpanTerm(String postalAddress, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("postalAddress", postalAddress);
+    public void setPostOfficeBox_SpanTerm(String postOfficeBox, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("postOfficeBox", postOfficeBox);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_GreaterThan(String postalAddress) {
-        setPostalAddress_GreaterThan(postalAddress, null);
+    public void setPostOfficeBox_GreaterThan(String postOfficeBox) {
+        setPostOfficeBox_GreaterThan(postOfficeBox, null);
     }
 
-    public void setPostalAddress_GreaterThan(String postalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = postalAddress;
-        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_GREATER_THAN, _value);
+    public void setPostOfficeBox_GreaterThan(String postOfficeBox, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = postOfficeBox;
+        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_LessThan(String postalAddress) {
-        setPostalAddress_LessThan(postalAddress, null);
+    public void setPostOfficeBox_LessThan(String postOfficeBox) {
+        setPostOfficeBox_LessThan(postOfficeBox, null);
     }
 
-    public void setPostalAddress_LessThan(String postalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = postalAddress;
-        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_LESS_THAN, _value);
+    public void setPostOfficeBox_LessThan(String postOfficeBox, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = postOfficeBox;
+        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_GreaterEqual(String postalAddress) {
-        setPostalAddress_GreaterEqual(postalAddress, null);
+    public void setPostOfficeBox_GreaterEqual(String postOfficeBox) {
+        setPostOfficeBox_GreaterEqual(postOfficeBox, null);
     }
 
-    public void setPostalAddress_GreaterEqual(String postalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = postalAddress;
-        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setPostOfficeBox_GreaterEqual(String postOfficeBox, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = postOfficeBox;
+        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_LessEqual(String postalAddress) {
-        setPostalAddress_LessEqual(postalAddress, null);
+    public void setPostOfficeBox_LessEqual(String postOfficeBox) {
+        setPostOfficeBox_LessEqual(postOfficeBox, null);
     }
 
-    public void setPostalAddress_LessEqual(String postalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = postalAddress;
-        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setPostOfficeBox_LessEqual(String postOfficeBox, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = postOfficeBox;
+        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_Exists() {
-        setPostalAddress_Exists(null);
+    public void setPostOfficeBox_Exists() {
+        setPostOfficeBox_Exists(null);
     }
 
-    public void setPostalAddress_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("postalAddress");
+    public void setPostOfficeBox_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("postOfficeBox");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPostalAddress_CommonTerms(String postalAddress) {
-        setPostalAddress_CommonTerms(postalAddress, null);
+    public void setPostOfficeBox_CommonTerms(String postOfficeBox) {
+        setPostOfficeBox_CommonTerms(postOfficeBox, null);
     }
 
-    public void setPostalAddress_CommonTerms(String postalAddress, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("postalAddress", postalAddress);
+    public void setPostOfficeBox_CommonTerms(String postOfficeBox, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("postOfficeBox", postOfficeBox);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_PostalAddress_Asc() {
-        regOBA("postalAddress");
+    public BsUserCQ addOrderBy_PostOfficeBox_Asc() {
+        regOBA("postOfficeBox");
         return this;
     }
 
-    public BsUserCQ addOrderBy_PostalAddress_Desc() {
-        regOBD("postalAddress");
+    public BsUserCQ addOrderBy_PostOfficeBox_Desc() {
+        regOBD("postOfficeBox");
         return this;
     }
 
-    public void setCity_Equal(String city) {
-        setCity_Term(city, null);
+    public void setPostalAddress_Equal(String postalAddress) {
+        setPostalAddress_Term(postalAddress, null);
     }
 
-    public void setCity_Equal(String city, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setCity_Term(city, opLambda);
+    public void setPostalAddress_Equal(String postalAddress, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setPostalAddress_Term(postalAddress, opLambda);
     }
 
-    public void setCity_Term(String city) {
-        setCity_Term(city, null);
+    public void setPostalAddress_Term(String postalAddress) {
+        setPostalAddress_Term(postalAddress, null);
     }
 
-    public void setCity_Term(String city, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("city", city);
+    public void setPostalAddress_Term(String postalAddress, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("postalAddress", postalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_NotEqual(String city) {
-        setCity_NotTerm(city, null);
+    public void setPostalAddress_NotEqual(String postalAddress) {
+        setPostalAddress_NotTerm(postalAddress, null);
     }
 
-    public void setCity_NotTerm(String city) {
-        setCity_NotTerm(city, null);
+    public void setPostalAddress_NotTerm(String postalAddress) {
+        setPostalAddress_NotTerm(postalAddress, null);
     }
 
-    public void setCity_NotEqual(String city, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setCity_NotTerm(city, opLambda);
+    public void setPostalAddress_NotEqual(String postalAddress, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPostalAddress_NotTerm(postalAddress, opLambda);
     }
 
-    public void setCity_NotTerm(String city, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setCity_Term(city), opLambda);
+    public void setPostalAddress_NotTerm(String postalAddress, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPostalAddress_Term(postalAddress), opLambda);
     }
 
-    public void setCity_Terms(Collection<String> cityList) {
-        setCity_Terms(cityList, null);
+    public void setPostalAddress_Terms(Collection<String> postalAddressList) {
+        setPostalAddress_Terms(postalAddressList, null);
     }
 
-    public void setCity_Terms(Collection<String> cityList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("city", cityList);
+    public void setPostalAddress_Terms(Collection<String> postalAddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("postalAddress", postalAddressList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_InScope(Collection<String> cityList) {
-        setCity_Terms(cityList, null);
+    public void setPostalAddress_InScope(Collection<String> postalAddressList) {
+        setPostalAddress_Terms(postalAddressList, null);
     }
 
-    public void setCity_InScope(Collection<String> cityList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setCity_Terms(cityList, opLambda);
+    public void setPostalAddress_InScope(Collection<String> postalAddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setPostalAddress_Terms(postalAddressList, opLambda);
     }
 
-    public void setCity_Match(String city) {
-        setCity_Match(city, null);
+    public void setPostalAddress_Match(String postalAddress) {
+        setPostalAddress_Match(postalAddress, null);
     }
 
-    public void setCity_Match(String city, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("city", city);
+    public void setPostalAddress_Match(String postalAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("postalAddress", postalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_MatchPhrase(String city) {
-        setCity_MatchPhrase(city, null);
+    public void setPostalAddress_MatchPhrase(String postalAddress) {
+        setPostalAddress_MatchPhrase(postalAddress, null);
     }
 
-    public void setCity_MatchPhrase(String city, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("city", city);
+    public void setPostalAddress_MatchPhrase(String postalAddress, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("postalAddress", postalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_MatchPhrasePrefix(String city) {
-        setCity_MatchPhrasePrefix(city, null);
+    public void setPostalAddress_MatchPhrasePrefix(String postalAddress) {
+        setPostalAddress_MatchPhrasePrefix(postalAddress, null);
     }
 
-    public void setCity_MatchPhrasePrefix(String city, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("city", city);
+    public void setPostalAddress_MatchPhrasePrefix(String postalAddress, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("postalAddress", postalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_Fuzzy(String city) {
-        setCity_Fuzzy(city, null);
+    public void setPostalAddress_Fuzzy(String postalAddress) {
+        setPostalAddress_Fuzzy(postalAddress, null);
     }
 
-    public void setCity_Fuzzy(String city, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("city", city);
+    public void setPostalAddress_Fuzzy(String postalAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("postalAddress", postalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_Prefix(String city) {
-        setCity_Prefix(city, null);
+    public void setPostalAddress_Prefix(String postalAddress) {
+        setPostalAddress_Prefix(postalAddress, null);
     }
 
-    public void setCity_Prefix(String city, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("city", city);
+    public void setPostalAddress_Prefix(String postalAddress, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("postalAddress", postalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_Wildcard(String city) {
-        setCity_Wildcard(city, null);
+    public void setPostalAddress_Wildcard(String postalAddress) {
+        setPostalAddress_Wildcard(postalAddress, null);
     }
 
-    public void setCity_Wildcard(String city, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("city", city);
+    public void setPostalAddress_Wildcard(String postalAddress, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("postalAddress", postalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_Regexp(String city) {
-        setCity_Regexp(city, null);
+    public void setPostalAddress_Regexp(String postalAddress) {
+        setPostalAddress_Regexp(postalAddress, null);
     }
 
-    public void setCity_Regexp(String city, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("city", city);
+    public void setPostalAddress_Regexp(String postalAddress, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("postalAddress", postalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_SpanTerm(String city) {
-        setCity_SpanTerm("city", null);
+    public void setPostalAddress_SpanTerm(String postalAddress) {
+        setPostalAddress_SpanTerm("postalAddress", null);
     }
 
-    public void setCity_SpanTerm(String city, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("city", city);
+    public void setPostalAddress_SpanTerm(String postalAddress, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("postalAddress", postalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_GreaterThan(String city) {
-        setCity_GreaterThan(city, null);
+    public void setPostalAddress_GreaterThan(String postalAddress) {
+        setPostalAddress_GreaterThan(postalAddress, null);
     }
 
-    public void setCity_GreaterThan(String city, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = city;
-        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_GREATER_THAN, _value);
+    public void setPostalAddress_GreaterThan(String postalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = postalAddress;
+        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_LessThan(String city) {
-        setCity_LessThan(city, null);
+    public void setPostalAddress_LessThan(String postalAddress) {
+        setPostalAddress_LessThan(postalAddress, null);
     }
 
-    public void setCity_LessThan(String city, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = city;
-        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_LESS_THAN, _value);
+    public void setPostalAddress_LessThan(String postalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = postalAddress;
+        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_GreaterEqual(String city) {
-        setCity_GreaterEqual(city, null);
+    public void setPostalAddress_GreaterEqual(String postalAddress) {
+        setPostalAddress_GreaterEqual(postalAddress, null);
     }
 
-    public void setCity_GreaterEqual(String city, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = city;
-        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setPostalAddress_GreaterEqual(String postalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = postalAddress;
+        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_LessEqual(String city) {
-        setCity_LessEqual(city, null);
+    public void setPostalAddress_LessEqual(String postalAddress) {
+        setPostalAddress_LessEqual(postalAddress, null);
     }
 
-    public void setCity_LessEqual(String city, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = city;
-        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_LESS_EQUAL, _value);
-        if (opLambda != null) {
+    public void setPostalAddress_LessEqual(String postalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = postalAddress;
+        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_Exists() {
-        setCity_Exists(null);
+    public void setPostalAddress_Exists() {
+        setPostalAddress_Exists(null);
     }
 
-    public void setCity_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("city");
+    public void setPostalAddress_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("postalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setCity_CommonTerms(String city) {
-        setCity_CommonTerms(city, null);
+    public void setPostalAddress_CommonTerms(String postalAddress) {
+        setPostalAddress_CommonTerms(postalAddress, null);
     }
 
-    public void setCity_CommonTerms(String city, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("city", city);
+    public void setPostalAddress_CommonTerms(String postalAddress, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("postalAddress", postalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_City_Asc() {
-        regOBA("city");
+    public BsUserCQ addOrderBy_PostalAddress_Asc() {
+        regOBA("postalAddress");
         return this;
     }
 
-    public BsUserCQ addOrderBy_City_Desc() {
-        regOBD("city");
+    public BsUserCQ addOrderBy_PostalAddress_Desc() {
+        regOBD("postalAddress");
         return this;
     }
 
-    public void setTeletexTerminalIdentifier_Equal(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_Term(teletexTerminalIdentifier, null);
+    public void setPostalCode_Equal(String postalCode) {
+        setPostalCode_Term(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_Equal(String teletexTerminalIdentifier, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setTeletexTerminalIdentifier_Term(teletexTerminalIdentifier, opLambda);
+    public void setPostalCode_Equal(String postalCode, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setPostalCode_Term(postalCode, opLambda);
     }
 
-    public void setTeletexTerminalIdentifier_Term(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_Term(teletexTerminalIdentifier, null);
+    public void setPostalCode_Term(String postalCode) {
+        setPostalCode_Term(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_Term(String teletexTerminalIdentifier, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+    public void setPostalCode_Term(String postalCode, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("postalCode", postalCode);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_NotEqual(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_NotTerm(teletexTerminalIdentifier, null);
+    public void setPostalCode_NotEqual(String postalCode) {
+        setPostalCode_NotTerm(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_NotTerm(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_NotTerm(teletexTerminalIdentifier, null);
+    public void setPostalCode_NotTerm(String postalCode) {
+        setPostalCode_NotTerm(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_NotEqual(String teletexTerminalIdentifier, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setTeletexTerminalIdentifier_NotTerm(teletexTerminalIdentifier, opLambda);
+    public void setPostalCode_NotEqual(String postalCode, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPostalCode_NotTerm(postalCode, opLambda);
     }
 
-    public void setTeletexTerminalIdentifier_NotTerm(String teletexTerminalIdentifier, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setTeletexTerminalIdentifier_Term(teletexTerminalIdentifier), opLambda);
+    public void setPostalCode_NotTerm(String postalCode, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPostalCode_Term(postalCode), opLambda);
     }
 
-    public void setTeletexTerminalIdentifier_Terms(Collection<String> teletexTerminalIdentifierList) {
-        setTeletexTerminalIdentifier_Terms(teletexTerminalIdentifierList, null);
+    public void setPostalCode_Terms(Collection<String> postalCodeList) {
+        setPostalCode_Terms(postalCodeList, null);
     }
 
-    public void setTeletexTerminalIdentifier_Terms(Collection<String> teletexTerminalIdentifierList,
-            ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("teletexTerminalIdentifier", teletexTerminalIdentifierList);
+    public void setPostalCode_Terms(Collection<String> postalCodeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("postalCode", postalCodeList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_InScope(Collection<String> teletexTerminalIdentifierList) {
-        setTeletexTerminalIdentifier_Terms(teletexTerminalIdentifierList, null);
+    public void setPostalCode_InScope(Collection<String> postalCodeList) {
+        setPostalCode_Terms(postalCodeList, null);
     }
 
-    public void setTeletexTerminalIdentifier_InScope(Collection<String> teletexTerminalIdentifierList,
-            ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setTeletexTerminalIdentifier_Terms(teletexTerminalIdentifierList, opLambda);
+    public void setPostalCode_InScope(Collection<String> postalCodeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setPostalCode_Terms(postalCodeList, opLambda);
     }
 
-    public void setTeletexTerminalIdentifier_Match(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_Match(teletexTerminalIdentifier, null);
+    public void setPostalCode_Match(String postalCode) {
+        setPostalCode_Match(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_Match(String teletexTerminalIdentifier, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+    public void setPostalCode_Match(String postalCode, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("postalCode", postalCode);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_MatchPhrase(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_MatchPhrase(teletexTerminalIdentifier, null);
+    public void setPostalCode_MatchPhrase(String postalCode) {
+        setPostalCode_MatchPhrase(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_MatchPhrase(String teletexTerminalIdentifier,
-            ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+    public void setPostalCode_MatchPhrase(String postalCode, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("postalCode", postalCode);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_MatchPhrasePrefix(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_MatchPhrasePrefix(teletexTerminalIdentifier, null);
+    public void setPostalCode_MatchPhrasePrefix(String postalCode) {
+        setPostalCode_MatchPhrasePrefix(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_MatchPhrasePrefix(String teletexTerminalIdentifier,
-            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+    public void setPostalCode_MatchPhrasePrefix(String postalCode, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("postalCode", postalCode);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_Fuzzy(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_Fuzzy(teletexTerminalIdentifier, null);
+    public void setPostalCode_Fuzzy(String postalCode) {
+        setPostalCode_Fuzzy(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_Fuzzy(String teletexTerminalIdentifier, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+    public void setPostalCode_Fuzzy(String postalCode, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("postalCode", postalCode);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_Prefix(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_Prefix(teletexTerminalIdentifier, null);
+    public void setPostalCode_Prefix(String postalCode) {
+        setPostalCode_Prefix(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_Prefix(String teletexTerminalIdentifier, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+    public void setPostalCode_Prefix(String postalCode, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("postalCode", postalCode);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_Wildcard(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_Wildcard(teletexTerminalIdentifier, null);
+    public void setPostalCode_Wildcard(String postalCode) {
+        setPostalCode_Wildcard(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_Wildcard(String teletexTerminalIdentifier, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+    public void setPostalCode_Wildcard(String postalCode, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("postalCode", postalCode);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_Regexp(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_Regexp(teletexTerminalIdentifier, null);
+    public void setPostalCode_Regexp(String postalCode) {
+        setPostalCode_Regexp(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_Regexp(String teletexTerminalIdentifier, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+    public void setPostalCode_Regexp(String postalCode, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("postalCode", postalCode);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_SpanTerm(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_SpanTerm("teletexTerminalIdentifier", null);
+    public void setPostalCode_SpanTerm(String postalCode) {
+        setPostalCode_SpanTerm("postalCode", null);
     }
 
-    public void setTeletexTerminalIdentifier_SpanTerm(String teletexTerminalIdentifier, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+    public void setPostalCode_SpanTerm(String postalCode, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("postalCode", postalCode);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_GreaterThan(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_GreaterThan(teletexTerminalIdentifier, null);
+    public void setPostalCode_GreaterThan(String postalCode) {
+        setPostalCode_GreaterThan(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_GreaterThan(String teletexTerminalIdentifier, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = teletexTerminalIdentifier;
-        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_GREATER_THAN, _value);
+    public void setPostalCode_GreaterThan(String postalCode, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = postalCode;
+        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_LessThan(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_LessThan(teletexTerminalIdentifier, null);
+    public void setPostalCode_LessThan(String postalCode) {
+        setPostalCode_LessThan(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_LessThan(String teletexTerminalIdentifier, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = teletexTerminalIdentifier;
-        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_LESS_THAN, _value);
+    public void setPostalCode_LessThan(String postalCode, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = postalCode;
+        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_GreaterEqual(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_GreaterEqual(teletexTerminalIdentifier, null);
+    public void setPostalCode_GreaterEqual(String postalCode) {
+        setPostalCode_GreaterEqual(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_GreaterEqual(String teletexTerminalIdentifier, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = teletexTerminalIdentifier;
-        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setPostalCode_GreaterEqual(String postalCode, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = postalCode;
+        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_LessEqual(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_LessEqual(teletexTerminalIdentifier, null);
+    public void setPostalCode_LessEqual(String postalCode) {
+        setPostalCode_LessEqual(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_LessEqual(String teletexTerminalIdentifier, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = teletexTerminalIdentifier;
-        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setPostalCode_LessEqual(String postalCode, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = postalCode;
+        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_Exists() {
-        setTeletexTerminalIdentifier_Exists(null);
+    public void setPostalCode_Exists() {
+        setPostalCode_Exists(null);
     }
 
-    public void setTeletexTerminalIdentifier_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("teletexTerminalIdentifier");
+    public void setPostalCode_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("postalCode");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setTeletexTerminalIdentifier_CommonTerms(String teletexTerminalIdentifier) {
-        setTeletexTerminalIdentifier_CommonTerms(teletexTerminalIdentifier, null);
+    public void setPostalCode_CommonTerms(String postalCode) {
+        setPostalCode_CommonTerms(postalCode, null);
     }
 
-    public void setTeletexTerminalIdentifier_CommonTerms(String teletexTerminalIdentifier,
-            ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+    public void setPostalCode_CommonTerms(String postalCode, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("postalCode", postalCode);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_TeletexTerminalIdentifier_Asc() {
-        regOBA("teletexTerminalIdentifier");
+    public BsUserCQ addOrderBy_PostalCode_Asc() {
+        regOBA("postalCode");
         return this;
     }
 
-    public BsUserCQ addOrderBy_TeletexTerminalIdentifier_Desc() {
-        regOBD("teletexTerminalIdentifier");
+    public BsUserCQ addOrderBy_PostalCode_Desc() {
+        regOBD("postalCode");
         return this;
     }
 
-    public void setX121Address_Equal(String x121Address) {
-        setX121Address_Term(x121Address, null);
+    public void setPreferredLanguage_Equal(String preferredLanguage) {
+        setPreferredLanguage_Term(preferredLanguage, null);
     }
 
-    public void setX121Address_Equal(String x121Address, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setX121Address_Term(x121Address, opLambda);
+    public void setPreferredLanguage_Equal(String preferredLanguage, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setPreferredLanguage_Term(preferredLanguage, opLambda);
     }
 
-    public void setX121Address_Term(String x121Address) {
-        setX121Address_Term(x121Address, null);
+    public void setPreferredLanguage_Term(String preferredLanguage) {
+        setPreferredLanguage_Term(preferredLanguage, null);
     }
 
-    public void setX121Address_Term(String x121Address, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("x121Address", x121Address);
+    public void setPreferredLanguage_Term(String preferredLanguage, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("preferredLanguage", preferredLanguage);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_NotEqual(String x121Address) {
-        setX121Address_NotTerm(x121Address, null);
+    public void setPreferredLanguage_NotEqual(String preferredLanguage) {
+        setPreferredLanguage_NotTerm(preferredLanguage, null);
     }
 
-    public void setX121Address_NotTerm(String x121Address) {
-        setX121Address_NotTerm(x121Address, null);
+    public void setPreferredLanguage_NotTerm(String preferredLanguage) {
+        setPreferredLanguage_NotTerm(preferredLanguage, null);
     }
 
-    public void setX121Address_NotEqual(String x121Address, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setX121Address_NotTerm(x121Address, opLambda);
+    public void setPreferredLanguage_NotEqual(String preferredLanguage, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPreferredLanguage_NotTerm(preferredLanguage, opLambda);
     }
 
-    public void setX121Address_NotTerm(String x121Address, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setX121Address_Term(x121Address), opLambda);
+    public void setPreferredLanguage_NotTerm(String preferredLanguage, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPreferredLanguage_Term(preferredLanguage), opLambda);
     }
 
-    public void setX121Address_Terms(Collection<String> x121AddressList) {
-        setX121Address_Terms(x121AddressList, null);
+    public void setPreferredLanguage_Terms(Collection<String> preferredLanguageList) {
+        setPreferredLanguage_Terms(preferredLanguageList, null);
     }
 
-    public void setX121Address_Terms(Collection<String> x121AddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("x121Address", x121AddressList);
+    public void setPreferredLanguage_Terms(Collection<String> preferredLanguageList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("preferredLanguage", preferredLanguageList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_InScope(Collection<String> x121AddressList) {
-        setX121Address_Terms(x121AddressList, null);
+    public void setPreferredLanguage_InScope(Collection<String> preferredLanguageList) {
+        setPreferredLanguage_Terms(preferredLanguageList, null);
     }
 
-    public void setX121Address_InScope(Collection<String> x121AddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setX121Address_Terms(x121AddressList, opLambda);
-    }
+    public void setPreferredLanguage_InScope(Collection<String> preferredLanguageList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setPreferredLanguage_Terms(preferredLanguageList, opLambda);
+    }
 
-    public void setX121Address_Match(String x121Address) {
-        setX121Address_Match(x121Address, null);
+    public void setPreferredLanguage_Match(String preferredLanguage) {
+        setPreferredLanguage_Match(preferredLanguage, null);
     }
 
-    public void setX121Address_Match(String x121Address, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("x121Address", x121Address);
+    public void setPreferredLanguage_Match(String preferredLanguage, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("preferredLanguage", preferredLanguage);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_MatchPhrase(String x121Address) {
-        setX121Address_MatchPhrase(x121Address, null);
+    public void setPreferredLanguage_MatchPhrase(String preferredLanguage) {
+        setPreferredLanguage_MatchPhrase(preferredLanguage, null);
     }
 
-    public void setX121Address_MatchPhrase(String x121Address, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("x121Address", x121Address);
+    public void setPreferredLanguage_MatchPhrase(String preferredLanguage, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("preferredLanguage", preferredLanguage);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_MatchPhrasePrefix(String x121Address) {
-        setX121Address_MatchPhrasePrefix(x121Address, null);
+    public void setPreferredLanguage_MatchPhrasePrefix(String preferredLanguage) {
+        setPreferredLanguage_MatchPhrasePrefix(preferredLanguage, null);
     }
 
-    public void setX121Address_MatchPhrasePrefix(String x121Address, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("x121Address", x121Address);
+    public void setPreferredLanguage_MatchPhrasePrefix(String preferredLanguage, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("preferredLanguage", preferredLanguage);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_Fuzzy(String x121Address) {
-        setX121Address_Fuzzy(x121Address, null);
+    public void setPreferredLanguage_Fuzzy(String preferredLanguage) {
+        setPreferredLanguage_Fuzzy(preferredLanguage, null);
     }
 
-    public void setX121Address_Fuzzy(String x121Address, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("x121Address", x121Address);
+    public void setPreferredLanguage_Fuzzy(String preferredLanguage, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("preferredLanguage", preferredLanguage);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_Prefix(String x121Address) {
-        setX121Address_Prefix(x121Address, null);
+    public void setPreferredLanguage_Prefix(String preferredLanguage) {
+        setPreferredLanguage_Prefix(preferredLanguage, null);
     }
 
-    public void setX121Address_Prefix(String x121Address, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("x121Address", x121Address);
+    public void setPreferredLanguage_Prefix(String preferredLanguage, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("preferredLanguage", preferredLanguage);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_Wildcard(String x121Address) {
-        setX121Address_Wildcard(x121Address, null);
+    public void setPreferredLanguage_Wildcard(String preferredLanguage) {
+        setPreferredLanguage_Wildcard(preferredLanguage, null);
     }
 
-    public void setX121Address_Wildcard(String x121Address, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("x121Address", x121Address);
+    public void setPreferredLanguage_Wildcard(String preferredLanguage, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("preferredLanguage", preferredLanguage);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_Regexp(String x121Address) {
-        setX121Address_Regexp(x121Address, null);
+    public void setPreferredLanguage_Regexp(String preferredLanguage) {
+        setPreferredLanguage_Regexp(preferredLanguage, null);
     }
 
-    public void setX121Address_Regexp(String x121Address, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("x121Address", x121Address);
+    public void setPreferredLanguage_Regexp(String preferredLanguage, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("preferredLanguage", preferredLanguage);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_SpanTerm(String x121Address) {
-        setX121Address_SpanTerm("x121Address", null);
+    public void setPreferredLanguage_SpanTerm(String preferredLanguage) {
+        setPreferredLanguage_SpanTerm("preferredLanguage", null);
     }
 
-    public void setX121Address_SpanTerm(String x121Address, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("x121Address", x121Address);
+    public void setPreferredLanguage_SpanTerm(String preferredLanguage, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("preferredLanguage", preferredLanguage);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_GreaterThan(String x121Address) {
-        setX121Address_GreaterThan(x121Address, null);
+    public void setPreferredLanguage_GreaterThan(String preferredLanguage) {
+        setPreferredLanguage_GreaterThan(preferredLanguage, null);
     }
 
-    public void setX121Address_GreaterThan(String x121Address, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = x121Address;
-        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_GREATER_THAN, _value);
+    public void setPreferredLanguage_GreaterThan(String preferredLanguage, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = preferredLanguage;
+        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_LessThan(String x121Address) {
-        setX121Address_LessThan(x121Address, null);
+    public void setPreferredLanguage_LessThan(String preferredLanguage) {
+        setPreferredLanguage_LessThan(preferredLanguage, null);
     }
 
-    public void setX121Address_LessThan(String x121Address, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = x121Address;
-        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_LESS_THAN, _value);
+    public void setPreferredLanguage_LessThan(String preferredLanguage, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = preferredLanguage;
+        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_GreaterEqual(String x121Address) {
-        setX121Address_GreaterEqual(x121Address, null);
+    public void setPreferredLanguage_GreaterEqual(String preferredLanguage) {
+        setPreferredLanguage_GreaterEqual(preferredLanguage, null);
     }
 
-    public void setX121Address_GreaterEqual(String x121Address, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = x121Address;
-        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setPreferredLanguage_GreaterEqual(String preferredLanguage, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = preferredLanguage;
+        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_LessEqual(String x121Address) {
-        setX121Address_LessEqual(x121Address, null);
+    public void setPreferredLanguage_LessEqual(String preferredLanguage) {
+        setPreferredLanguage_LessEqual(preferredLanguage, null);
     }
 
-    public void setX121Address_LessEqual(String x121Address, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = x121Address;
-        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setPreferredLanguage_LessEqual(String preferredLanguage, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = preferredLanguage;
+        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_Exists() {
-        setX121Address_Exists(null);
+    public void setPreferredLanguage_Exists() {
+        setPreferredLanguage_Exists(null);
     }
 
-    public void setX121Address_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("x121Address");
+    public void setPreferredLanguage_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("preferredLanguage");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setX121Address_CommonTerms(String x121Address) {
-        setX121Address_CommonTerms(x121Address, null);
+    public void setPreferredLanguage_CommonTerms(String preferredLanguage) {
+        setPreferredLanguage_CommonTerms(preferredLanguage, null);
     }
 
-    public void setX121Address_CommonTerms(String x121Address, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("x121Address", x121Address);
+    public void setPreferredLanguage_CommonTerms(String preferredLanguage, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("preferredLanguage", preferredLanguage);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_X121Address_Asc() {
-        regOBA("x121Address");
+    public BsUserCQ addOrderBy_PreferredLanguage_Asc() {
+        regOBA("preferredLanguage");
         return this;
     }
 
-    public BsUserCQ addOrderBy_X121Address_Desc() {
-        regOBD("x121Address");
+    public BsUserCQ addOrderBy_PreferredLanguage_Desc() {
+        regOBD("preferredLanguage");
         return this;
     }
 
-    public void setBusinessCategory_Equal(String businessCategory) {
-        setBusinessCategory_Term(businessCategory, null);
+    public void setRegisteredAddress_Equal(String registeredAddress) {
+        setRegisteredAddress_Term(registeredAddress, null);
     }
 
-    public void setBusinessCategory_Equal(String businessCategory, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setBusinessCategory_Term(businessCategory, opLambda);
+    public void setRegisteredAddress_Equal(String registeredAddress, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setRegisteredAddress_Term(registeredAddress, opLambda);
     }
 
-    public void setBusinessCategory_Term(String businessCategory) {
-        setBusinessCategory_Term(businessCategory, null);
+    public void setRegisteredAddress_Term(String registeredAddress) {
+        setRegisteredAddress_Term(registeredAddress, null);
     }
 
-    public void setBusinessCategory_Term(String businessCategory, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("businessCategory", businessCategory);
+    public void setRegisteredAddress_Term(String registeredAddress, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("registeredAddress", registeredAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_NotEqual(String businessCategory) {
-        setBusinessCategory_NotTerm(businessCategory, null);
+    public void setRegisteredAddress_NotEqual(String registeredAddress) {
+        setRegisteredAddress_NotTerm(registeredAddress, null);
     }
 
-    public void setBusinessCategory_NotTerm(String businessCategory) {
-        setBusinessCategory_NotTerm(businessCategory, null);
+    public void setRegisteredAddress_NotTerm(String registeredAddress) {
+        setRegisteredAddress_NotTerm(registeredAddress, null);
     }
 
-    public void setBusinessCategory_NotEqual(String businessCategory, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setBusinessCategory_NotTerm(businessCategory, opLambda);
+    public void setRegisteredAddress_NotEqual(String registeredAddress, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setRegisteredAddress_NotTerm(registeredAddress, opLambda);
     }
 
-    public void setBusinessCategory_NotTerm(String businessCategory, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setBusinessCategory_Term(businessCategory), opLambda);
+    public void setRegisteredAddress_NotTerm(String registeredAddress, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setRegisteredAddress_Term(registeredAddress), opLambda);
     }
 
-    public void setBusinessCategory_Terms(Collection<String> businessCategoryList) {
-        setBusinessCategory_Terms(businessCategoryList, null);
+    public void setRegisteredAddress_Terms(Collection<String> registeredAddressList) {
+        setRegisteredAddress_Terms(registeredAddressList, null);
     }
 
-    public void setBusinessCategory_Terms(Collection<String> businessCategoryList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("businessCategory", businessCategoryList);
+    public void setRegisteredAddress_Terms(Collection<String> registeredAddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("registeredAddress", registeredAddressList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_InScope(Collection<String> businessCategoryList) {
-        setBusinessCategory_Terms(businessCategoryList, null);
+    public void setRegisteredAddress_InScope(Collection<String> registeredAddressList) {
+        setRegisteredAddress_Terms(registeredAddressList, null);
     }
 
-    public void setBusinessCategory_InScope(Collection<String> businessCategoryList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setBusinessCategory_Terms(businessCategoryList, opLambda);
+    public void setRegisteredAddress_InScope(Collection<String> registeredAddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setRegisteredAddress_Terms(registeredAddressList, opLambda);
     }
 
-    public void setBusinessCategory_Match(String businessCategory) {
-        setBusinessCategory_Match(businessCategory, null);
+    public void setRegisteredAddress_Match(String registeredAddress) {
+        setRegisteredAddress_Match(registeredAddress, null);
     }
 
-    public void setBusinessCategory_Match(String businessCategory, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("businessCategory", businessCategory);
+    public void setRegisteredAddress_Match(String registeredAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("registeredAddress", registeredAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_MatchPhrase(String businessCategory) {
-        setBusinessCategory_MatchPhrase(businessCategory, null);
+    public void setRegisteredAddress_MatchPhrase(String registeredAddress) {
+        setRegisteredAddress_MatchPhrase(registeredAddress, null);
     }
 
-    public void setBusinessCategory_MatchPhrase(String businessCategory, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("businessCategory", businessCategory);
+    public void setRegisteredAddress_MatchPhrase(String registeredAddress, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("registeredAddress", registeredAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_MatchPhrasePrefix(String businessCategory) {
-        setBusinessCategory_MatchPhrasePrefix(businessCategory, null);
+    public void setRegisteredAddress_MatchPhrasePrefix(String registeredAddress) {
+        setRegisteredAddress_MatchPhrasePrefix(registeredAddress, null);
     }
 
-    public void setBusinessCategory_MatchPhrasePrefix(String businessCategory, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("businessCategory", businessCategory);
+    public void setRegisteredAddress_MatchPhrasePrefix(String registeredAddress, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("registeredAddress", registeredAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_Fuzzy(String businessCategory) {
-        setBusinessCategory_Fuzzy(businessCategory, null);
+    public void setRegisteredAddress_Fuzzy(String registeredAddress) {
+        setRegisteredAddress_Fuzzy(registeredAddress, null);
     }
 
-    public void setBusinessCategory_Fuzzy(String businessCategory, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("businessCategory", businessCategory);
+    public void setRegisteredAddress_Fuzzy(String registeredAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("registeredAddress", registeredAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_Prefix(String businessCategory) {
-        setBusinessCategory_Prefix(businessCategory, null);
+    public void setRegisteredAddress_Prefix(String registeredAddress) {
+        setRegisteredAddress_Prefix(registeredAddress, null);
     }
 
-    public void setBusinessCategory_Prefix(String businessCategory, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("businessCategory", businessCategory);
+    public void setRegisteredAddress_Prefix(String registeredAddress, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("registeredAddress", registeredAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_Wildcard(String businessCategory) {
-        setBusinessCategory_Wildcard(businessCategory, null);
+    public void setRegisteredAddress_Wildcard(String registeredAddress) {
+        setRegisteredAddress_Wildcard(registeredAddress, null);
     }
 
-    public void setBusinessCategory_Wildcard(String businessCategory, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("businessCategory", businessCategory);
+    public void setRegisteredAddress_Wildcard(String registeredAddress, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("registeredAddress", registeredAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_Regexp(String businessCategory) {
-        setBusinessCategory_Regexp(businessCategory, null);
+    public void setRegisteredAddress_Regexp(String registeredAddress) {
+        setRegisteredAddress_Regexp(registeredAddress, null);
     }
 
-    public void setBusinessCategory_Regexp(String businessCategory, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("businessCategory", businessCategory);
+    public void setRegisteredAddress_Regexp(String registeredAddress, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("registeredAddress", registeredAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_SpanTerm(String businessCategory) {
-        setBusinessCategory_SpanTerm("businessCategory", null);
+    public void setRegisteredAddress_SpanTerm(String registeredAddress) {
+        setRegisteredAddress_SpanTerm("registeredAddress", null);
     }
 
-    public void setBusinessCategory_SpanTerm(String businessCategory, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("businessCategory", businessCategory);
+    public void setRegisteredAddress_SpanTerm(String registeredAddress, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("registeredAddress", registeredAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_GreaterThan(String businessCategory) {
-        setBusinessCategory_GreaterThan(businessCategory, null);
+    public void setRegisteredAddress_GreaterThan(String registeredAddress) {
+        setRegisteredAddress_GreaterThan(registeredAddress, null);
     }
 
-    public void setBusinessCategory_GreaterThan(String businessCategory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = businessCategory;
-        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_GREATER_THAN, _value);
+    public void setRegisteredAddress_GreaterThan(String registeredAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = registeredAddress;
+        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_LessThan(String businessCategory) {
-        setBusinessCategory_LessThan(businessCategory, null);
-    }
+    public void setRegisteredAddress_LessThan(String registeredAddress) {
+        setRegisteredAddress_LessThan(registeredAddress, null);
+    }
 
-    public void setBusinessCategory_LessThan(String businessCategory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = businessCategory;
-        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_LESS_THAN, _value);
+    public void setRegisteredAddress_LessThan(String registeredAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = registeredAddress;
+        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_GreaterEqual(String businessCategory) {
-        setBusinessCategory_GreaterEqual(businessCategory, null);
+    public void setRegisteredAddress_GreaterEqual(String registeredAddress) {
+        setRegisteredAddress_GreaterEqual(registeredAddress, null);
     }
 
-    public void setBusinessCategory_GreaterEqual(String businessCategory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = businessCategory;
-        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setRegisteredAddress_GreaterEqual(String registeredAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = registeredAddress;
+        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_LessEqual(String businessCategory) {
-        setBusinessCategory_LessEqual(businessCategory, null);
+    public void setRegisteredAddress_LessEqual(String registeredAddress) {
+        setRegisteredAddress_LessEqual(registeredAddress, null);
     }
 
-    public void setBusinessCategory_LessEqual(String businessCategory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = businessCategory;
-        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setRegisteredAddress_LessEqual(String registeredAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = registeredAddress;
+        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_Exists() {
-        setBusinessCategory_Exists(null);
+    public void setRegisteredAddress_Exists() {
+        setRegisteredAddress_Exists(null);
     }
 
-    public void setBusinessCategory_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("businessCategory");
+    public void setRegisteredAddress_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("registeredAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setBusinessCategory_CommonTerms(String businessCategory) {
-        setBusinessCategory_CommonTerms(businessCategory, null);
+    public void setRegisteredAddress_CommonTerms(String registeredAddress) {
+        setRegisteredAddress_CommonTerms(registeredAddress, null);
     }
 
-    public void setBusinessCategory_CommonTerms(String businessCategory, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("businessCategory", businessCategory);
+    public void setRegisteredAddress_CommonTerms(String registeredAddress, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("registeredAddress", registeredAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_BusinessCategory_Asc() {
-        regOBA("businessCategory");
+    public BsUserCQ addOrderBy_RegisteredAddress_Asc() {
+        regOBA("registeredAddress");
         return this;
     }
 
-    public BsUserCQ addOrderBy_BusinessCategory_Desc() {
-        regOBD("businessCategory");
+    public BsUserCQ addOrderBy_RegisteredAddress_Desc() {
+        regOBD("registeredAddress");
         return this;
     }
 
-    public void setRegisteredAddress_Equal(String registeredAddress) {
-        setRegisteredAddress_Term(registeredAddress, null);
+    public void setRoles_Equal(String roles) {
+        setRoles_Term(roles, null);
     }
 
-    public void setRegisteredAddress_Equal(String registeredAddress, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setRegisteredAddress_Term(registeredAddress, opLambda);
+    public void setRoles_Equal(String roles, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setRoles_Term(roles, opLambda);
     }
 
-    public void setRegisteredAddress_Term(String registeredAddress) {
-        setRegisteredAddress_Term(registeredAddress, null);
+    public void setRoles_Term(String roles) {
+        setRoles_Term(roles, null);
     }
 
-    public void setRegisteredAddress_Term(String registeredAddress, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("registeredAddress", registeredAddress);
+    public void setRoles_Term(String roles, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_NotEqual(String registeredAddress) {
-        setRegisteredAddress_NotTerm(registeredAddress, null);
+    public void setRoles_NotEqual(String roles) {
+        setRoles_NotTerm(roles, null);
     }
 
-    public void setRegisteredAddress_NotTerm(String registeredAddress) {
-        setRegisteredAddress_NotTerm(registeredAddress, null);
+    public void setRoles_NotTerm(String roles) {
+        setRoles_NotTerm(roles, null);
     }
 
-    public void setRegisteredAddress_NotEqual(String registeredAddress, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setRegisteredAddress_NotTerm(registeredAddress, opLambda);
+    public void setRoles_NotEqual(String roles, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setRoles_NotTerm(roles, opLambda);
     }
 
-    public void setRegisteredAddress_NotTerm(String registeredAddress, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setRegisteredAddress_Term(registeredAddress), opLambda);
+    public void setRoles_NotTerm(String roles, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setRoles_Term(roles), opLambda);
     }
 
-    public void setRegisteredAddress_Terms(Collection<String> registeredAddressList) {
-        setRegisteredAddress_Terms(registeredAddressList, null);
+    public void setRoles_Terms(Collection<String> rolesList) {
+        setRoles_Terms(rolesList, null);
     }
 
-    public void setRegisteredAddress_Terms(Collection<String> registeredAddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("registeredAddress", registeredAddressList);
+    public void setRoles_Terms(Collection<String> rolesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("roles", rolesList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_InScope(Collection<String> registeredAddressList) {
-        setRegisteredAddress_Terms(registeredAddressList, null);
+    public void setRoles_InScope(Collection<String> rolesList) {
+        setRoles_Terms(rolesList, null);
     }
 
-    public void setRegisteredAddress_InScope(Collection<String> registeredAddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setRegisteredAddress_Terms(registeredAddressList, opLambda);
+    public void setRoles_InScope(Collection<String> rolesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setRoles_Terms(rolesList, opLambda);
     }
 
-    public void setRegisteredAddress_Match(String registeredAddress) {
-        setRegisteredAddress_Match(registeredAddress, null);
+    public void setRoles_Match(String roles) {
+        setRoles_Match(roles, null);
     }
 
-    public void setRegisteredAddress_Match(String registeredAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("registeredAddress", registeredAddress);
+    public void setRoles_Match(String roles, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_MatchPhrase(String registeredAddress) {
-        setRegisteredAddress_MatchPhrase(registeredAddress, null);
+    public void setRoles_MatchPhrase(String roles) {
+        setRoles_MatchPhrase(roles, null);
     }
 
-    public void setRegisteredAddress_MatchPhrase(String registeredAddress, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("registeredAddress", registeredAddress);
+    public void setRoles_MatchPhrase(String roles, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_MatchPhrasePrefix(String registeredAddress) {
-        setRegisteredAddress_MatchPhrasePrefix(registeredAddress, null);
+    public void setRoles_MatchPhrasePrefix(String roles) {
+        setRoles_MatchPhrasePrefix(roles, null);
     }
 
-    public void setRegisteredAddress_MatchPhrasePrefix(String registeredAddress, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("registeredAddress", registeredAddress);
+    public void setRoles_MatchPhrasePrefix(String roles, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_Fuzzy(String registeredAddress) {
-        setRegisteredAddress_Fuzzy(registeredAddress, null);
+    public void setRoles_Fuzzy(String roles) {
+        setRoles_Fuzzy(roles, null);
     }
 
-    public void setRegisteredAddress_Fuzzy(String registeredAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("registeredAddress", registeredAddress);
+    public void setRoles_Fuzzy(String roles, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_Prefix(String registeredAddress) {
-        setRegisteredAddress_Prefix(registeredAddress, null);
+    public void setRoles_Prefix(String roles) {
+        setRoles_Prefix(roles, null);
     }
 
-    public void setRegisteredAddress_Prefix(String registeredAddress, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("registeredAddress", registeredAddress);
+    public void setRoles_Prefix(String roles, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_Wildcard(String registeredAddress) {
-        setRegisteredAddress_Wildcard(registeredAddress, null);
+    public void setRoles_Wildcard(String roles) {
+        setRoles_Wildcard(roles, null);
     }
 
-    public void setRegisteredAddress_Wildcard(String registeredAddress, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("registeredAddress", registeredAddress);
+    public void setRoles_Wildcard(String roles, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_Regexp(String registeredAddress) {
-        setRegisteredAddress_Regexp(registeredAddress, null);
+    public void setRoles_Regexp(String roles) {
+        setRoles_Regexp(roles, null);
     }
 
-    public void setRegisteredAddress_Regexp(String registeredAddress, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("registeredAddress", registeredAddress);
+    public void setRoles_Regexp(String roles, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_SpanTerm(String registeredAddress) {
-        setRegisteredAddress_SpanTerm("registeredAddress", null);
+    public void setRoles_SpanTerm(String roles) {
+        setRoles_SpanTerm("roles", null);
     }
 
-    public void setRegisteredAddress_SpanTerm(String registeredAddress, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("registeredAddress", registeredAddress);
+    public void setRoles_SpanTerm(String roles, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_GreaterThan(String registeredAddress) {
-        setRegisteredAddress_GreaterThan(registeredAddress, null);
+    public void setRoles_GreaterThan(String roles) {
+        setRoles_GreaterThan(roles, null);
     }
 
-    public void setRegisteredAddress_GreaterThan(String registeredAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = registeredAddress;
-        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_GREATER_THAN, _value);
+    public void setRoles_GreaterThan(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_LessThan(String registeredAddress) {
-        setRegisteredAddress_LessThan(registeredAddress, null);
+    public void setRoles_LessThan(String roles) {
+        setRoles_LessThan(roles, null);
     }
 
-    public void setRegisteredAddress_LessThan(String registeredAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = registeredAddress;
-        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_LESS_THAN, _value);
+    public void setRoles_LessThan(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_GreaterEqual(String registeredAddress) {
-        setRegisteredAddress_GreaterEqual(registeredAddress, null);
+    public void setRoles_GreaterEqual(String roles) {
+        setRoles_GreaterEqual(roles, null);
     }
 
-    public void setRegisteredAddress_GreaterEqual(String registeredAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = registeredAddress;
-        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setRoles_GreaterEqual(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_LessEqual(String registeredAddress) {
-        setRegisteredAddress_LessEqual(registeredAddress, null);
+    public void setRoles_LessEqual(String roles) {
+        setRoles_LessEqual(roles, null);
     }
 
-    public void setRegisteredAddress_LessEqual(String registeredAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = registeredAddress;
-        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setRoles_LessEqual(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_Exists() {
-        setRegisteredAddress_Exists(null);
+    public void setRoles_Exists() {
+        setRoles_Exists(null);
     }
 
-    public void setRegisteredAddress_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("registeredAddress");
+    public void setRoles_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRegisteredAddress_CommonTerms(String registeredAddress) {
-        setRegisteredAddress_CommonTerms(registeredAddress, null);
+    public void setRoles_CommonTerms(String roles) {
+        setRoles_CommonTerms(roles, null);
     }
 
-    public void setRegisteredAddress_CommonTerms(String registeredAddress, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("registeredAddress", registeredAddress);
+    public void setRoles_CommonTerms(String roles, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_RegisteredAddress_Asc() {
-        regOBA("registeredAddress");
+    public BsUserCQ addOrderBy_Roles_Asc() {
+        regOBA("roles");
         return this;
     }
 
-    public BsUserCQ addOrderBy_RegisteredAddress_Desc() {
-        regOBD("registeredAddress");
+    public BsUserCQ addOrderBy_Roles_Desc() {
+        regOBD("roles");
         return this;
     }
 
-    public void setDisplayName_Equal(String displayName) {
-        setDisplayName_Term(displayName, null);
+    public void setRoomNumber_Equal(String roomNumber) {
+        setRoomNumber_Term(roomNumber, null);
     }
 
-    public void setDisplayName_Equal(String displayName, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setDisplayName_Term(displayName, opLambda);
+    public void setRoomNumber_Equal(String roomNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setRoomNumber_Term(roomNumber, opLambda);
     }
 
-    public void setDisplayName_Term(String displayName) {
-        setDisplayName_Term(displayName, null);
+    public void setRoomNumber_Term(String roomNumber) {
+        setRoomNumber_Term(roomNumber, null);
     }
 
-    public void setDisplayName_Term(String displayName, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("displayName", displayName);
+    public void setRoomNumber_Term(String roomNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("roomNumber", roomNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_NotEqual(String displayName) {
-        setDisplayName_NotTerm(displayName, null);
+    public void setRoomNumber_NotEqual(String roomNumber) {
+        setRoomNumber_NotTerm(roomNumber, null);
     }
 
-    public void setDisplayName_NotTerm(String displayName) {
-        setDisplayName_NotTerm(displayName, null);
+    public void setRoomNumber_NotTerm(String roomNumber) {
+        setRoomNumber_NotTerm(roomNumber, null);
     }
 
-    public void setDisplayName_NotEqual(String displayName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setDisplayName_NotTerm(displayName, opLambda);
-    }
+    public void setRoomNumber_NotEqual(String roomNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setRoomNumber_NotTerm(roomNumber, opLambda);
+    }
 
-    public void setDisplayName_NotTerm(String displayName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setDisplayName_Term(displayName), opLambda);
+    public void setRoomNumber_NotTerm(String roomNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setRoomNumber_Term(roomNumber), opLambda);
     }
 
-    public void setDisplayName_Terms(Collection<String> displayNameList) {
-        setDisplayName_Terms(displayNameList, null);
+    public void setRoomNumber_Terms(Collection<String> roomNumberList) {
+        setRoomNumber_Terms(roomNumberList, null);
     }
 
-    public void setDisplayName_Terms(Collection<String> displayNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("displayName", displayNameList);
+    public void setRoomNumber_Terms(Collection<String> roomNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("roomNumber", roomNumberList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_InScope(Collection<String> displayNameList) {
-        setDisplayName_Terms(displayNameList, null);
+    public void setRoomNumber_InScope(Collection<String> roomNumberList) {
+        setRoomNumber_Terms(roomNumberList, null);
     }
 
-    public void setDisplayName_InScope(Collection<String> displayNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setDisplayName_Terms(displayNameList, opLambda);
+    public void setRoomNumber_InScope(Collection<String> roomNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setRoomNumber_Terms(roomNumberList, opLambda);
     }
 
-    public void setDisplayName_Match(String displayName) {
-        setDisplayName_Match(displayName, null);
+    public void setRoomNumber_Match(String roomNumber) {
+        setRoomNumber_Match(roomNumber, null);
     }
 
-    public void setDisplayName_Match(String displayName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("displayName", displayName);
+    public void setRoomNumber_Match(String roomNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("roomNumber", roomNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_MatchPhrase(String displayName) {
-        setDisplayName_MatchPhrase(displayName, null);
+    public void setRoomNumber_MatchPhrase(String roomNumber) {
+        setRoomNumber_MatchPhrase(roomNumber, null);
     }
 
-    public void setDisplayName_MatchPhrase(String displayName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("displayName", displayName);
+    public void setRoomNumber_MatchPhrase(String roomNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("roomNumber", roomNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_MatchPhrasePrefix(String displayName) {
-        setDisplayName_MatchPhrasePrefix(displayName, null);
+    public void setRoomNumber_MatchPhrasePrefix(String roomNumber) {
+        setRoomNumber_MatchPhrasePrefix(roomNumber, null);
     }
 
-    public void setDisplayName_MatchPhrasePrefix(String displayName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("displayName", displayName);
+    public void setRoomNumber_MatchPhrasePrefix(String roomNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("roomNumber", roomNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_Fuzzy(String displayName) {
-        setDisplayName_Fuzzy(displayName, null);
+    public void setRoomNumber_Fuzzy(String roomNumber) {
+        setRoomNumber_Fuzzy(roomNumber, null);
     }
 
-    public void setDisplayName_Fuzzy(String displayName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("displayName", displayName);
+    public void setRoomNumber_Fuzzy(String roomNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("roomNumber", roomNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_Prefix(String displayName) {
-        setDisplayName_Prefix(displayName, null);
+    public void setRoomNumber_Prefix(String roomNumber) {
+        setRoomNumber_Prefix(roomNumber, null);
     }
 
-    public void setDisplayName_Prefix(String displayName, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("displayName", displayName);
+    public void setRoomNumber_Prefix(String roomNumber, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("roomNumber", roomNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_Wildcard(String displayName) {
-        setDisplayName_Wildcard(displayName, null);
+    public void setRoomNumber_Wildcard(String roomNumber) {
+        setRoomNumber_Wildcard(roomNumber, null);
     }
 
-    public void setDisplayName_Wildcard(String displayName, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("displayName", displayName);
+    public void setRoomNumber_Wildcard(String roomNumber, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("roomNumber", roomNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_Regexp(String displayName) {
-        setDisplayName_Regexp(displayName, null);
+    public void setRoomNumber_Regexp(String roomNumber) {
+        setRoomNumber_Regexp(roomNumber, null);
     }
 
-    public void setDisplayName_Regexp(String displayName, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("displayName", displayName);
+    public void setRoomNumber_Regexp(String roomNumber, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("roomNumber", roomNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_SpanTerm(String displayName) {
-        setDisplayName_SpanTerm("displayName", null);
+    public void setRoomNumber_SpanTerm(String roomNumber) {
+        setRoomNumber_SpanTerm("roomNumber", null);
     }
 
-    public void setDisplayName_SpanTerm(String displayName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("displayName", displayName);
+    public void setRoomNumber_SpanTerm(String roomNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("roomNumber", roomNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_GreaterThan(String displayName) {
-        setDisplayName_GreaterThan(displayName, null);
+    public void setRoomNumber_GreaterThan(String roomNumber) {
+        setRoomNumber_GreaterThan(roomNumber, null);
     }
 
-    public void setDisplayName_GreaterThan(String displayName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = displayName;
-        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_GREATER_THAN, _value);
+    public void setRoomNumber_GreaterThan(String roomNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = roomNumber;
+        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_LessThan(String displayName) {
-        setDisplayName_LessThan(displayName, null);
+    public void setRoomNumber_LessThan(String roomNumber) {
+        setRoomNumber_LessThan(roomNumber, null);
     }
 
-    public void setDisplayName_LessThan(String displayName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = displayName;
-        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_LESS_THAN, _value);
+    public void setRoomNumber_LessThan(String roomNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = roomNumber;
+        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_GreaterEqual(String displayName) {
-        setDisplayName_GreaterEqual(displayName, null);
+    public void setRoomNumber_GreaterEqual(String roomNumber) {
+        setRoomNumber_GreaterEqual(roomNumber, null);
     }
 
-    public void setDisplayName_GreaterEqual(String displayName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = displayName;
-        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setRoomNumber_GreaterEqual(String roomNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = roomNumber;
+        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_LessEqual(String displayName) {
-        setDisplayName_LessEqual(displayName, null);
+    public void setRoomNumber_LessEqual(String roomNumber) {
+        setRoomNumber_LessEqual(roomNumber, null);
     }
 
-    public void setDisplayName_LessEqual(String displayName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = displayName;
-        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setRoomNumber_LessEqual(String roomNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = roomNumber;
+        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_Exists() {
-        setDisplayName_Exists(null);
+    public void setRoomNumber_Exists() {
+        setRoomNumber_Exists(null);
     }
 
-    public void setDisplayName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("displayName");
+    public void setRoomNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("roomNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDisplayName_CommonTerms(String displayName) {
-        setDisplayName_CommonTerms(displayName, null);
+    public void setRoomNumber_CommonTerms(String roomNumber) {
+        setRoomNumber_CommonTerms(roomNumber, null);
     }
 
-    public void setDisplayName_CommonTerms(String displayName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("displayName", displayName);
+    public void setRoomNumber_CommonTerms(String roomNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("roomNumber", roomNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_DisplayName_Asc() {
-        regOBA("displayName");
+    public BsUserCQ addOrderBy_RoomNumber_Asc() {
+        regOBA("roomNumber");
         return this;
     }
 
-    public BsUserCQ addOrderBy_DisplayName_Desc() {
-        regOBD("displayName");
+    public BsUserCQ addOrderBy_RoomNumber_Desc() {
+        regOBD("roomNumber");
         return this;
     }
 
-    public void setPreferredLanguage_Equal(String preferredLanguage) {
-        setPreferredLanguage_Term(preferredLanguage, null);
+    public void setState_Equal(String state) {
+        setState_Term(state, null);
     }
 
-    public void setPreferredLanguage_Equal(String preferredLanguage, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setPreferredLanguage_Term(preferredLanguage, opLambda);
+    public void setState_Equal(String state, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setState_Term(state, opLambda);
     }
 
-    public void setPreferredLanguage_Term(String preferredLanguage) {
-        setPreferredLanguage_Term(preferredLanguage, null);
+    public void setState_Term(String state) {
+        setState_Term(state, null);
     }
 
-    public void setPreferredLanguage_Term(String preferredLanguage, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("preferredLanguage", preferredLanguage);
+    public void setState_Term(String state, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("state", state);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_NotEqual(String preferredLanguage) {
-        setPreferredLanguage_NotTerm(preferredLanguage, null);
+    public void setState_NotEqual(String state) {
+        setState_NotTerm(state, null);
     }
 
-    public void setPreferredLanguage_NotTerm(String preferredLanguage) {
-        setPreferredLanguage_NotTerm(preferredLanguage, null);
+    public void setState_NotTerm(String state) {
+        setState_NotTerm(state, null);
     }
 
-    public void setPreferredLanguage_NotEqual(String preferredLanguage, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setPreferredLanguage_NotTerm(preferredLanguage, opLambda);
+    public void setState_NotEqual(String state, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setState_NotTerm(state, opLambda);
     }
 
-    public void setPreferredLanguage_NotTerm(String preferredLanguage, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setPreferredLanguage_Term(preferredLanguage), opLambda);
+    public void setState_NotTerm(String state, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setState_Term(state), opLambda);
     }
 
-    public void setPreferredLanguage_Terms(Collection<String> preferredLanguageList) {
-        setPreferredLanguage_Terms(preferredLanguageList, null);
+    public void setState_Terms(Collection<String> stateList) {
+        setState_Terms(stateList, null);
     }
 
-    public void setPreferredLanguage_Terms(Collection<String> preferredLanguageList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("preferredLanguage", preferredLanguageList);
+    public void setState_Terms(Collection<String> stateList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("state", stateList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_InScope(Collection<String> preferredLanguageList) {
-        setPreferredLanguage_Terms(preferredLanguageList, null);
+    public void setState_InScope(Collection<String> stateList) {
+        setState_Terms(stateList, null);
     }
 
-    public void setPreferredLanguage_InScope(Collection<String> preferredLanguageList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setPreferredLanguage_Terms(preferredLanguageList, opLambda);
+    public void setState_InScope(Collection<String> stateList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setState_Terms(stateList, opLambda);
     }
 
-    public void setPreferredLanguage_Match(String preferredLanguage) {
-        setPreferredLanguage_Match(preferredLanguage, null);
+    public void setState_Match(String state) {
+        setState_Match(state, null);
     }
 
-    public void setPreferredLanguage_Match(String preferredLanguage, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("preferredLanguage", preferredLanguage);
+    public void setState_Match(String state, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("state", state);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_MatchPhrase(String preferredLanguage) {
-        setPreferredLanguage_MatchPhrase(preferredLanguage, null);
+    public void setState_MatchPhrase(String state) {
+        setState_MatchPhrase(state, null);
     }
 
-    public void setPreferredLanguage_MatchPhrase(String preferredLanguage, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("preferredLanguage", preferredLanguage);
+    public void setState_MatchPhrase(String state, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("state", state);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_MatchPhrasePrefix(String preferredLanguage) {
-        setPreferredLanguage_MatchPhrasePrefix(preferredLanguage, null);
+    public void setState_MatchPhrasePrefix(String state) {
+        setState_MatchPhrasePrefix(state, null);
     }
 
-    public void setPreferredLanguage_MatchPhrasePrefix(String preferredLanguage, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("preferredLanguage", preferredLanguage);
+    public void setState_MatchPhrasePrefix(String state, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("state", state);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_Fuzzy(String preferredLanguage) {
-        setPreferredLanguage_Fuzzy(preferredLanguage, null);
+    public void setState_Fuzzy(String state) {
+        setState_Fuzzy(state, null);
     }
 
-    public void setPreferredLanguage_Fuzzy(String preferredLanguage, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("preferredLanguage", preferredLanguage);
+    public void setState_Fuzzy(String state, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("state", state);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_Prefix(String preferredLanguage) {
-        setPreferredLanguage_Prefix(preferredLanguage, null);
+    public void setState_Prefix(String state) {
+        setState_Prefix(state, null);
     }
 
-    public void setPreferredLanguage_Prefix(String preferredLanguage, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("preferredLanguage", preferredLanguage);
+    public void setState_Prefix(String state, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("state", state);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_Wildcard(String preferredLanguage) {
-        setPreferredLanguage_Wildcard(preferredLanguage, null);
+    public void setState_Wildcard(String state) {
+        setState_Wildcard(state, null);
     }
 
-    public void setPreferredLanguage_Wildcard(String preferredLanguage, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("preferredLanguage", preferredLanguage);
+    public void setState_Wildcard(String state, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("state", state);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_Regexp(String preferredLanguage) {
-        setPreferredLanguage_Regexp(preferredLanguage, null);
+    public void setState_Regexp(String state) {
+        setState_Regexp(state, null);
     }
 
-    public void setPreferredLanguage_Regexp(String preferredLanguage, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("preferredLanguage", preferredLanguage);
+    public void setState_Regexp(String state, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("state", state);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_SpanTerm(String preferredLanguage) {
-        setPreferredLanguage_SpanTerm("preferredLanguage", null);
+    public void setState_SpanTerm(String state) {
+        setState_SpanTerm("state", null);
     }
 
-    public void setPreferredLanguage_SpanTerm(String preferredLanguage, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("preferredLanguage", preferredLanguage);
+    public void setState_SpanTerm(String state, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("state", state);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_GreaterThan(String preferredLanguage) {
-        setPreferredLanguage_GreaterThan(preferredLanguage, null);
+    public void setState_GreaterThan(String state) {
+        setState_GreaterThan(state, null);
     }
 
-    public void setPreferredLanguage_GreaterThan(String preferredLanguage, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = preferredLanguage;
-        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_GREATER_THAN, _value);
+    public void setState_GreaterThan(String state, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = state;
+        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_LessThan(String preferredLanguage) {
-        setPreferredLanguage_LessThan(preferredLanguage, null);
+    public void setState_LessThan(String state) {
+        setState_LessThan(state, null);
     }
 
-    public void setPreferredLanguage_LessThan(String preferredLanguage, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = preferredLanguage;
-        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_LESS_THAN, _value);
+    public void setState_LessThan(String state, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = state;
+        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_GreaterEqual(String preferredLanguage) {
-        setPreferredLanguage_GreaterEqual(preferredLanguage, null);
+    public void setState_GreaterEqual(String state) {
+        setState_GreaterEqual(state, null);
     }
 
-    public void setPreferredLanguage_GreaterEqual(String preferredLanguage, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = preferredLanguage;
-        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setState_GreaterEqual(String state, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = state;
+        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_LessEqual(String preferredLanguage) {
-        setPreferredLanguage_LessEqual(preferredLanguage, null);
+    public void setState_LessEqual(String state) {
+        setState_LessEqual(state, null);
     }
 
-    public void setPreferredLanguage_LessEqual(String preferredLanguage, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = preferredLanguage;
-        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setState_LessEqual(String state, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = state;
+        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_Exists() {
-        setPreferredLanguage_Exists(null);
+    public void setState_Exists() {
+        setState_Exists(null);
     }
 
-    public void setPreferredLanguage_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("preferredLanguage");
+    public void setState_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("state");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setPreferredLanguage_CommonTerms(String preferredLanguage) {
-        setPreferredLanguage_CommonTerms(preferredLanguage, null);
+    public void setState_CommonTerms(String state) {
+        setState_CommonTerms(state, null);
     }
 
-    public void setPreferredLanguage_CommonTerms(String preferredLanguage, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("preferredLanguage", preferredLanguage);
+    public void setState_CommonTerms(String state, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("state", state);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_PreferredLanguage_Asc() {
-        regOBA("preferredLanguage");
+    public BsUserCQ addOrderBy_State_Asc() {
+        regOBA("state");
         return this;
     }
 
-    public BsUserCQ addOrderBy_PreferredLanguage_Desc() {
-        regOBD("preferredLanguage");
+    public BsUserCQ addOrderBy_State_Desc() {
+        regOBD("state");
         return this;
     }
 
-    public void setDepartmentNumber_Equal(String departmentNumber) {
-        setDepartmentNumber_Term(departmentNumber, null);
+    public void setStreet_Equal(String street) {
+        setStreet_Term(street, null);
     }
 
-    public void setDepartmentNumber_Equal(String departmentNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setDepartmentNumber_Term(departmentNumber, opLambda);
+    public void setStreet_Equal(String street, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setStreet_Term(street, opLambda);
     }
 
-    public void setDepartmentNumber_Term(String departmentNumber) {
-        setDepartmentNumber_Term(departmentNumber, null);
+    public void setStreet_Term(String street) {
+        setStreet_Term(street, null);
     }
 
-    public void setDepartmentNumber_Term(String departmentNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("departmentNumber", departmentNumber);
+    public void setStreet_Term(String street, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("street", street);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_NotEqual(String departmentNumber) {
-        setDepartmentNumber_NotTerm(departmentNumber, null);
+    public void setStreet_NotEqual(String street) {
+        setStreet_NotTerm(street, null);
     }
 
-    public void setDepartmentNumber_NotTerm(String departmentNumber) {
-        setDepartmentNumber_NotTerm(departmentNumber, null);
+    public void setStreet_NotTerm(String street) {
+        setStreet_NotTerm(street, null);
     }
 
-    public void setDepartmentNumber_NotEqual(String departmentNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setDepartmentNumber_NotTerm(departmentNumber, opLambda);
+    public void setStreet_NotEqual(String street, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setStreet_NotTerm(street, opLambda);
     }
 
-    public void setDepartmentNumber_NotTerm(String departmentNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setDepartmentNumber_Term(departmentNumber), opLambda);
+    public void setStreet_NotTerm(String street, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setStreet_Term(street), opLambda);
     }
 
-    public void setDepartmentNumber_Terms(Collection<String> departmentNumberList) {
-        setDepartmentNumber_Terms(departmentNumberList, null);
+    public void setStreet_Terms(Collection<String> streetList) {
+        setStreet_Terms(streetList, null);
     }
 
-    public void setDepartmentNumber_Terms(Collection<String> departmentNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("departmentNumber", departmentNumberList);
+    public void setStreet_Terms(Collection<String> streetList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("street", streetList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_InScope(Collection<String> departmentNumberList) {
-        setDepartmentNumber_Terms(departmentNumberList, null);
+    public void setStreet_InScope(Collection<String> streetList) {
+        setStreet_Terms(streetList, null);
     }
 
-    public void setDepartmentNumber_InScope(Collection<String> departmentNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setDepartmentNumber_Terms(departmentNumberList, opLambda);
+    public void setStreet_InScope(Collection<String> streetList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setStreet_Terms(streetList, opLambda);
     }
 
-    public void setDepartmentNumber_Match(String departmentNumber) {
-        setDepartmentNumber_Match(departmentNumber, null);
+    public void setStreet_Match(String street) {
+        setStreet_Match(street, null);
     }
 
-    public void setDepartmentNumber_Match(String departmentNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("departmentNumber", departmentNumber);
+    public void setStreet_Match(String street, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("street", street);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_MatchPhrase(String departmentNumber) {
-        setDepartmentNumber_MatchPhrase(departmentNumber, null);
+    public void setStreet_MatchPhrase(String street) {
+        setStreet_MatchPhrase(street, null);
     }
 
-    public void setDepartmentNumber_MatchPhrase(String departmentNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("departmentNumber", departmentNumber);
+    public void setStreet_MatchPhrase(String street, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("street", street);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_MatchPhrasePrefix(String departmentNumber) {
-        setDepartmentNumber_MatchPhrasePrefix(departmentNumber, null);
+    public void setStreet_MatchPhrasePrefix(String street) {
+        setStreet_MatchPhrasePrefix(street, null);
     }
 
-    public void setDepartmentNumber_MatchPhrasePrefix(String departmentNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("departmentNumber", departmentNumber);
+    public void setStreet_MatchPhrasePrefix(String street, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("street", street);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_Fuzzy(String departmentNumber) {
-        setDepartmentNumber_Fuzzy(departmentNumber, null);
+    public void setStreet_Fuzzy(String street) {
+        setStreet_Fuzzy(street, null);
     }
 
-    public void setDepartmentNumber_Fuzzy(String departmentNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("departmentNumber", departmentNumber);
+    public void setStreet_Fuzzy(String street, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("street", street);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_Prefix(String departmentNumber) {
-        setDepartmentNumber_Prefix(departmentNumber, null);
+    public void setStreet_Prefix(String street) {
+        setStreet_Prefix(street, null);
     }
 
-    public void setDepartmentNumber_Prefix(String departmentNumber, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("departmentNumber", departmentNumber);
+    public void setStreet_Prefix(String street, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("street", street);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_Wildcard(String departmentNumber) {
-        setDepartmentNumber_Wildcard(departmentNumber, null);
+    public void setStreet_Wildcard(String street) {
+        setStreet_Wildcard(street, null);
     }
 
-    public void setDepartmentNumber_Wildcard(String departmentNumber, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("departmentNumber", departmentNumber);
+    public void setStreet_Wildcard(String street, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("street", street);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_Regexp(String departmentNumber) {
-        setDepartmentNumber_Regexp(departmentNumber, null);
+    public void setStreet_Regexp(String street) {
+        setStreet_Regexp(street, null);
     }
 
-    public void setDepartmentNumber_Regexp(String departmentNumber, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("departmentNumber", departmentNumber);
+    public void setStreet_Regexp(String street, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("street", street);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_SpanTerm(String departmentNumber) {
-        setDepartmentNumber_SpanTerm("departmentNumber", null);
+    public void setStreet_SpanTerm(String street) {
+        setStreet_SpanTerm("street", null);
     }
 
-    public void setDepartmentNumber_SpanTerm(String departmentNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("departmentNumber", departmentNumber);
+    public void setStreet_SpanTerm(String street, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("street", street);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_GreaterThan(String departmentNumber) {
-        setDepartmentNumber_GreaterThan(departmentNumber, null);
+    public void setStreet_GreaterThan(String street) {
+        setStreet_GreaterThan(street, null);
     }
 
-    public void setDepartmentNumber_GreaterThan(String departmentNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = departmentNumber;
-        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_GREATER_THAN, _value);
+    public void setStreet_GreaterThan(String street, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = street;
+        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_LessThan(String departmentNumber) {
-        setDepartmentNumber_LessThan(departmentNumber, null);
+    public void setStreet_LessThan(String street) {
+        setStreet_LessThan(street, null);
     }
 
-    public void setDepartmentNumber_LessThan(String departmentNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = departmentNumber;
-        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_LESS_THAN, _value);
+    public void setStreet_LessThan(String street, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = street;
+        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_GreaterEqual(String departmentNumber) {
-        setDepartmentNumber_GreaterEqual(departmentNumber, null);
+    public void setStreet_GreaterEqual(String street) {
+        setStreet_GreaterEqual(street, null);
     }
 
-    public void setDepartmentNumber_GreaterEqual(String departmentNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = departmentNumber;
-        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setStreet_GreaterEqual(String street, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = street;
+        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_LessEqual(String departmentNumber) {
-        setDepartmentNumber_LessEqual(departmentNumber, null);
+    public void setStreet_LessEqual(String street) {
+        setStreet_LessEqual(street, null);
     }
 
-    public void setDepartmentNumber_LessEqual(String departmentNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = departmentNumber;
-        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setStreet_LessEqual(String street, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = street;
+        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_Exists() {
-        setDepartmentNumber_Exists(null);
+    public void setStreet_Exists() {
+        setStreet_Exists(null);
     }
 
-    public void setDepartmentNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("departmentNumber");
+    public void setStreet_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("street");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setDepartmentNumber_CommonTerms(String departmentNumber) {
-        setDepartmentNumber_CommonTerms(departmentNumber, null);
+    public void setStreet_CommonTerms(String street) {
+        setStreet_CommonTerms(street, null);
     }
 
-    public void setDepartmentNumber_CommonTerms(String departmentNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("departmentNumber", departmentNumber);
+    public void setStreet_CommonTerms(String street, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("street", street);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_DepartmentNumber_Asc() {
-        regOBA("departmentNumber");
+    public BsUserCQ addOrderBy_Street_Asc() {
+        regOBA("street");
         return this;
     }
 
-    public BsUserCQ addOrderBy_DepartmentNumber_Desc() {
-        regOBD("departmentNumber");
+    public BsUserCQ addOrderBy_Street_Desc() {
+        regOBD("street");
         return this;
     }
 
-    public void setUidNumber_Equal(Long uidNumber) {
-        setUidNumber_Term(uidNumber, null);
+    public void setSurname_Equal(String surname) {
+        setSurname_Term(surname, null);
     }
 
-    public void setUidNumber_Equal(Long uidNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setUidNumber_Term(uidNumber, opLambda);
+    public void setSurname_Equal(String surname, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setSurname_Term(surname, opLambda);
     }
 
-    public void setUidNumber_Term(Long uidNumber) {
-        setUidNumber_Term(uidNumber, null);
+    public void setSurname_Term(String surname) {
+        setSurname_Term(surname, null);
     }
 
-    public void setUidNumber_Term(Long uidNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("uidNumber", uidNumber);
+    public void setSurname_Term(String surname, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("surname", surname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUidNumber_NotEqual(Long uidNumber) {
-        setUidNumber_NotTerm(uidNumber, null);
+    public void setSurname_NotEqual(String surname) {
+        setSurname_NotTerm(surname, null);
     }
 
-    public void setUidNumber_NotTerm(Long uidNumber) {
-        setUidNumber_NotTerm(uidNumber, null);
+    public void setSurname_NotTerm(String surname) {
+        setSurname_NotTerm(surname, null);
     }
 
-    public void setUidNumber_NotEqual(Long uidNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setUidNumber_NotTerm(uidNumber, opLambda);
+    public void setSurname_NotEqual(String surname, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSurname_NotTerm(surname, opLambda);
     }
 
-    public void setUidNumber_NotTerm(Long uidNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setUidNumber_Term(uidNumber), opLambda);
+    public void setSurname_NotTerm(String surname, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSurname_Term(surname), opLambda);
     }
 
-    public void setUidNumber_Terms(Collection<Long> uidNumberList) {
-        setUidNumber_Terms(uidNumberList, null);
+    public void setSurname_Terms(Collection<String> surnameList) {
+        setSurname_Terms(surnameList, null);
     }
 
-    public void setUidNumber_Terms(Collection<Long> uidNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("uidNumber", uidNumberList);
+    public void setSurname_Terms(Collection<String> surnameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("surname", surnameList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUidNumber_InScope(Collection<Long> uidNumberList) {
-        setUidNumber_Terms(uidNumberList, null);
+    public void setSurname_InScope(Collection<String> surnameList) {
+        setSurname_Terms(surnameList, null);
     }
 
-    public void setUidNumber_InScope(Collection<Long> uidNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setUidNumber_Terms(uidNumberList, opLambda);
+    public void setSurname_InScope(Collection<String> surnameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setSurname_Terms(surnameList, opLambda);
     }
 
-    public void setUidNumber_Match(Long uidNumber) {
-        setUidNumber_Match(uidNumber, null);
+    public void setSurname_Match(String surname) {
+        setSurname_Match(surname, null);
     }
 
-    public void setUidNumber_Match(Long uidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("uidNumber", uidNumber);
+    public void setSurname_Match(String surname, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("surname", surname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUidNumber_MatchPhrase(Long uidNumber) {
-        setUidNumber_MatchPhrase(uidNumber, null);
+    public void setSurname_MatchPhrase(String surname) {
+        setSurname_MatchPhrase(surname, null);
     }
 
-    public void setUidNumber_MatchPhrase(Long uidNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("uidNumber", uidNumber);
+    public void setSurname_MatchPhrase(String surname, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("surname", surname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUidNumber_MatchPhrasePrefix(Long uidNumber) {
-        setUidNumber_MatchPhrasePrefix(uidNumber, null);
+    public void setSurname_MatchPhrasePrefix(String surname) {
+        setSurname_MatchPhrasePrefix(surname, null);
     }
 
-    public void setUidNumber_MatchPhrasePrefix(Long uidNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("uidNumber", uidNumber);
+    public void setSurname_MatchPhrasePrefix(String surname, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("surname", surname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUidNumber_Fuzzy(Long uidNumber) {
-        setUidNumber_Fuzzy(uidNumber, null);
+    public void setSurname_Fuzzy(String surname) {
+        setSurname_Fuzzy(surname, null);
     }
 
-    public void setUidNumber_Fuzzy(Long uidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("uidNumber", uidNumber);
+    public void setSurname_Fuzzy(String surname, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("surname", surname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUidNumber_GreaterThan(Long uidNumber) {
-        setUidNumber_GreaterThan(uidNumber, null);
+    public void setSurname_Prefix(String surname) {
+        setSurname_Prefix(surname, null);
     }
 
-    public void setUidNumber_GreaterThan(Long uidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = uidNumber;
-        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_GREATER_THAN, _value);
+    public void setSurname_Prefix(String surname, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("surname", surname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUidNumber_LessThan(Long uidNumber) {
-        setUidNumber_LessThan(uidNumber, null);
+    public void setSurname_Wildcard(String surname) {
+        setSurname_Wildcard(surname, null);
     }
 
-    public void setUidNumber_LessThan(Long uidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = uidNumber;
-        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_LESS_THAN, _value);
+    public void setSurname_Wildcard(String surname, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("surname", surname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUidNumber_GreaterEqual(Long uidNumber) {
-        setUidNumber_GreaterEqual(uidNumber, null);
+    public void setSurname_Regexp(String surname) {
+        setSurname_Regexp(surname, null);
     }
 
-    public void setUidNumber_GreaterEqual(Long uidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = uidNumber;
-        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setSurname_Regexp(String surname, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("surname", surname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUidNumber_LessEqual(Long uidNumber) {
-        setUidNumber_LessEqual(uidNumber, null);
+    public void setSurname_SpanTerm(String surname) {
+        setSurname_SpanTerm("surname", null);
     }
 
-    public void setUidNumber_LessEqual(Long uidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = uidNumber;
-        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setSurname_SpanTerm(String surname, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("surname", surname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUidNumber_Exists() {
-        setUidNumber_Exists(null);
+    public void setSurname_GreaterThan(String surname) {
+        setSurname_GreaterThan(surname, null);
     }
 
-    public void setUidNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("uidNumber");
+    public void setSurname_GreaterThan(String surname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = surname;
+        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setUidNumber_CommonTerms(Long uidNumber) {
-        setUidNumber_CommonTerms(uidNumber, null);
+    public void setSurname_LessThan(String surname) {
+        setSurname_LessThan(surname, null);
     }
 
-    public void setUidNumber_CommonTerms(Long uidNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("uidNumber", uidNumber);
+    public void setSurname_LessThan(String surname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = surname;
+        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_UidNumber_Asc() {
-        regOBA("uidNumber");
-        return this;
+    public void setSurname_GreaterEqual(String surname) {
+        setSurname_GreaterEqual(surname, null);
     }
 
-    public BsUserCQ addOrderBy_UidNumber_Desc() {
-        regOBD("uidNumber");
-        return this;
+    public void setSurname_GreaterEqual(String surname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = surname;
+        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setGidNumber_Equal(Long gidNumber) {
-        setGidNumber_Term(gidNumber, null);
+    public void setSurname_LessEqual(String surname) {
+        setSurname_LessEqual(surname, null);
     }
 
-    public void setGidNumber_Equal(Long gidNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setGidNumber_Term(gidNumber, opLambda);
+    public void setSurname_LessEqual(String surname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = surname;
+        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setGidNumber_Term(Long gidNumber) {
-        setGidNumber_Term(gidNumber, null);
+    public void setSurname_Exists() {
+        setSurname_Exists(null);
     }
 
-    public void setGidNumber_Term(Long gidNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("gidNumber", gidNumber);
+    public void setSurname_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("surname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_NotEqual(Long gidNumber) {
-        setGidNumber_NotTerm(gidNumber, null);
+    public void setSurname_CommonTerms(String surname) {
+        setSurname_CommonTerms(surname, null);
     }
 
-    public void setGidNumber_NotTerm(Long gidNumber) {
-        setGidNumber_NotTerm(gidNumber, null);
+    public void setSurname_CommonTerms(String surname, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("surname", surname);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
     }
 
-    public void setGidNumber_NotEqual(Long gidNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setGidNumber_NotTerm(gidNumber, opLambda);
+    public BsUserCQ addOrderBy_Surname_Asc() {
+        regOBA("surname");
+        return this;
     }
 
-    public void setGidNumber_NotTerm(Long gidNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setGidNumber_Term(gidNumber), opLambda);
+    public BsUserCQ addOrderBy_Surname_Desc() {
+        regOBD("surname");
+        return this;
     }
 
-    public void setGidNumber_Terms(Collection<Long> gidNumberList) {
-        setGidNumber_Terms(gidNumberList, null);
+    public void setTelephoneNumber_Equal(String telephoneNumber) {
+        setTelephoneNumber_Term(telephoneNumber, null);
     }
 
-    public void setGidNumber_Terms(Collection<Long> gidNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("gidNumber", gidNumberList);
+    public void setTelephoneNumber_Equal(String telephoneNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setTelephoneNumber_Term(telephoneNumber, opLambda);
+    }
+
+    public void setTelephoneNumber_Term(String telephoneNumber) {
+        setTelephoneNumber_Term(telephoneNumber, null);
+    }
+
+    public void setTelephoneNumber_Term(String telephoneNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("telephoneNumber", telephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_InScope(Collection<Long> gidNumberList) {
-        setGidNumber_Terms(gidNumberList, null);
+    public void setTelephoneNumber_NotEqual(String telephoneNumber) {
+        setTelephoneNumber_NotTerm(telephoneNumber, null);
     }
 
-    public void setGidNumber_InScope(Collection<Long> gidNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setGidNumber_Terms(gidNumberList, opLambda);
+    public void setTelephoneNumber_NotTerm(String telephoneNumber) {
+        setTelephoneNumber_NotTerm(telephoneNumber, null);
     }
 
-    public void setGidNumber_Match(Long gidNumber) {
-        setGidNumber_Match(gidNumber, null);
+    public void setTelephoneNumber_NotEqual(String telephoneNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTelephoneNumber_NotTerm(telephoneNumber, opLambda);
     }
 
-    public void setGidNumber_Match(Long gidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("gidNumber", gidNumber);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setTelephoneNumber_NotTerm(String telephoneNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTelephoneNumber_Term(telephoneNumber), opLambda);
     }
 
-    public void setGidNumber_MatchPhrase(Long gidNumber) {
-        setGidNumber_MatchPhrase(gidNumber, null);
+    public void setTelephoneNumber_Terms(Collection<String> telephoneNumberList) {
+        setTelephoneNumber_Terms(telephoneNumberList, null);
     }
 
-    public void setGidNumber_MatchPhrase(Long gidNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("gidNumber", gidNumber);
+    public void setTelephoneNumber_Terms(Collection<String> telephoneNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("telephoneNumber", telephoneNumberList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_MatchPhrasePrefix(Long gidNumber) {
-        setGidNumber_MatchPhrasePrefix(gidNumber, null);
+    public void setTelephoneNumber_InScope(Collection<String> telephoneNumberList) {
+        setTelephoneNumber_Terms(telephoneNumberList, null);
     }
 
-    public void setGidNumber_MatchPhrasePrefix(Long gidNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("gidNumber", gidNumber);
+    public void setTelephoneNumber_InScope(Collection<String> telephoneNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setTelephoneNumber_Terms(telephoneNumberList, opLambda);
+    }
+
+    public void setTelephoneNumber_Match(String telephoneNumber) {
+        setTelephoneNumber_Match(telephoneNumber, null);
+    }
+
+    public void setTelephoneNumber_Match(String telephoneNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("telephoneNumber", telephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_Fuzzy(Long gidNumber) {
-        setGidNumber_Fuzzy(gidNumber, null);
+    public void setTelephoneNumber_MatchPhrase(String telephoneNumber) {
+        setTelephoneNumber_MatchPhrase(telephoneNumber, null);
     }
 
-    public void setGidNumber_Fuzzy(Long gidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("gidNumber", gidNumber);
+    public void setTelephoneNumber_MatchPhrase(String telephoneNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("telephoneNumber", telephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_GreaterThan(Long gidNumber) {
-        setGidNumber_GreaterThan(gidNumber, null);
+    public void setTelephoneNumber_MatchPhrasePrefix(String telephoneNumber) {
+        setTelephoneNumber_MatchPhrasePrefix(telephoneNumber, null);
     }
 
-    public void setGidNumber_GreaterThan(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = gidNumber;
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_THAN, _value);
+    public void setTelephoneNumber_MatchPhrasePrefix(String telephoneNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("telephoneNumber", telephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_LessThan(Long gidNumber) {
-        setGidNumber_LessThan(gidNumber, null);
+    public void setTelephoneNumber_Fuzzy(String telephoneNumber) {
+        setTelephoneNumber_Fuzzy(telephoneNumber, null);
     }
 
-    public void setGidNumber_LessThan(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = gidNumber;
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_THAN, _value);
+    public void setTelephoneNumber_Fuzzy(String telephoneNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("telephoneNumber", telephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_GreaterEqual(Long gidNumber) {
-        setGidNumber_GreaterEqual(gidNumber, null);
+    public void setTelephoneNumber_Prefix(String telephoneNumber) {
+        setTelephoneNumber_Prefix(telephoneNumber, null);
     }
 
-    public void setGidNumber_GreaterEqual(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = gidNumber;
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setTelephoneNumber_Prefix(String telephoneNumber, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("telephoneNumber", telephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_LessEqual(Long gidNumber) {
-        setGidNumber_LessEqual(gidNumber, null);
+    public void setTelephoneNumber_Wildcard(String telephoneNumber) {
+        setTelephoneNumber_Wildcard(telephoneNumber, null);
     }
 
-    public void setGidNumber_LessEqual(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = gidNumber;
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setTelephoneNumber_Wildcard(String telephoneNumber, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("telephoneNumber", telephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_Exists() {
-        setGidNumber_Exists(null);
+    public void setTelephoneNumber_Regexp(String telephoneNumber) {
+        setTelephoneNumber_Regexp(telephoneNumber, null);
     }
 
-    public void setGidNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("gidNumber");
+    public void setTelephoneNumber_Regexp(String telephoneNumber, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("telephoneNumber", telephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGidNumber_CommonTerms(Long gidNumber) {
-        setGidNumber_CommonTerms(gidNumber, null);
+    public void setTelephoneNumber_SpanTerm(String telephoneNumber) {
+        setTelephoneNumber_SpanTerm("telephoneNumber", null);
     }
 
-    public void setGidNumber_CommonTerms(Long gidNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("gidNumber", gidNumber);
+    public void setTelephoneNumber_SpanTerm(String telephoneNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("telephoneNumber", telephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_GidNumber_Asc() {
-        regOBA("gidNumber");
+    public void setTelephoneNumber_GreaterThan(String telephoneNumber) {
+        setTelephoneNumber_GreaterThan(telephoneNumber, null);
+    }
+
+    public void setTelephoneNumber_GreaterThan(String telephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = telephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTelephoneNumber_LessThan(String telephoneNumber) {
+        setTelephoneNumber_LessThan(telephoneNumber, null);
+    }
+
+    public void setTelephoneNumber_LessThan(String telephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = telephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTelephoneNumber_GreaterEqual(String telephoneNumber) {
+        setTelephoneNumber_GreaterEqual(telephoneNumber, null);
+    }
+
+    public void setTelephoneNumber_GreaterEqual(String telephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = telephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTelephoneNumber_LessEqual(String telephoneNumber) {
+        setTelephoneNumber_LessEqual(telephoneNumber, null);
+    }
+
+    public void setTelephoneNumber_LessEqual(String telephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = telephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTelephoneNumber_Exists() {
+        setTelephoneNumber_Exists(null);
+    }
+
+    public void setTelephoneNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("telephoneNumber");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTelephoneNumber_CommonTerms(String telephoneNumber) {
+        setTelephoneNumber_CommonTerms(telephoneNumber, null);
+    }
+
+    public void setTelephoneNumber_CommonTerms(String telephoneNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("telephoneNumber", telephoneNumber);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsUserCQ addOrderBy_TelephoneNumber_Asc() {
+        regOBA("telephoneNumber");
         return this;
     }
 
-    public BsUserCQ addOrderBy_GidNumber_Desc() {
-        regOBD("gidNumber");
+    public BsUserCQ addOrderBy_TelephoneNumber_Desc() {
+        regOBD("telephoneNumber");
         return this;
     }
 
-    public void setHomeDirectory_Equal(String homeDirectory) {
-        setHomeDirectory_Term(homeDirectory, null);
+    public void setTeletexTerminalIdentifier_Equal(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_Term(teletexTerminalIdentifier, null);
     }
 
-    public void setHomeDirectory_Equal(String homeDirectory, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setHomeDirectory_Term(homeDirectory, opLambda);
+    public void setTeletexTerminalIdentifier_Equal(String teletexTerminalIdentifier, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setTeletexTerminalIdentifier_Term(teletexTerminalIdentifier, opLambda);
     }
 
-    public void setHomeDirectory_Term(String homeDirectory) {
-        setHomeDirectory_Term(homeDirectory, null);
+    public void setTeletexTerminalIdentifier_Term(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_Term(teletexTerminalIdentifier, null);
     }
 
-    public void setHomeDirectory_Term(String homeDirectory, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("homeDirectory", homeDirectory);
+    public void setTeletexTerminalIdentifier_Term(String teletexTerminalIdentifier, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_NotEqual(String homeDirectory) {
-        setHomeDirectory_NotTerm(homeDirectory, null);
+    public void setTeletexTerminalIdentifier_NotEqual(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_NotTerm(teletexTerminalIdentifier, null);
     }
 
-    public void setHomeDirectory_NotTerm(String homeDirectory) {
-        setHomeDirectory_NotTerm(homeDirectory, null);
+    public void setTeletexTerminalIdentifier_NotTerm(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_NotTerm(teletexTerminalIdentifier, null);
     }
 
-    public void setHomeDirectory_NotEqual(String homeDirectory, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setHomeDirectory_NotTerm(homeDirectory, opLambda);
+    public void setTeletexTerminalIdentifier_NotEqual(String teletexTerminalIdentifier, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTeletexTerminalIdentifier_NotTerm(teletexTerminalIdentifier, opLambda);
+    }
+
+    public void setTeletexTerminalIdentifier_NotTerm(String teletexTerminalIdentifier, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTeletexTerminalIdentifier_Term(teletexTerminalIdentifier), opLambda);
+    }
+
+    public void setTeletexTerminalIdentifier_Terms(Collection<String> teletexTerminalIdentifierList) {
+        setTeletexTerminalIdentifier_Terms(teletexTerminalIdentifierList, null);
+    }
+
+    public void setTeletexTerminalIdentifier_Terms(Collection<String> teletexTerminalIdentifierList,
+            ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("teletexTerminalIdentifier", teletexTerminalIdentifierList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTeletexTerminalIdentifier_InScope(Collection<String> teletexTerminalIdentifierList) {
+        setTeletexTerminalIdentifier_Terms(teletexTerminalIdentifierList, null);
+    }
+
+    public void setTeletexTerminalIdentifier_InScope(Collection<String> teletexTerminalIdentifierList,
+            ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setTeletexTerminalIdentifier_Terms(teletexTerminalIdentifierList, opLambda);
+    }
+
+    public void setTeletexTerminalIdentifier_Match(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_Match(teletexTerminalIdentifier, null);
+    }
+
+    public void setTeletexTerminalIdentifier_Match(String teletexTerminalIdentifier, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTeletexTerminalIdentifier_MatchPhrase(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_MatchPhrase(teletexTerminalIdentifier, null);
+    }
+
+    public void setTeletexTerminalIdentifier_MatchPhrase(String teletexTerminalIdentifier,
+            ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTeletexTerminalIdentifier_MatchPhrasePrefix(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_MatchPhrasePrefix(teletexTerminalIdentifier, null);
+    }
+
+    public void setTeletexTerminalIdentifier_MatchPhrasePrefix(String teletexTerminalIdentifier,
+            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTeletexTerminalIdentifier_Fuzzy(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_Fuzzy(teletexTerminalIdentifier, null);
+    }
+
+    public void setTeletexTerminalIdentifier_Fuzzy(String teletexTerminalIdentifier, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTeletexTerminalIdentifier_Prefix(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_Prefix(teletexTerminalIdentifier, null);
+    }
+
+    public void setTeletexTerminalIdentifier_Prefix(String teletexTerminalIdentifier, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTeletexTerminalIdentifier_Wildcard(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_Wildcard(teletexTerminalIdentifier, null);
+    }
+
+    public void setTeletexTerminalIdentifier_Wildcard(String teletexTerminalIdentifier, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTeletexTerminalIdentifier_Regexp(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_Regexp(teletexTerminalIdentifier, null);
+    }
+
+    public void setTeletexTerminalIdentifier_Regexp(String teletexTerminalIdentifier, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    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) {
+        final Object _value = teletexTerminalIdentifier;
+        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_GREATER_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTeletexTerminalIdentifier_LessThan(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_LessThan(teletexTerminalIdentifier, null);
+    }
+
+    public void setTeletexTerminalIdentifier_LessThan(String teletexTerminalIdentifier, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = teletexTerminalIdentifier;
+        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_LESS_THAN, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTeletexTerminalIdentifier_GreaterEqual(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_GreaterEqual(teletexTerminalIdentifier, null);
+    }
+
+    public void setTeletexTerminalIdentifier_GreaterEqual(String teletexTerminalIdentifier, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = teletexTerminalIdentifier;
+        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_GREATER_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTeletexTerminalIdentifier_LessEqual(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_LessEqual(teletexTerminalIdentifier, null);
+    }
+
+    public void setTeletexTerminalIdentifier_LessEqual(String teletexTerminalIdentifier, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = teletexTerminalIdentifier;
+        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_LESS_EQUAL, _value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTeletexTerminalIdentifier_Exists() {
+        setTeletexTerminalIdentifier_Exists(null);
+    }
+
+    public void setTeletexTerminalIdentifier_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("teletexTerminalIdentifier");
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTeletexTerminalIdentifier_CommonTerms(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_CommonTerms(teletexTerminalIdentifier, null);
+    }
+
+    public void setTeletexTerminalIdentifier_CommonTerms(String teletexTerminalIdentifier,
+            ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsUserCQ addOrderBy_TeletexTerminalIdentifier_Asc() {
+        regOBA("teletexTerminalIdentifier");
+        return this;
+    }
+
+    public BsUserCQ addOrderBy_TeletexTerminalIdentifier_Desc() {
+        regOBD("teletexTerminalIdentifier");
+        return this;
+    }
+
+    public void setTitle_Equal(String title) {
+        setTitle_Term(title, null);
+    }
+
+    public void setTitle_Equal(String title, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setTitle_Term(title, opLambda);
+    }
+
+    public void setTitle_Term(String title) {
+        setTitle_Term(title, null);
+    }
+
+    public void setTitle_Term(String title, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("title", title);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setTitle_NotEqual(String title) {
+        setTitle_NotTerm(title, null);
+    }
+
+    public void setTitle_NotTerm(String title) {
+        setTitle_NotTerm(title, null);
+    }
+
+    public void setTitle_NotEqual(String title, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTitle_NotTerm(title, opLambda);
     }
 
-    public void setHomeDirectory_NotTerm(String homeDirectory, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setHomeDirectory_Term(homeDirectory), opLambda);
+    public void setTitle_NotTerm(String title, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTitle_Term(title), opLambda);
     }
 
-    public void setHomeDirectory_Terms(Collection<String> homeDirectoryList) {
-        setHomeDirectory_Terms(homeDirectoryList, null);
+    public void setTitle_Terms(Collection<String> titleList) {
+        setTitle_Terms(titleList, null);
     }
 
-    public void setHomeDirectory_Terms(Collection<String> homeDirectoryList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("homeDirectory", homeDirectoryList);
+    public void setTitle_Terms(Collection<String> titleList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("title", titleList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_InScope(Collection<String> homeDirectoryList) {
-        setHomeDirectory_Terms(homeDirectoryList, null);
+    public void setTitle_InScope(Collection<String> titleList) {
+        setTitle_Terms(titleList, null);
     }
 
-    public void setHomeDirectory_InScope(Collection<String> homeDirectoryList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setHomeDirectory_Terms(homeDirectoryList, opLambda);
+    public void setTitle_InScope(Collection<String> titleList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setTitle_Terms(titleList, opLambda);
     }
 
-    public void setHomeDirectory_Match(String homeDirectory) {
-        setHomeDirectory_Match(homeDirectory, null);
+    public void setTitle_Match(String title) {
+        setTitle_Match(title, null);
     }
 
-    public void setHomeDirectory_Match(String homeDirectory, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("homeDirectory", homeDirectory);
+    public void setTitle_Match(String title, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("title", title);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_MatchPhrase(String homeDirectory) {
-        setHomeDirectory_MatchPhrase(homeDirectory, null);
+    public void setTitle_MatchPhrase(String title) {
+        setTitle_MatchPhrase(title, null);
     }
 
-    public void setHomeDirectory_MatchPhrase(String homeDirectory, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("homeDirectory", homeDirectory);
+    public void setTitle_MatchPhrase(String title, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("title", title);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_MatchPhrasePrefix(String homeDirectory) {
-        setHomeDirectory_MatchPhrasePrefix(homeDirectory, null);
+    public void setTitle_MatchPhrasePrefix(String title) {
+        setTitle_MatchPhrasePrefix(title, null);
     }
 
-    public void setHomeDirectory_MatchPhrasePrefix(String homeDirectory, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("homeDirectory", homeDirectory);
+    public void setTitle_MatchPhrasePrefix(String title, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("title", title);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_Fuzzy(String homeDirectory) {
-        setHomeDirectory_Fuzzy(homeDirectory, null);
+    public void setTitle_Fuzzy(String title) {
+        setTitle_Fuzzy(title, null);
     }
 
-    public void setHomeDirectory_Fuzzy(String homeDirectory, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("homeDirectory", homeDirectory);
+    public void setTitle_Fuzzy(String title, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("title", title);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_Prefix(String homeDirectory) {
-        setHomeDirectory_Prefix(homeDirectory, null);
+    public void setTitle_Prefix(String title) {
+        setTitle_Prefix(title, null);
     }
 
-    public void setHomeDirectory_Prefix(String homeDirectory, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("homeDirectory", homeDirectory);
+    public void setTitle_Prefix(String title, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("title", title);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_Wildcard(String homeDirectory) {
-        setHomeDirectory_Wildcard(homeDirectory, null);
+    public void setTitle_Wildcard(String title) {
+        setTitle_Wildcard(title, null);
     }
 
-    public void setHomeDirectory_Wildcard(String homeDirectory, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("homeDirectory", homeDirectory);
+    public void setTitle_Wildcard(String title, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("title", title);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_Regexp(String homeDirectory) {
-        setHomeDirectory_Regexp(homeDirectory, null);
+    public void setTitle_Regexp(String title) {
+        setTitle_Regexp(title, null);
     }
 
-    public void setHomeDirectory_Regexp(String homeDirectory, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("homeDirectory", homeDirectory);
+    public void setTitle_Regexp(String title, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("title", title);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_SpanTerm(String homeDirectory) {
-        setHomeDirectory_SpanTerm("homeDirectory", null);
+    public void setTitle_SpanTerm(String title) {
+        setTitle_SpanTerm("title", null);
     }
 
-    public void setHomeDirectory_SpanTerm(String homeDirectory, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("homeDirectory", homeDirectory);
+    public void setTitle_SpanTerm(String title, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("title", title);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_GreaterThan(String homeDirectory) {
-        setHomeDirectory_GreaterThan(homeDirectory, null);
+    public void setTitle_GreaterThan(String title) {
+        setTitle_GreaterThan(title, null);
     }
 
-    public void setHomeDirectory_GreaterThan(String homeDirectory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = homeDirectory;
-        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_GREATER_THAN, _value);
+    public void setTitle_GreaterThan(String title, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = title;
+        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_LessThan(String homeDirectory) {
-        setHomeDirectory_LessThan(homeDirectory, null);
+    public void setTitle_LessThan(String title) {
+        setTitle_LessThan(title, null);
     }
 
-    public void setHomeDirectory_LessThan(String homeDirectory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = homeDirectory;
-        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_LESS_THAN, _value);
+    public void setTitle_LessThan(String title, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = title;
+        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_GreaterEqual(String homeDirectory) {
-        setHomeDirectory_GreaterEqual(homeDirectory, null);
+    public void setTitle_GreaterEqual(String title) {
+        setTitle_GreaterEqual(title, null);
     }
 
-    public void setHomeDirectory_GreaterEqual(String homeDirectory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = homeDirectory;
-        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setTitle_GreaterEqual(String title, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = title;
+        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_LessEqual(String homeDirectory) {
-        setHomeDirectory_LessEqual(homeDirectory, null);
+    public void setTitle_LessEqual(String title) {
+        setTitle_LessEqual(title, null);
     }
 
-    public void setHomeDirectory_LessEqual(String homeDirectory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = homeDirectory;
-        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setTitle_LessEqual(String title, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = title;
+        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_Exists() {
-        setHomeDirectory_Exists(null);
+    public void setTitle_Exists() {
+        setTitle_Exists(null);
     }
 
-    public void setHomeDirectory_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("homeDirectory");
+    public void setTitle_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("title");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setHomeDirectory_CommonTerms(String homeDirectory) {
-        setHomeDirectory_CommonTerms(homeDirectory, null);
+    public void setTitle_CommonTerms(String title) {
+        setTitle_CommonTerms(title, null);
     }
 
-    public void setHomeDirectory_CommonTerms(String homeDirectory, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("homeDirectory", homeDirectory);
+    public void setTitle_CommonTerms(String title, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("title", title);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_HomeDirectory_Asc() {
-        regOBA("homeDirectory");
+    public BsUserCQ addOrderBy_Title_Asc() {
+        regOBA("title");
         return this;
     }
 
-    public BsUserCQ addOrderBy_HomeDirectory_Desc() {
-        regOBD("homeDirectory");
+    public BsUserCQ addOrderBy_Title_Desc() {
+        regOBD("title");
         return this;
     }
 
-    public void setGroups_Equal(String groups) {
-        setGroups_Term(groups, null);
-    }
-
-    public void setGroups_Equal(String groups, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setGroups_Term(groups, opLambda);
-    }
-
-    public void setGroups_Term(String groups) {
-        setGroups_Term(groups, null);
-    }
-
-    public void setGroups_Term(String groups, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("groups", groups);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setGroups_NotEqual(String groups) {
-        setGroups_NotTerm(groups, null);
-    }
-
-    public void setGroups_NotTerm(String groups) {
-        setGroups_NotTerm(groups, null);
-    }
-
-    public void setGroups_NotEqual(String groups, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setGroups_NotTerm(groups, opLambda);
+    public void setUidNumber_Equal(Long uidNumber) {
+        setUidNumber_Term(uidNumber, null);
     }
 
-    public void setGroups_NotTerm(String groups, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setGroups_Term(groups), opLambda);
+    public void setUidNumber_Equal(Long uidNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setUidNumber_Term(uidNumber, opLambda);
     }
 
-    public void setGroups_Terms(Collection<String> groupsList) {
-        setGroups_Terms(groupsList, null);
+    public void setUidNumber_Term(Long uidNumber) {
+        setUidNumber_Term(uidNumber, null);
     }
 
-    public void setGroups_Terms(Collection<String> groupsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("groups", groupsList);
+    public void setUidNumber_Term(Long uidNumber, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("uidNumber", uidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGroups_InScope(Collection<String> groupsList) {
-        setGroups_Terms(groupsList, null);
-    }
-
-    public void setGroups_InScope(Collection<String> groupsList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setGroups_Terms(groupsList, opLambda);
-    }
-
-    public void setGroups_Match(String groups) {
-        setGroups_Match(groups, null);
+    public void setUidNumber_NotEqual(Long uidNumber) {
+        setUidNumber_NotTerm(uidNumber, null);
     }
 
-    public void setGroups_Match(String groups, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("groups", groups);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUidNumber_NotTerm(Long uidNumber) {
+        setUidNumber_NotTerm(uidNumber, null);
     }
 
-    public void setGroups_MatchPhrase(String groups) {
-        setGroups_MatchPhrase(groups, null);
+    public void setUidNumber_NotEqual(Long uidNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUidNumber_NotTerm(uidNumber, opLambda);
     }
 
-    public void setGroups_MatchPhrase(String groups, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("groups", groups);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUidNumber_NotTerm(Long uidNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUidNumber_Term(uidNumber), opLambda);
     }
 
-    public void setGroups_MatchPhrasePrefix(String groups) {
-        setGroups_MatchPhrasePrefix(groups, null);
+    public void setUidNumber_Terms(Collection<Long> uidNumberList) {
+        setUidNumber_Terms(uidNumberList, null);
     }
 
-    public void setGroups_MatchPhrasePrefix(String groups, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("groups", groups);
+    public void setUidNumber_Terms(Collection<Long> uidNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("uidNumber", uidNumberList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGroups_Fuzzy(String groups) {
-        setGroups_Fuzzy(groups, null);
+    public void setUidNumber_InScope(Collection<Long> uidNumberList) {
+        setUidNumber_Terms(uidNumberList, null);
     }
 
-    public void setGroups_Fuzzy(String groups, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("groups", groups);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUidNumber_InScope(Collection<Long> uidNumberList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setUidNumber_Terms(uidNumberList, opLambda);
     }
 
-    public void setGroups_Prefix(String groups) {
-        setGroups_Prefix(groups, null);
+    public void setUidNumber_Match(Long uidNumber) {
+        setUidNumber_Match(uidNumber, null);
     }
 
-    public void setGroups_Prefix(String groups, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("groups", groups);
+    public void setUidNumber_Match(Long uidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("uidNumber", uidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGroups_Wildcard(String groups) {
-        setGroups_Wildcard(groups, null);
+    public void setUidNumber_MatchPhrase(Long uidNumber) {
+        setUidNumber_MatchPhrase(uidNumber, null);
     }
 
-    public void setGroups_Wildcard(String groups, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("groups", groups);
+    public void setUidNumber_MatchPhrase(Long uidNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("uidNumber", uidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGroups_Regexp(String groups) {
-        setGroups_Regexp(groups, null);
+    public void setUidNumber_MatchPhrasePrefix(Long uidNumber) {
+        setUidNumber_MatchPhrasePrefix(uidNumber, null);
     }
 
-    public void setGroups_Regexp(String groups, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("groups", groups);
+    public void setUidNumber_MatchPhrasePrefix(Long uidNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("uidNumber", uidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGroups_SpanTerm(String groups) {
-        setGroups_SpanTerm("groups", null);
+    public void setUidNumber_Fuzzy(Long uidNumber) {
+        setUidNumber_Fuzzy(uidNumber, null);
     }
 
-    public void setGroups_SpanTerm(String groups, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("groups", groups);
+    public void setUidNumber_Fuzzy(Long uidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("uidNumber", uidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGroups_GreaterThan(String groups) {
-        setGroups_GreaterThan(groups, null);
+    public void setUidNumber_GreaterThan(Long uidNumber) {
+        setUidNumber_GreaterThan(uidNumber, null);
     }
 
-    public void setGroups_GreaterThan(String groups, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = groups;
-        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_GREATER_THAN, _value);
+    public void setUidNumber_GreaterThan(Long uidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = uidNumber;
+        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGroups_LessThan(String groups) {
-        setGroups_LessThan(groups, null);
+    public void setUidNumber_LessThan(Long uidNumber) {
+        setUidNumber_LessThan(uidNumber, null);
     }
 
-    public void setGroups_LessThan(String groups, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = groups;
-        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_LESS_THAN, _value);
+    public void setUidNumber_LessThan(Long uidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = uidNumber;
+        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGroups_GreaterEqual(String groups) {
-        setGroups_GreaterEqual(groups, null);
+    public void setUidNumber_GreaterEqual(Long uidNumber) {
+        setUidNumber_GreaterEqual(uidNumber, null);
     }
 
-    public void setGroups_GreaterEqual(String groups, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = groups;
-        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setUidNumber_GreaterEqual(Long uidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = uidNumber;
+        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGroups_LessEqual(String groups) {
-        setGroups_LessEqual(groups, null);
+    public void setUidNumber_LessEqual(Long uidNumber) {
+        setUidNumber_LessEqual(uidNumber, null);
     }
 
-    public void setGroups_LessEqual(String groups, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = groups;
-        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setUidNumber_LessEqual(Long uidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = uidNumber;
+        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGroups_Exists() {
-        setGroups_Exists(null);
+    public void setUidNumber_Exists() {
+        setUidNumber_Exists(null);
     }
 
-    public void setGroups_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("groups");
+    public void setUidNumber_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setGroups_CommonTerms(String groups) {
-        setGroups_CommonTerms(groups, null);
+    public void setUidNumber_CommonTerms(Long uidNumber) {
+        setUidNumber_CommonTerms(uidNumber, null);
     }
 
-    public void setGroups_CommonTerms(String groups, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("groups", groups);
+    public void setUidNumber_CommonTerms(Long uidNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("uidNumber", uidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_Groups_Asc() {
-        regOBA("groups");
+    public BsUserCQ addOrderBy_UidNumber_Asc() {
+        regOBA("uidNumber");
         return this;
     }
 
-    public BsUserCQ addOrderBy_Groups_Desc() {
-        regOBD("groups");
+    public BsUserCQ addOrderBy_UidNumber_Desc() {
+        regOBD("uidNumber");
         return this;
     }
 
-    public void setRoles_Equal(String roles) {
-        setRoles_Term(roles, null);
+    public void setX121Address_Equal(String x121Address) {
+        setX121Address_Term(x121Address, null);
     }
 
-    public void setRoles_Equal(String roles, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setRoles_Term(roles, opLambda);
+    public void setX121Address_Equal(String x121Address, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setX121Address_Term(x121Address, opLambda);
     }
 
-    public void setRoles_Term(String roles) {
-        setRoles_Term(roles, null);
+    public void setX121Address_Term(String x121Address) {
+        setX121Address_Term(x121Address, null);
     }
 
-    public void setRoles_Term(String roles, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("roles", roles);
+    public void setX121Address_Term(String x121Address, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("x121Address", x121Address);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_NotEqual(String roles) {
-        setRoles_NotTerm(roles, null);
+    public void setX121Address_NotEqual(String x121Address) {
+        setX121Address_NotTerm(x121Address, null);
     }
 
-    public void setRoles_NotTerm(String roles) {
-        setRoles_NotTerm(roles, null);
+    public void setX121Address_NotTerm(String x121Address) {
+        setX121Address_NotTerm(x121Address, null);
     }
 
-    public void setRoles_NotEqual(String roles, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        setRoles_NotTerm(roles, opLambda);
+    public void setX121Address_NotEqual(String x121Address, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setX121Address_NotTerm(x121Address, opLambda);
     }
 
-    public void setRoles_NotTerm(String roles, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        not(not -> not.setRoles_Term(roles), opLambda);
+    public void setX121Address_NotTerm(String x121Address, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setX121Address_Term(x121Address), opLambda);
     }
 
-    public void setRoles_Terms(Collection<String> rolesList) {
-        setRoles_Terms(rolesList, null);
+    public void setX121Address_Terms(Collection<String> x121AddressList) {
+        setX121Address_Terms(x121AddressList, null);
     }
 
-    public void setRoles_Terms(Collection<String> rolesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("roles", rolesList);
+    public void setX121Address_Terms(Collection<String> x121AddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("x121Address", x121AddressList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_InScope(Collection<String> rolesList) {
-        setRoles_Terms(rolesList, null);
+    public void setX121Address_InScope(Collection<String> x121AddressList) {
+        setX121Address_Terms(x121AddressList, null);
     }
 
-    public void setRoles_InScope(Collection<String> rolesList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setRoles_Terms(rolesList, opLambda);
+    public void setX121Address_InScope(Collection<String> x121AddressList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setX121Address_Terms(x121AddressList, opLambda);
     }
 
-    public void setRoles_Match(String roles) {
-        setRoles_Match(roles, null);
+    public void setX121Address_Match(String x121Address) {
+        setX121Address_Match(x121Address, null);
     }
 
-    public void setRoles_Match(String roles, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("roles", roles);
+    public void setX121Address_Match(String x121Address, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("x121Address", x121Address);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_MatchPhrase(String roles) {
-        setRoles_MatchPhrase(roles, null);
+    public void setX121Address_MatchPhrase(String x121Address) {
+        setX121Address_MatchPhrase(x121Address, null);
     }
 
-    public void setRoles_MatchPhrase(String roles, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
-        MatchPhraseQueryBuilder builder = regMatchPhraseQ("roles", roles);
+    public void setX121Address_MatchPhrase(String x121Address, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("x121Address", x121Address);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_MatchPhrasePrefix(String roles) {
-        setRoles_MatchPhrasePrefix(roles, null);
+    public void setX121Address_MatchPhrasePrefix(String x121Address) {
+        setX121Address_MatchPhrasePrefix(x121Address, null);
     }
 
-    public void setRoles_MatchPhrasePrefix(String roles, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
-        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("roles", roles);
+    public void setX121Address_MatchPhrasePrefix(String x121Address, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("x121Address", x121Address);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_Fuzzy(String roles) {
-        setRoles_Fuzzy(roles, null);
+    public void setX121Address_Fuzzy(String x121Address) {
+        setX121Address_Fuzzy(x121Address, null);
     }
 
-    public void setRoles_Fuzzy(String roles, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regFuzzyQ("roles", roles);
+    public void setX121Address_Fuzzy(String x121Address, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("x121Address", x121Address);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_Prefix(String roles) {
-        setRoles_Prefix(roles, null);
+    public void setX121Address_Prefix(String x121Address) {
+        setX121Address_Prefix(x121Address, null);
     }
 
-    public void setRoles_Prefix(String roles, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("roles", roles);
+    public void setX121Address_Prefix(String x121Address, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("x121Address", x121Address);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_Wildcard(String roles) {
-        setRoles_Wildcard(roles, null);
+    public void setX121Address_Wildcard(String x121Address) {
+        setX121Address_Wildcard(x121Address, null);
     }
 
-    public void setRoles_Wildcard(String roles, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
-        WildcardQueryBuilder builder = regWildcardQ("roles", roles);
+    public void setX121Address_Wildcard(String x121Address, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+        WildcardQueryBuilder builder = regWildcardQ("x121Address", x121Address);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_Regexp(String roles) {
-        setRoles_Regexp(roles, null);
+    public void setX121Address_Regexp(String x121Address) {
+        setX121Address_Regexp(x121Address, null);
     }
 
-    public void setRoles_Regexp(String roles, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
-        RegexpQueryBuilder builder = regRegexpQ("roles", roles);
+    public void setX121Address_Regexp(String x121Address, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
+        RegexpQueryBuilder builder = regRegexpQ("x121Address", x121Address);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_SpanTerm(String roles) {
-        setRoles_SpanTerm("roles", null);
+    public void setX121Address_SpanTerm(String x121Address) {
+        setX121Address_SpanTerm("x121Address", null);
     }
 
-    public void setRoles_SpanTerm(String roles, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
-        SpanTermQueryBuilder builder = regSpanTermQ("roles", roles);
+    public void setX121Address_SpanTerm(String x121Address, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("x121Address", x121Address);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_GreaterThan(String roles) {
-        setRoles_GreaterThan(roles, null);
+    public void setX121Address_GreaterThan(String x121Address) {
+        setX121Address_GreaterThan(x121Address, null);
     }
 
-    public void setRoles_GreaterThan(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = roles;
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_THAN, _value);
+    public void setX121Address_GreaterThan(String x121Address, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = x121Address;
+        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_LessThan(String roles) {
-        setRoles_LessThan(roles, null);
+    public void setX121Address_LessThan(String x121Address) {
+        setX121Address_LessThan(x121Address, null);
     }
 
-    public void setRoles_LessThan(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = roles;
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_THAN, _value);
+    public void setX121Address_LessThan(String x121Address, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = x121Address;
+        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_GreaterEqual(String roles) {
-        setRoles_GreaterEqual(roles, null);
+    public void setX121Address_GreaterEqual(String x121Address) {
+        setX121Address_GreaterEqual(x121Address, null);
     }
 
-    public void setRoles_GreaterEqual(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = roles;
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_EQUAL, _value);
+    public void setX121Address_GreaterEqual(String x121Address, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = x121Address;
+        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_LessEqual(String roles) {
-        setRoles_LessEqual(roles, null);
+    public void setX121Address_LessEqual(String x121Address) {
+        setX121Address_LessEqual(x121Address, null);
     }
 
-    public void setRoles_LessEqual(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        final Object _value = roles;
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_EQUAL, _value);
+    public void setX121Address_LessEqual(String x121Address, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        final Object _value = x121Address;
+        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_Exists() {
-        setRoles_Exists(null);
+    public void setX121Address_Exists() {
+        setX121Address_Exists(null);
     }
 
-    public void setRoles_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
-        ExistsQueryBuilder builder = regExistsQ("roles");
+    public void setX121Address_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
+        ExistsQueryBuilder builder = regExistsQ("x121Address");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setRoles_CommonTerms(String roles) {
-        setRoles_CommonTerms(roles, null);
+    public void setX121Address_CommonTerms(String x121Address) {
+        setX121Address_CommonTerms(x121Address, null);
     }
 
-    public void setRoles_CommonTerms(String roles, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
-        CommonTermsQueryBuilder builder = regCommonTermsQ("roles", roles);
+    public void setX121Address_CommonTerms(String x121Address, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+        CommonTermsQueryBuilder builder = regCommonTermsQ("x121Address", x121Address);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_Roles_Asc() {
-        regOBA("roles");
+    public BsUserCQ addOrderBy_X121Address_Asc() {
+        regOBA("x121Address");
         return this;
     }
 
-    public BsUserCQ addOrderBy_Roles_Desc() {
-        regOBD("roles");
+    public BsUserCQ addOrderBy_X121Address_Desc() {
+        regOBD("x121Address");
         return this;
     }
 
diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
index f7aea70c1341b2873921a77ce22a9a488b91208b..e3c0173d4a66d0100e70d7c8a5d82f9a558423ac 100644
--- a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
@@ -38,9 +38,9 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.aggregations.BucketOrder;
 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.TermsAggregationBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -171,7 +171,7 @@ public class CrawlingInfoHelper {
                     queryRequestBuilder.setQuery(QueryBuilders.matchAllQuery());
                     final TermsAggregationBuilder termsBuilder =
                             AggregationBuilders.terms(fessConfig.getIndexFieldSegment()).field(fessConfig.getIndexFieldSegment())
-                                    .size(maxSessionIdsInList).order(Order.term(false));
+                                    .size(maxSessionIdsInList).order(BucketOrder.key(false));
                     queryRequestBuilder.addAggregation(termsBuilder);
                     queryRequestBuilder.setPreference(Constants.SEARCH_PREFERENCE_PRIMARY);
                     return true;
diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
index f5a81973595e3d91421ce4e99c1bd047e2be365d..32159b844d6179b46f5e7870094654fc7b4ec2ff 100644
--- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
@@ -194,8 +194,8 @@ public class SuggestHelper {
                             reader.setLimitNumber(fessConfig.getSuggestUpdateContentsLimitNumAsInteger());
 
                             final List<FunctionScoreQueryBuilder.FilterFunctionBuilder> flist = new ArrayList<>();
-                            flist.add(new FunctionScoreQueryBuilder.FilterFunctionBuilder(ScoreFunctionBuilders.randomFunction(System
-                                    .currentTimeMillis())));
+                            flist.add(new FunctionScoreQueryBuilder.FilterFunctionBuilder(ScoreFunctionBuilders.randomFunction().seed(
+                                    System.currentTimeMillis())));
                             reader.setQuery(QueryBuilders.functionScoreQuery(QueryBuilders.matchAllQuery(),
                                     flist.toArray(new FunctionScoreQueryBuilder.FilterFunctionBuilder[flist.size()])).boostMode(
                                     CombineFunction.MULTIPLY));
diff --git a/src/main/java/org/codelibs/fess/util/QueryResponseList.java b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
index 21c2460455c7d63e92613a134cdd24b5b5a2013b..8502216a8eeb92678591728b97a5e43b5165a52c 100644
--- a/src/main/java/org/codelibs/fess/util/QueryResponseList.java
+++ b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
@@ -30,9 +30,9 @@ import org.codelibs.fess.helper.ViewHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.common.document.DocumentField;
 import org.elasticsearch.common.text.Text;
 import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHitField;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.Aggregations;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
@@ -91,7 +91,7 @@ public class QueryResponseList implements List<Map<String, Object>> {
             final FessConfig fessConfig = ComponentUtil.getFessConfig();
             final SearchHits searchHits = searchResponse.getHits();
             allRecordCount = searchHits.getTotalHits();
-            queryTime = searchResponse.getTookInMillis();
+            queryTime = searchResponse.getTook().millis();
 
             if (searchResponse.getTotalShards() != searchResponse.getSuccessfulShards()) {
                 partialResults = true;
@@ -111,8 +111,7 @@ public class QueryResponseList implements List<Map<String, Object>> {
                                 final long totalHits = innerSearchHits.getTotalHits();
                                 if (totalHits > 1) {
                                     docMap.put(fessConfig.getQueryCollapseInnerHitsName() + "_count", totalHits);
-                                    final SearchHitField bitsField =
-                                            searchHit.getFields().get(fessConfig.getIndexFieldContentMinhashBits());
+                                    final DocumentField bitsField = searchHit.getFields().get(fessConfig.getIndexFieldContentMinhashBits());
                                     if (bitsField != null && !bitsField.getValues().isEmpty()) {
                                         docMap.put(fessConfig.getQueryCollapseInnerHitsName() + "_hash", bitsField.getValues().get(0));
                                     }
@@ -142,12 +141,12 @@ public class QueryResponseList implements List<Map<String, Object>> {
 
     private Map<String, Object> parseSearchHit(final FessConfig fessConfig, final String hlPrefix, final SearchHit searchHit) {
         final Map<String, Object> docMap = new HashMap<>();
-        if (searchHit.getSource() == null) {
+        if (searchHit.getSourceAsMap() == null) {
             searchHit.getFields().forEach((key, value) -> {
                 docMap.put(key, value.getValue());
             });
         } else {
-            docMap.putAll(searchHit.getSource());
+            docMap.putAll(searchHit.getSourceAsMap());
         }
 
         final Map<String, HighlightField> highlightFields = searchHit.getHighlightFields();
diff --git a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
index 15f5323476acc7b710ea59b4683c4a65ca9b15b2..4ee989c19580f1d18531dda4de7f0161dfca37c0 100644
--- a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
+++ b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
@@ -33,7 +33,6 @@ import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.cluster.metadata.MappingMetaData;
@@ -181,11 +180,13 @@ public final class UpgradeUtil {
         return false;
     }
 
-    public static boolean existsIndex(final IndicesAdminClient indicesClient, final String index, final IndicesOptions options) {
+    public static boolean existsIndex(final IndicesAdminClient indicesClient, final String index, final boolean expandWildcardsOpen,
+            final boolean expandWildcardsClosed) {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
         try {
             final IndicesExistsResponse response =
-                    indicesClient.prepareExists(index).setIndicesOptions(options).execute().actionGet(fessConfig.getIndexSearchTimeout());
+                    indicesClient.prepareExists(index).setExpandWildcardsClosed(expandWildcardsClosed)
+                            .setExpandWildcardsOpen(expandWildcardsOpen).execute().actionGet(fessConfig.getIndexSearchTimeout());
             return response.isExists();
         } catch (final Exception e) {
             // ignore
diff --git a/src/main/resources/esclient.xml b/src/main/resources/esclient.xml
index 852ede23a742ac3af956337ba00470b062d6397c..1cb3e6b17bec21b4715cb0a9ff054d148367b716 100644
--- a/src/main/resources/esclient.xml
+++ b/src/main/resources/esclient.xml
@@ -162,120 +162,120 @@
 		</postConstruct>
 		<!-- .fess_config index -->
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/access_token"</arg>
+			<arg>".fess_config.access_token/access_token"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/bad_word"</arg>
+			<arg>".fess_config.bad_word/bad_word"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/boost_document_rule"</arg>
+			<arg>".fess_config.boost_document_rule/boost_document_rule"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/crawling_info"</arg>
+			<arg>".fess_config.crawling_info/crawling_info"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/crawling_info_param"</arg>
+			<arg>".fess_config.crawling_info_param/crawling_info_param"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/data_config"</arg>
+			<arg>".fess_config.data_config/data_config"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/data_config_to_label"</arg>
+			<arg>".fess_config.data_config_to_label/data_config_to_label"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/data_config_to_role"</arg>
+			<arg>".fess_config.data_config_to_role/data_config_to_role"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/duplicate_host"</arg>
+			<arg>".fess_config.duplicate_host/duplicate_host"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/elevate_word"</arg>
+			<arg>".fess_config.elevate_word/elevate_word"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/elevate_word_to_label"</arg>
+			<arg>".fess_config.elevate_word_to_label/elevate_word_to_label"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/failure_url"</arg>
+			<arg>".fess_config.failure_url/failure_url"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/file_authentication"</arg>
+			<arg>".fess_config.file_authentication/file_authentication"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/file_config"</arg>
+			<arg>".fess_config.file_config/file_config"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/file_config_to_label"</arg>
+			<arg>".fess_config.file_config_to_label/file_config_to_label"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/file_config_to_role"</arg>
+			<arg>".fess_config.file_config_to_role/file_config_to_role"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/job_log"</arg>
+			<arg>".fess_config.job_log/job_log"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/key_match"</arg>
+			<arg>".fess_config.key_match/key_match"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/label_to_role"</arg>
+			<arg>".fess_config.label_to_role/label_to_role"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/label_type"</arg>
+			<arg>".fess_config.label_type/label_type"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/path_mapping"</arg>
+			<arg>".fess_config.path_mapping/path_mapping"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/related_content"</arg>
+			<arg>".fess_config.related_content/related_content"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/related_query"</arg>
+			<arg>".fess_config.related_query/related_query"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/request_header"</arg>
+			<arg>".fess_config.request_header/request_header"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/role_type"</arg>
+			<arg>".fess_config.role_type/role_type"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/scheduled_job"</arg>
+			<arg>".fess_config.scheduled_job/scheduled_job"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/thumbnail_queue"</arg>
+			<arg>".fess_config.thumbnail_queue/thumbnail_queue"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/web_authentication"</arg>
+			<arg>".fess_config.web_authentication/web_authentication"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/web_config"</arg>
+			<arg>".fess_config.web_config/web_config"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/web_config_to_label"</arg>
+			<arg>".fess_config.web_config_to_label/web_config_to_label"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/web_config_to_role"</arg>
+			<arg>".fess_config.web_config_to_role/web_config_to_role"</arg>
 		</postConstruct>
 		<!-- .fess_user index -->
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_user/user"</arg>
+			<arg>".fess_user.user/user"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_user/role"</arg>
+			<arg>".fess_user.role/role"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_user/group"</arg>
+			<arg>".fess_user.group/group"</arg>
 		</postConstruct>
 		<!-- fess_log index -->
 		<postConstruct name="addIndexConfig">
-			<arg>"fess_log/click_log"</arg>
+			<arg>"fess_log.click_log/click_log"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>"fess_log/favorite_log"</arg>
+			<arg>"fess_log.favorite_log/favorite_log"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>"fess_log/search_log"</arg>
+			<arg>"fess_log.search_log/search_log"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>"fess_log/user_info"</arg>
+			<arg>"fess_log.user_info/user_info"</arg>
 		</postConstruct>
 	</component>
 </components>
diff --git a/src/main/resources/fess_indices/.fess_config.json b/src/main/resources/fess_indices/.fess_config.access_token.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config.json
rename to src/main/resources/fess_indices/.fess_config.access_token.json
diff --git a/src/main/resources/fess_indices/.fess_config/access_token.json b/src/main/resources/fess_indices/.fess_config.access_token/access_token.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/access_token.json
rename to src/main/resources/fess_indices/.fess_config.access_token/access_token.json
diff --git a/src/main/resources/fess_indices/.fess_config.bad_word.json b/src/main/resources/fess_indices/.fess_config.bad_word.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.bad_word.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/bad_word.json b/src/main/resources/fess_indices/.fess_config.bad_word/bad_word.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/bad_word.json
rename to src/main/resources/fess_indices/.fess_config.bad_word/bad_word.json
diff --git a/src/main/resources/fess_indices/.fess_config.boost_document_rule.json b/src/main/resources/fess_indices/.fess_config.boost_document_rule.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.boost_document_rule.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/boost_document_rule.json b/src/main/resources/fess_indices/.fess_config.boost_document_rule/boost_document_rule.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/boost_document_rule.json
rename to src/main/resources/fess_indices/.fess_config.boost_document_rule/boost_document_rule.json
diff --git a/src/main/resources/fess_indices/.fess_config.crawling_info.json b/src/main/resources/fess_indices/.fess_config.crawling_info.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.crawling_info.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/crawling_info.json b/src/main/resources/fess_indices/.fess_config.crawling_info/crawling_info.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/crawling_info.json
rename to src/main/resources/fess_indices/.fess_config.crawling_info/crawling_info.json
diff --git a/src/main/resources/fess_indices/.fess_config.crawling_info_param.json b/src/main/resources/fess_indices/.fess_config.crawling_info_param.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.crawling_info_param.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/crawling_info_param.json b/src/main/resources/fess_indices/.fess_config.crawling_info_param/crawling_info_param.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/crawling_info_param.json
rename to src/main/resources/fess_indices/.fess_config.crawling_info_param/crawling_info_param.json
diff --git a/src/main/resources/fess_indices/.fess_config.data_config.json b/src/main/resources/fess_indices/.fess_config.data_config.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.data_config.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/data_config.json b/src/main/resources/fess_indices/.fess_config.data_config/data_config.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/data_config.json
rename to src/main/resources/fess_indices/.fess_config.data_config/data_config.json
diff --git a/src/main/resources/fess_indices/.fess_config.data_config_to_label.json b/src/main/resources/fess_indices/.fess_config.data_config_to_label.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.data_config_to_label.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/data_config_to_label.json b/src/main/resources/fess_indices/.fess_config.data_config_to_label/data_config_to_label.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/data_config_to_label.json
rename to src/main/resources/fess_indices/.fess_config.data_config_to_label/data_config_to_label.json
diff --git a/src/main/resources/fess_indices/.fess_config.data_config_to_role.json b/src/main/resources/fess_indices/.fess_config.data_config_to_role.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.data_config_to_role.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/data_config_to_role.json b/src/main/resources/fess_indices/.fess_config.data_config_to_role/data_config_to_role.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/data_config_to_role.json
rename to src/main/resources/fess_indices/.fess_config.data_config_to_role/data_config_to_role.json
diff --git a/src/main/resources/fess_indices/.fess_config.duplicate_host.json b/src/main/resources/fess_indices/.fess_config.duplicate_host.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.duplicate_host.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/duplicate_host.json b/src/main/resources/fess_indices/.fess_config.duplicate_host/duplicate_host.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/duplicate_host.json
rename to src/main/resources/fess_indices/.fess_config.duplicate_host/duplicate_host.json
diff --git a/src/main/resources/fess_indices/.fess_config.elevate_word.json b/src/main/resources/fess_indices/.fess_config.elevate_word.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.elevate_word.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/elevate_word.json b/src/main/resources/fess_indices/.fess_config.elevate_word/elevate_word.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/elevate_word.json
rename to src/main/resources/fess_indices/.fess_config.elevate_word/elevate_word.json
diff --git a/src/main/resources/fess_indices/.fess_config.elevate_word_to_label.json b/src/main/resources/fess_indices/.fess_config.elevate_word_to_label.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.elevate_word_to_label.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/elevate_word_to_label.json b/src/main/resources/fess_indices/.fess_config.elevate_word_to_label/elevate_word_to_label.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/elevate_word_to_label.json
rename to src/main/resources/fess_indices/.fess_config.elevate_word_to_label/elevate_word_to_label.json
diff --git a/src/main/resources/fess_indices/.fess_config.failure_url.json b/src/main/resources/fess_indices/.fess_config.failure_url.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.failure_url.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/failure_url.json b/src/main/resources/fess_indices/.fess_config.failure_url/failure_url.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/failure_url.json
rename to src/main/resources/fess_indices/.fess_config.failure_url/failure_url.json
diff --git a/src/main/resources/fess_indices/.fess_config.file_authentication.json b/src/main/resources/fess_indices/.fess_config.file_authentication.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.file_authentication.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/file_authentication.json b/src/main/resources/fess_indices/.fess_config.file_authentication/file_authentication.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/file_authentication.json
rename to src/main/resources/fess_indices/.fess_config.file_authentication/file_authentication.json
diff --git a/src/main/resources/fess_indices/.fess_config.file_config.json b/src/main/resources/fess_indices/.fess_config.file_config.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.file_config.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/file_config.json b/src/main/resources/fess_indices/.fess_config.file_config/file_config.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/file_config.json
rename to src/main/resources/fess_indices/.fess_config.file_config/file_config.json
diff --git a/src/main/resources/fess_indices/.fess_config.file_config_to_label.json b/src/main/resources/fess_indices/.fess_config.file_config_to_label.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.file_config_to_label.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/file_config_to_label.json b/src/main/resources/fess_indices/.fess_config.file_config_to_label/file_config_to_label.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/file_config_to_label.json
rename to src/main/resources/fess_indices/.fess_config.file_config_to_label/file_config_to_label.json
diff --git a/src/main/resources/fess_indices/.fess_config.file_config_to_role.json b/src/main/resources/fess_indices/.fess_config.file_config_to_role.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.file_config_to_role.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/file_config_to_role.json b/src/main/resources/fess_indices/.fess_config.file_config_to_role/file_config_to_role.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/file_config_to_role.json
rename to src/main/resources/fess_indices/.fess_config.file_config_to_role/file_config_to_role.json
diff --git a/src/main/resources/fess_indices/.fess_config.job_log.json b/src/main/resources/fess_indices/.fess_config.job_log.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.job_log.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/job_log.json b/src/main/resources/fess_indices/.fess_config.job_log/job_log.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/job_log.json
rename to src/main/resources/fess_indices/.fess_config.job_log/job_log.json
diff --git a/src/main/resources/fess_indices/.fess_config.key_match.json b/src/main/resources/fess_indices/.fess_config.key_match.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.key_match.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/key_match.json b/src/main/resources/fess_indices/.fess_config.key_match/key_match.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/key_match.json
rename to src/main/resources/fess_indices/.fess_config.key_match/key_match.json
diff --git a/src/main/resources/fess_indices/.fess_config.label_to_role.json b/src/main/resources/fess_indices/.fess_config.label_to_role.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.label_to_role.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/label_to_role.json b/src/main/resources/fess_indices/.fess_config.label_to_role/label_to_role.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/label_to_role.json
rename to src/main/resources/fess_indices/.fess_config.label_to_role/label_to_role.json
diff --git a/src/main/resources/fess_indices/.fess_config.label_type.json b/src/main/resources/fess_indices/.fess_config.label_type.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.label_type.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/label_type.json b/src/main/resources/fess_indices/.fess_config.label_type/label_type.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/label_type.json
rename to src/main/resources/fess_indices/.fess_config.label_type/label_type.json
diff --git a/src/main/resources/fess_indices/.fess_config.path_mapping.json b/src/main/resources/fess_indices/.fess_config.path_mapping.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.path_mapping.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/path_mapping.json b/src/main/resources/fess_indices/.fess_config.path_mapping/path_mapping.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/path_mapping.json
rename to src/main/resources/fess_indices/.fess_config.path_mapping/path_mapping.json
diff --git a/src/main/resources/fess_indices/.fess_config.related_content.json b/src/main/resources/fess_indices/.fess_config.related_content.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.related_content.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/related_content.json b/src/main/resources/fess_indices/.fess_config.related_content/related_content.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/related_content.json
rename to src/main/resources/fess_indices/.fess_config.related_content/related_content.json
diff --git a/src/main/resources/fess_indices/.fess_config.related_query.json b/src/main/resources/fess_indices/.fess_config.related_query.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.related_query.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/related_query.json b/src/main/resources/fess_indices/.fess_config.related_query/related_query.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/related_query.json
rename to src/main/resources/fess_indices/.fess_config.related_query/related_query.json
diff --git a/src/main/resources/fess_indices/.fess_config.request_header.json b/src/main/resources/fess_indices/.fess_config.request_header.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.request_header.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/request_header.json b/src/main/resources/fess_indices/.fess_config.request_header/request_header.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/request_header.json
rename to src/main/resources/fess_indices/.fess_config.request_header/request_header.json
diff --git a/src/main/resources/fess_indices/.fess_config.role_type.json b/src/main/resources/fess_indices/.fess_config.role_type.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.role_type.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/role_type.json b/src/main/resources/fess_indices/.fess_config.role_type/role_type.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/role_type.json
rename to src/main/resources/fess_indices/.fess_config.role_type/role_type.json
diff --git a/src/main/resources/fess_indices/.fess_config.scheduled_job.json b/src/main/resources/fess_indices/.fess_config.scheduled_job.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.scheduled_job.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/scheduled_job.bulk b/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.bulk
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/scheduled_job.bulk
rename to src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.bulk
diff --git a/src/main/resources/fess_indices/.fess_config/scheduled_job.json b/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.json
similarity index 97%
rename from src/main/resources/fess_indices/.fess_config/scheduled_job.json
rename to src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.json
index 5a6addf6ff2acbacfa7c5af6a8f52509be24d588..5c5231a3e2dcd448236343823169310b05f66faa 100644
--- a/src/main/resources/fess_indices/.fess_config/scheduled_job.json
+++ b/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.json
@@ -23,7 +23,7 @@
         "type": "keyword"
       },
       "crawler": {
-        "type": "keyword"
+        "type": "boolean"
       },
       "jobLogging": {
         "type": "boolean"
diff --git a/src/main/resources/fess_indices/.fess_config.thumbnail_queue.json b/src/main/resources/fess_indices/.fess_config.thumbnail_queue.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.thumbnail_queue.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/thumbnail_queue.json b/src/main/resources/fess_indices/.fess_config.thumbnail_queue/thumbnail_queue.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/thumbnail_queue.json
rename to src/main/resources/fess_indices/.fess_config.thumbnail_queue/thumbnail_queue.json
diff --git a/src/main/resources/fess_indices/.fess_config.web_authentication.json b/src/main/resources/fess_indices/.fess_config.web_authentication.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.web_authentication.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/web_authentication.json b/src/main/resources/fess_indices/.fess_config.web_authentication/web_authentication.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/web_authentication.json
rename to src/main/resources/fess_indices/.fess_config.web_authentication/web_authentication.json
diff --git a/src/main/resources/fess_indices/.fess_config.web_config.json b/src/main/resources/fess_indices/.fess_config.web_config.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.web_config.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/web_config.json b/src/main/resources/fess_indices/.fess_config.web_config/web_config.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/web_config.json
rename to src/main/resources/fess_indices/.fess_config.web_config/web_config.json
diff --git a/src/main/resources/fess_indices/.fess_config.web_config_to_label.json b/src/main/resources/fess_indices/.fess_config.web_config_to_label.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.web_config_to_label.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/web_config_to_label.json b/src/main/resources/fess_indices/.fess_config.web_config_to_label/web_config_to_label.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/web_config_to_label.json
rename to src/main/resources/fess_indices/.fess_config.web_config_to_label/web_config_to_label.json
diff --git a/src/main/resources/fess_indices/.fess_config.web_config_to_role.json b/src/main/resources/fess_indices/.fess_config.web_config_to_role.json
new file mode 100644
index 0000000000000000000000000000000000000000..def7bad83a4a7c7057a72776c334d574a4d28aa0
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_config.web_config_to_role.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 2,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_config/web_config_to_role.json b/src/main/resources/fess_indices/.fess_config.web_config_to_role/web_config_to_role.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_config/web_config_to_role.json
rename to src/main/resources/fess_indices/.fess_config.web_config_to_role/web_config_to_role.json
diff --git a/src/main/resources/fess_indices/.fess_config/alias/.fess_basic_config.json b/src/main/resources/fess_indices/.fess_config/alias/.fess_basic_config.json
deleted file mode 100644
index 8770ab3a501bad4d20cb4489fd4dc8a3d09b3554..0000000000000000000000000000000000000000
--- a/src/main/resources/fess_indices/.fess_config/alias/.fess_basic_config.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "bool": {
-    "must_not": [
-      {
-        "type": {
-          "value": "crawling_info"
-        }
-      },
-      {
-        "type": {
-          "value": "crawling_info_param"
-        }
-      },
-      {
-        "type": {
-          "value": "failure_url"
-        }
-      },
-      {
-        "type": {
-          "value": "job_log"
-        }
-      },
-      {
-        "type": {
-          "value": "thumbnail_queue"
-        }
-      }
-    ]
-  }
-}
diff --git a/src/main/resources/fess_indices/.fess_user.json b/src/main/resources/fess_indices/.fess_user.group.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_user.json
rename to src/main/resources/fess_indices/.fess_user.group.json
diff --git a/src/main/resources/fess_indices/.fess_user/group.json b/src/main/resources/fess_indices/.fess_user.group/group.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_user/group.json
rename to src/main/resources/fess_indices/.fess_user.group/group.json
diff --git a/src/main/resources/fess_indices/.fess_user.role.json b/src/main/resources/fess_indices/.fess_user.role.json
new file mode 100644
index 0000000000000000000000000000000000000000..095b0fe6a41750050f28bad529c6dcfe0adc4f67
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_user.role.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 5,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_user/role.bulk b/src/main/resources/fess_indices/.fess_user.role/role.bulk
similarity index 100%
rename from src/main/resources/fess_indices/.fess_user/role.bulk
rename to src/main/resources/fess_indices/.fess_user.role/role.bulk
diff --git a/src/main/resources/fess_indices/.fess_user/role.json b/src/main/resources/fess_indices/.fess_user.role/role.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_user/role.json
rename to src/main/resources/fess_indices/.fess_user.role/role.json
diff --git a/src/main/resources/fess_indices/.fess_user.user.json b/src/main/resources/fess_indices/.fess_user.user.json
new file mode 100644
index 0000000000000000000000000000000000000000..095b0fe6a41750050f28bad529c6dcfe0adc4f67
--- /dev/null
+++ b/src/main/resources/fess_indices/.fess_user.user.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 5,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/.fess_user/user.bulk b/src/main/resources/fess_indices/.fess_user.user/user.bulk
similarity index 100%
rename from src/main/resources/fess_indices/.fess_user/user.bulk
rename to src/main/resources/fess_indices/.fess_user.user/user.bulk
diff --git a/src/main/resources/fess_indices/.fess_user/user.json b/src/main/resources/fess_indices/.fess_user.user/user.json
similarity index 100%
rename from src/main/resources/fess_indices/.fess_user/user.json
rename to src/main/resources/fess_indices/.fess_user.user/user.json
diff --git a/src/main/resources/fess_indices/fess_log.json b/src/main/resources/fess_indices/fess_log.click_log.json
similarity index 100%
rename from src/main/resources/fess_indices/fess_log.json
rename to src/main/resources/fess_indices/fess_log.click_log.json
diff --git a/src/main/resources/fess_indices/fess_log/click_log.json b/src/main/resources/fess_indices/fess_log.click_log/click_log.json
similarity index 100%
rename from src/main/resources/fess_indices/fess_log/click_log.json
rename to src/main/resources/fess_indices/fess_log.click_log/click_log.json
diff --git a/src/main/resources/fess_indices/fess_log.favorite_log.json b/src/main/resources/fess_indices/fess_log.favorite_log.json
new file mode 100644
index 0000000000000000000000000000000000000000..e3657f0d6d2e2e1f9e41ee68441db9b7ab41ff36
--- /dev/null
+++ b/src/main/resources/fess_indices/fess_log.favorite_log.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 10,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/fess_log/favorite_log.json b/src/main/resources/fess_indices/fess_log.favorite_log/favorite_log.json
similarity index 100%
rename from src/main/resources/fess_indices/fess_log/favorite_log.json
rename to src/main/resources/fess_indices/fess_log.favorite_log/favorite_log.json
diff --git a/src/main/resources/fess_indices/fess_log.search_log.json b/src/main/resources/fess_indices/fess_log.search_log.json
new file mode 100644
index 0000000000000000000000000000000000000000..e3657f0d6d2e2e1f9e41ee68441db9b7ab41ff36
--- /dev/null
+++ b/src/main/resources/fess_indices/fess_log.search_log.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 10,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/fess_log/search_log.json b/src/main/resources/fess_indices/fess_log.search_log/search_log.json
similarity index 100%
rename from src/main/resources/fess_indices/fess_log/search_log.json
rename to src/main/resources/fess_indices/fess_log.search_log/search_log.json
diff --git a/src/main/resources/fess_indices/fess_log.user_info.json b/src/main/resources/fess_indices/fess_log.user_info.json
new file mode 100644
index 0000000000000000000000000000000000000000..e3657f0d6d2e2e1f9e41ee68441db9b7ab41ff36
--- /dev/null
+++ b/src/main/resources/fess_indices/fess_log.user_info.json
@@ -0,0 +1,9 @@
+{
+  "settings": {
+    "index": {
+      "refresh_interval": "1s",
+      "number_of_shards": 10,
+      "number_of_replicas": 0
+    }
+  }
+}
diff --git a/src/main/resources/fess_indices/fess_log/user_info.json b/src/main/resources/fess_indices/fess_log.user_info/user_info.json
similarity index 100%
rename from src/main/resources/fess_indices/fess_log/user_info.json
rename to src/main/resources/fess_indices/fess_log.user_info/user_info.json
diff --git a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
index e3591e1f3d009968aa2e47fbbbe971094d105074..85aec53b271d0b40fc4a590133dd3782d8170a86 100644
--- a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
+++ b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
@@ -43,7 +43,6 @@ public class QueryHelperTest extends UnitFessTestCase {
         queryHelper = new QueryHelper() {
             protected QueryParser getQueryParser() {
                 ExtendableQueryParser queryParser = new ExtendableQueryParser(Constants.DEFAULT_FIELD, new WhitespaceAnalyzer());
-                queryParser.setLowercaseExpandedTerms(false);
                 queryParser.setAllowLeadingWildcard(true);
                 queryParser.setDefaultOperator(QueryParser.Operator.AND);
                 return queryParser;
diff --git a/src/test/java/org/codelibs/fess/it/search/SearchApiTests.java b/src/test/java/org/codelibs/fess/it/search/SearchApiTests.java
index 54bfcca7df12e2b91ca700972dedbeeeae7ed20d..f2512ac4faad912ad94f182134429fd743e267be 100644
--- a/src/test/java/org/codelibs/fess/it/search/SearchApiTests.java
+++ b/src/test/java/org/codelibs/fess/it/search/SearchApiTests.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2012-2017 CodeLibs Project and the Others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
 package org.codelibs.fess.it.search;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;