diff --git a/dbflute-engine/.classpath b/dbflute-engine/.classpath
index 8b1478f50..49fa3a9fd 100644
--- a/dbflute-engine/.classpath
+++ b/dbflute-engine/.classpath
@@ -2,8 +2,16 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="lib" path="lib/dbflute-runtime.jar" sourcepath="lib/sources/dbflute-runtime-sources.jar"/>
 	<classpathentry kind="lib" path="lib/poi-3.12.jar"/>
diff --git a/dbflute-engine/.settings/org.eclipse.jdt.core.prefs b/dbflute-engine/.settings/org.eclipse.jdt.core.prefs
index 23c51b47a..cd97f1179 100644
--- a/dbflute-engine/.settings/org.eclipse.jdt.core.prefs
+++ b/dbflute-engine/.settings/org.eclipse.jdt.core.prefs
@@ -66,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/dbflute-engine/.settings/org.eclipse.jdt.ui.prefs b/dbflute-engine/.settings/org.eclipse.jdt.ui.prefs
index 222081773..4f6077494 100644
--- a/dbflute-engine/.settings/org.eclipse.jdt.ui.prefs
+++ b/dbflute-engine/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,63 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=false
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false
+cleanup.qualify_static_member_accesses_with_declaring_class=false
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=false
+cleanup.remove_trailing_whitespaces=false
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=false
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=false
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_DBFluteCore CleanUp
+cleanup_settings_version=2
 eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false
 formatter_profile=_DBFlute Style
 formatter_settings_version=12
 internal.default.compliance=default
@@ -7,3 +66,60 @@ org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=99
 org.eclipse.jdt.ui.staticondemandthreshold=99
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/dbflute-engine/build.xml b/dbflute-engine/build.xml
index dd88a91c5..82519b7b1 100644
--- a/dbflute-engine/build.xml
+++ b/dbflute-engine/build.xml
@@ -5,9 +5,9 @@
 	<!--                                          ==================================== -->
 
 	<!-- Version -->
-	<property name="version" value="1.1.8" />
+	<property name="version" value="1.1.9" />
 	<property name="build.version" value="${version}" />
-	<property name="runtime.version" value="1.1.8" />
+	<property name="runtime.version" value="1.1.9" />
 	<property name="runtime.build.version" value="${runtime.version}" />
 	<property name="example.latest.version" value="1.x" />
 
diff --git a/dbflute-engine/deploy-script/all-dist-deploy.sh b/dbflute-engine/deploy-script/all-dist-deploy.sh
index 8da80cef2..25bb472d8 100644
--- a/dbflute-engine/deploy-script/all-dist-deploy.sh
+++ b/dbflute-engine/deploy-script/all-dist-deploy.sh
@@ -37,9 +37,9 @@ mvn -e compile
 cd ../dbflute-test-active-hangar/dbflute_maihamadb
 rm ./log/*.log
 . manage.sh renewal
-. manage.sh load-data-reverse
 . manage.sh freegen
 . diffworld-test.sh
+. lrevworld-test.sh
 . syncworld-test.sh
 cd ..
 mvn -e compile
diff --git a/dbflute-engine/deploy-script/ossdb-dist-deploy.sh b/dbflute-engine/deploy-script/ossdb-dist-deploy.sh
index 3a9595260..b21d54d44 100644
--- a/dbflute-engine/deploy-script/ossdb-dist-deploy.sh
+++ b/dbflute-engine/deploy-script/ossdb-dist-deploy.sh
@@ -34,9 +34,9 @@ mvn -e compile
 cd ../dbflute-test-active-hangar/dbflute_maihamadb
 rm ./log/*.log
 . manage.sh renewal
-. manage.sh load-data-reverse
 . manage.sh freegen
 . diffworld-test.sh
+. lrevworld-test.sh
 . syncworld-test.sh
 cd ..
 mvn -e compile
diff --git a/dbflute-engine/deploy-script/small-dist-deploy.sh b/dbflute-engine/deploy-script/small-dist-deploy.sh
index 36920a7da..483c6679e 100644
--- a/dbflute-engine/deploy-script/small-dist-deploy.sh
+++ b/dbflute-engine/deploy-script/small-dist-deploy.sh
@@ -26,9 +26,9 @@ mvn -e compile
 cd ../dbflute-test-active-hangar/dbflute_maihamadb
 rm ./log/*.log
 . manage.sh renewal
-. manage.sh load-data-reverse
 . manage.sh freegen
 . diffworld-test.sh
+. lrevworld-test.sh
 . syncworld-test.sh
 cd ..
 mvn -e compile
diff --git a/dbflute-engine/embedded/etc/client-template/dbflute_dfclient/dfprop/commonColumnMap.dfprop b/dbflute-engine/embedded/etc/client-template/dbflute_dfclient/dfprop/commonColumnMap.dfprop
index 733363243..12279e322 100644
--- a/dbflute-engine/embedded/etc/client-template/dbflute_dfclient/dfprop/commonColumnMap.dfprop
+++ b/dbflute-engine/embedded/etc/client-template/dbflute_dfclient/dfprop/commonColumnMap.dfprop
@@ -6,7 +6,7 @@
 # the user who updated the record and so on...
 # The column names are treated as case insensitive.
 #
-# The variable '$$AccessContext$$' means allcommon.AccessContext.
+# The variable '$$AccessContext$$' means AccessContext class of DBFlute.
 #
 # Example:
 # map:{
diff --git a/dbflute-engine/embedded/etc/friends/eclipse/dbflute-eclipse-editor-templates.xml b/dbflute-engine/embedded/etc/friends/eclipse/dbflute-eclipse-editor-templates.xml
index 5093dde77..a8ede75d2 100644
--- a/dbflute-engine/embedded/etc/friends/eclipse/dbflute-eclipse-editor-templates.xml
+++ b/dbflute-engine/embedded/etc/friends/eclipse/dbflute-eclipse-editor-templates.xml
@@ -8,14 +8,15 @@
 <template autoinsert="true" context="java-members" deleted="false" description="Commons Logging Logger" enabled="true" name="_clogger">${:import(org.apache.commons.logging.Log,
 	org.apache.commons.logging.LogFactory)}private static final Log
 	LOG = LogFactory.getLog(${enclosing_type}.class);</template>
-	<template autoinsert="true" context="java" deleted="false" description="Java8: forEach()" enabled="true" name="_foreach">${var}.forEach(${newName} -&gt; {
+<template autoinsert="true" context="java" deleted="false" description="Java8: forEach()" enabled="true" name="_foreach">${var}.forEach(${newName} -&gt; {
     ${cursor}
 });</template>
+<template autoinsert="true" context="java" deleted="false" description="#hope comment" enabled="true" name="_hope">    // #hope ${user} ${cursor} (${d:date('yyyy/MM/dd')})</template>
 <template autoinsert="true" context="java" deleted="false" description="Java8: Lambda KeyValue as Inline" enabled="true" name="_kvli">(key, value) -&gt; ${cursor}</template>
 <template autoinsert="true" context="java" deleted="false" description="Java8: Lambda KeyValue as Linefeed" enabled="true" name="_kvll">(key, value) -&gt; {
     ${cursor}
 }</template>
-<template autoinsert="true" context="javadoc" deleted="false" description="JavaDoc: (NotNull)" enabled="true" name="_docnotnull">(NotNull: ${comment})</template>
+<template autoinsert="true" context="javadoc" deleted="false" description="JavaDoc: (NotNull)" enabled="true" name="_docnotnull">(NotNull)</template>
 <template autoinsert="true" context="javadoc" deleted="false" description="JavaDoc: (NullAllowed: ...)" enabled="true" name="_docnullallowed">(NullAllowed: ${comment})</template>
 <template autoinsert="true" context="java-members" deleted="false" description="LastaFlute: DI for Anything" enabled="true" name="_ladany">${:import(javax.annotation.Resource)}@Resource
 private ${component} anything;</template>
@@ -54,8 +55,8 @@ public HtmlResponse ${method}(Integer ${object}Id, ${form}Form form) {
 }</template>
 <template autoinsert="true" context="java-members" deleted="false" description="LastaFlute: Execute Method as JSON response with ID and Body" enabled="true" name="_laexjson">${:import(org.lastaflute.web.Execute
     , org.lastaflute.web.response.JsonResponse)}@Execute
-public JsonResponse&lt;${bean}&gt; ${method}(Integer ${object}Id, ${body}Body body) {
-    return asJson(bean);
+public JsonResponse&lt;${result}&gt; ${method}(Integer ${object}Id, ${body}Body body) {
+    return asJson(result);
 }</template>
 <template autoinsert="true" context="java-members" deleted="false" description="LastaFlute: Public Property simply" enabled="true" name="_laprop">public ${objectType} ${objectName};</template>
 <template autoinsert="true" context="java-members" deleted="false" description="LastaFlute: Public Property as Valid Class" enabled="true" name="_lapvalidclass">${:import(org.lastaflute.web.validation.Required,javax.validation.Valid)}@Valid
@@ -93,6 +94,7 @@ public String toString() {
 	logger = LoggerFactory.getLogger(${enclosing_type}.class);</template>
 <template autoinsert="true" context="java" deleted="false" description="DBFlute: .addOrderBy_..." enabled="true" name="_order">.addOrderBy_${columnName}</template>
 <template autoinsert="true" context="java" deleted="false" description="DBFlute: cb.query()" enabled="true" name="_query">${var}.query()</template>
+<template autoinsert="true" context="java" deleted="false" description="(yyyy/MM/dd)" enabled="true" name="_reardate">// ${cursor}(${d:date('yyyy/MM/dd')})</template>
 <template autoinsert="true" context="java" deleted="false" description="Java8: collect toList()" enabled="true" name="_scolist">${:import(java.util.stream.Collectors)}.collect(Collectors.toList())</template>
 <template autoinsert="true" context="java" deleted="false" description="Java8: collect toMap()" enabled="true" name="_scomap">${:import(java.util.stream.Collectors)}.collect(Collectors.toMap(bean -&gt; bean.get${newName}, bean -&gt; bean))</template>
 <template autoinsert="true" context="java" deleted="false" description="DBFlute: cb.specify()" enabled="true" name="_specify">${var}.specify()</template>
@@ -167,8 +169,9 @@ public String toString() {
 
     // ## Assert ##
 }</template>
-<template autoinsert="true" context="java" deleted="false" description="TODO comment" enabled="true" name="_todo">    // TODO ${user} ${cursor} (${date})</template>
-<template autoinsert="true" context="java" deleted="false" description="TODO review comment" enabled="true" name="_trev">    // TODO ${you} ${message} by ${user} (${date})</template>
+<template autoinsert="true" context="java" deleted="false" description="#thinking comment" enabled="true" name="_thinking">    // #thinking ${user} ${cursor} (${d:date('yyyy/MM/dd')})</template>
+<template autoinsert="true" context="java" deleted="false" description="TODO comment" enabled="true" name="_todo">    // TODO ${user} ${cursor} (${d:date('yyyy/MM/dd')})</template>
+<template autoinsert="true" context="java" deleted="false" description="TODO review comment" enabled="true" name="_trev">    // TODO ${you} ${message} by ${user} (${d:date('yyyy/MM/dd')})</template>
 <template autoinsert="true" context="java-statements" deleted="false" description="throw new IllegalArgumentException(...)" enabled="true" name="_tharg">throw new IllegalArgumentException("The argument '${localVar}' should not be null.");</template>
 <template autoinsert="true" context="java-statements" deleted="false" description="throw new IllegalStateException(...)" enabled="true" name="_thstate">throw new IllegalStateException("${message}", ${e:localVar(java.lang.Throwable)});</template>
 
diff --git a/dbflute-engine/embedded/lib/dbflute-runtime.jar b/dbflute-engine/embedded/lib/dbflute-runtime.jar
index 77de4712a..b1e0a31dd 100644
Binary files a/dbflute-engine/embedded/lib/dbflute-runtime.jar and b/dbflute-engine/embedded/lib/dbflute-runtime.jar differ
diff --git a/dbflute-engine/embedded/lib/mysql-connector-java-5.1.40-bin.jar b/dbflute-engine/embedded/lib/mysql-connector-java-5.1.40-bin.jar
deleted file mode 100644
index 60bef5cfb..000000000
Binary files a/dbflute-engine/embedded/lib/mysql-connector-java-5.1.40-bin.jar and /dev/null differ
diff --git a/dbflute-engine/embedded/lib/mysql-connector-java-5.1.46-bin.jar b/dbflute-engine/embedded/lib/mysql-connector-java-5.1.46-bin.jar
new file mode 100644
index 000000000..94ab24c1a
Binary files /dev/null and b/dbflute-engine/embedded/lib/mysql-connector-java-5.1.46-bin.jar differ
diff --git a/dbflute-engine/embedded/templates/doc/html/datamodel.vm b/dbflute-engine/embedded/templates/doc/html/datamodel.vm
index a9d29a316..c238cfc22 100644
--- a/dbflute-engine/embedded/templates/doc/html/datamodel.vm
+++ b/dbflute-engine/embedded/templates/doc/html/datamodel.vm
@@ -66,9 +66,9 @@ h3 {
 h4 {
 	padding: 0 0 0 10px;
 	margin: 1em 10% 0 1em;
-	border-top: solid 1px #af0000;
-	border-bottom: solid 1px #af0000;
-	font-size: 1.4em;
+	border-top: none;
+	border-bottom: solid 1px #663333;
+	font-size: 1.3em;
 	color: #333333;
 }
 
@@ -240,6 +240,46 @@ span.tablefirstdatetitle {
 	color: #888888;
 }
 
+/* -------------------------------------------------
+                                    Arrange Query
+------------------------------------------------- */
+span.arrqycount {
+	font-size: 0.5em;
+}
+dl.arrqylist {
+	margin-top: 0.7em;
+	padding-left: 3em;
+}
+dl.arrqylist dt {
+	display: list-item;
+	list-style-type: circle;
+	font-size: 1.3em;
+	margin-top: 0.3em;
+}
+dl.arrqylist dd {
+	padding-left: 1em;
+}
+dl.arrqylist dd pre {
+	font-size: 1.1em;
+}
+dl.arrqylist dd.subinfo {
+	padding-left: 2em;
+}
+dl.arrqylist dd.subinfo span.sqlap {
+	font-style: italic;
+	color: #002266;
+}
+dl.arrqylist dd.subinfo span.file {
+	font-style: italic;
+	color: #002266;
+}
+dl.arrqylist dd.subinfo span.ctet {
+	color: green;
+}
+dl.arrqylist dd.subinfo span.pmb {
+	color: green;
+}
+
 /* -------------------------------------------------
                              Behavior Query Path
 ------------------------------------------------- */
@@ -336,11 +376,12 @@ dl.procedurelist dd.column pre {
 	margin: 0 auto;
 	border: 1px solid #999999;
 	padding: 15px;
-	background-color: #ffffff;
+	background-color: #fff8f8;
 	border-radius: 4px;
 }
 .decommentmodalcontent p {
 	font-size: 14px;
+	color: #222277;
 }
 .decommentinput {
 	display: block;
@@ -348,10 +389,26 @@ dl.procedurelist dd.column pre {
 	margin-top: 10px;
 	font-size: 12px;
 }
+.decommentmodal-ok-area {
+	text-align: right;
+	margin: 0em 1em 0em 0em
+}
 .decommentmodal-ok-btn {
-	margin: 10px 5px 0 0;
-	padding: 5px 10px;
-	border-radius: 4px;
+	display: inline-block;
+	margin: 0.5em 0em;
+	padding: 0.5em 1.5em 0.5em 1.5em;
+	text-decoration: none;
+	border-radius: 3px;
+	font-weight: bold;
+	color: #FFF;
+	text-align: right;
+	background-image: -webkit-linear-gradient(45deg, #709dff 0%, #b0c9ff 100%);
+	background-image: linear-gradient(45deg, #709dff 0%, #b0c9ff 100%);
+	transition: .4s;
+}
+.decommentmodal-ok-btn:hover{
+	background-image: -webkit-linear-gradient(45deg, #709dff 50%, #b0c9ff 100%);
+	background-image: linear-gradient(45deg, #709dff 50%, #b0c9ff 100%);
 }
 .decommentmodal-close-btn {
 	position: absolute;
@@ -372,6 +429,18 @@ dl.procedurelist dd.column pre {
 }
 .decommentmodal-close-btn:hover {
 	background-color: #eed;
+}
+.decomment-user-input {
+	display: none;
+}
+.decomment-user-name {
+	margin-top: 0.5em;
+	padding: 5px;
+	border: thin solid #aa3344;
+}
+.decomment-user-name-desc {
+	margin-left: 0.5em;
+	color: #222277;
 }
 	</style>
 #end
@@ -390,13 +459,17 @@ ${database.schemaHtmlJavaScriptEmbedded}
 <p class="mainschema">generated from <strong>${database.databaseSchema.catalogSchema}</strong></p>
 #end
 <div class="navilinkarea">
-#if ($database.hasClassificationDefinition() || $database.isSchemaHtmlOutsideSqlValid() || $database.isSchemaHtmlProcedureValid())
+#if ($database.hasClassificationDefinition() || $database.isSchemaHtmlArrangeQueryValid() || $database.isSchemaHtmlOutsideSqlValid() || $database.isSchemaHtmlProcedureValid())
 #set ($linkDelimiter = "")
 <p class="sublink">
 #if ($database.hasClassificationDefinition())
 ${linkDelimiter} <a href="#cdef">Classification Definition</a>
 #set ($linkDelimiter = "|")
 #end
+#if ($database.isSchemaHtmlArrangeQueryValid())
+${linkDelimiter} <a href="#arrangequery">ArrangeQuery List</a>
+#set ($linkDelimiter = "|")
+#end
 #if ($database.isSchemaHtmlOutsideSqlValid())
 ${linkDelimiter} <a href="#outsidesql">OutsideSql List</a>
 #set ($linkDelimiter = "|")
@@ -621,6 +694,34 @@ $generator.parse("doc/html/table.vm", null, "table", $table)
 </table>
 #end
 
+#if ($database.isSchemaHtmlArrangeQueryValid())
+<h2 id="arrangequery">ArrangeQuery List</h2>
+#foreach ($table in $database.tableDisplaySortedList)
+#if ($table.hasArrangeQuery())
+<h3 id="${table.tableIdForSchemaHtml}_arrqy"><a href="#${table.tableIdForSchemaHtml}">${table.tableDispName}</a></h3>
+#set ($beanMethodList = $table.arrangeQueryTable.beanMethodList)
+#if (!$beanMethodList.isEmpty())
+<h4 id="${table.tableIdForSchemaHtml}_arrqy_bean">${table.arrangeQueryTable.beanClassName}</h4>
+<dl class="arrqylist">
+#foreach ($beanMethod in $beanMethodList)
+	<dt>$beanMethod.buildTitleExpForSchemaHtml()</dt>
+	<dd>$beanMethod.buildDescriptionExpForSchemaHtml()</dd>
+#end
+</dl>
+#end
+#set ($queryMethodList = $table.arrangeQueryTable.queryMethodList)
+#if (!$queryMethodList.isEmpty())
+<h4 id="${table.tableIdForSchemaHtml}_arrqy_query">${table.arrangeQueryTable.queryClassName}</h4>
+<dl class="arrqylist">
+#foreach ($queryMethod in $queryMethodList)
+	<dt>$queryMethod.buildTitleExpForSchemaHtml()</dt>
+	<dd>$queryMethod.buildDescriptionExpForSchemaHtml()</dd>
+#end
+</dl>
+#end
+#end
+#end
+#end
 #if ($database.isSchemaHtmlOutsideSqlValid())
 <h2 id="outsidesql">OutsideSql List</h2>
 #foreach ($table in $database.tableDisplaySortedList)
@@ -717,7 +818,8 @@ $generator.parse("doc/html/table.vm", null, "table", $table)
 		<div id="decomment-close" class="decommentmodal-close-btn"><span>x</span></div>
 		<p>Input the new column comment of <span id="decomment-modal-column-info"></span></p>
 		<textarea id="decomment-input" class="decommentinput" rows="5"></textarea>
-		<button id="decomment-ok" class="decommentmodal-ok-btn">OK</button>
+		<div id="decomment-user-input" class="decomment-user-input"><input type="text" id="decomment-user-name" class="decomment-user-name" placeholder="User name"/><span class="decomment-user-name-desc">*required (saved in cookie)</span></div>
+		<div class="decommentmodal-ok-area"><button id="decomment-ok" class="decommentmodal-ok-btn">OK</button></div>
 	</div>
 </div>
 <script>
@@ -1225,6 +1327,12 @@ var DecommentUtil = new function(){
 	 */
 	this.unescapeWhitespace = function (string) {
 		return string.split('&nbsp;').join(' ');
+	},
+	/**
+	 * Check is opening with server mode.
+	 */
+	this.isDecommentServer = function() {
+		return document.getElementById("decomment_server") != null;
 	}
 }
 
@@ -1509,6 +1617,7 @@ StoreClient.prototype = {
 ##                                                                     ===============
 function PickupTableProperty(tableDbName, json) {
 	this.tableDbName = tableDbName;
+	this.inputAuthor = null; // use when decomment server mode.
 	if (json) {
 		this.databaseComment = json.databaseComment;
 		this.isDatabaseCommentConflict = json.isDatabaseCommentConflict;
@@ -1647,6 +1756,7 @@ PickupTableProperty.prototype = {
 			'decomment': (this.decomments[0] || {}).body,
 			'databaseComment': DecommentUtil.escapeNewlineCharacter(this.databaseComment),
 			'commentVersion': this.commentVersion || 0,
+			'inputAuthor': this.inputAuthor,
 			'authors': this.authors || [],
 			'previousPieces': this.previousPieces || []
 		};
@@ -1659,6 +1769,7 @@ PickupTableProperty.prototype = {
 function PickupColumnProperty(tableDbName, columnName, json) {
 	this.tableDbName = tableDbName;
 	this.columnName = columnName;
+	this.inputAuthor = null; // use when decomment server mode.
 	if (json) {
 		this.databaseComment = json['databaseComment'];
 		this.isDatabaseCommentConflict = json['isDatabaseCommentConflict'];
@@ -1792,6 +1903,7 @@ PickupColumnProperty.prototype = {
 			'decomment': (this.decomments[0] || {}).body,
 			'databaseComment': DecommentUtil.escapeNewlineCharacter(this.databaseComment),
 			'commentVersion': this.commentVersion || 0,
+			'inputAuthor': this.inputAuthor,
 			'authors': this.authors || [],
 			'previousPieces': this.previousPieces || []
 		};
@@ -1817,6 +1929,7 @@ Decomment.prototype = {
 		if (document.getElementById("intro_opening") !== null) {
 			this.fetchVirtualPickup();
 			this.setupKeyDownEvent();
+			this.showUserNameInputIfNeed();
 		} else {
 			this.reflectEmbeddedPickup();
 		}
@@ -1834,11 +1947,24 @@ Decomment.prototype = {
 		})
 	},
 
+	/**
+	 * Show user name input when decomment server mode.
+	 */
+	showUserNameInputIfNeed: function() {
+		if (DecommentUtil.isDecommentServer() && this.isUserNameEmpty()) {
+			document.querySelector('#decomment-user-input').style.display = 'block';
+		}
+	},
+
+	hideUserNameInput: function() {
+		document.querySelector('#decomment-user-input').style.display = 'none';
+	},
+
 	/**
 	 * Reflect embedded pick
 	 */
 	reflectEmbeddedPickup: function () {
-		this.reflectPickup(this.embeddedPickup);
+		this.reflectPickup(this.storeClient.embeddedPickup);
 	},
 
 	/**
@@ -1945,8 +2071,12 @@ Decomment.prototype = {
 
 			document.getElementById("decomment-ok").onclick = function () {
 				var decomment = inputElement.value;
+				if (DecommentUtil.isDecommentServer() && that.isUserNameEmpty()) {
+					alert('Input your user name.');
+					return;
+				}
 				if (that.isStillConflicting(decomment)) {
-					alert('Still conflicting. please resolve.');
+					alert('Still conflicting. please resolve.')
 					return;
 				}
 				if (!that.isCommentChanged(previousWholeComment, decomment)) {
@@ -1956,9 +2086,11 @@ Decomment.prototype = {
 				decomment = DecommentUtil.escapeInputText(decomment);
 				decomment = DecommentUtil.deleteUnnecessaryWhitespace(decomment);
 				commentProperty.decomments = [{'body': decomment}]
+				commentProperty.inputAuthor = that.getUserName();
 				var params = commentProperty.toRequestParams()
 				new ApiClient().saveDecomment(params, function () {
-					that.fetchVirtualPickup()
+					that.fetchVirtualPickup();
+					that.hideUserNameInput();
 				});
 				modalElement.style.display = "none";
 			};
@@ -1971,6 +2103,42 @@ Decomment.prototype = {
 		};
 	},
 
+	/**
+	 * Get user name. and save to cookie if not saved.
+	 */
+	getUserName : function() {
+		var savedUserName = this.getCookie('decomment-user-name');
+		if (savedUserName) {
+			return savedUserName;
+		}
+		var inputUserName = document.querySelector('#decomment-user-name').value;
+		if (inputUserName && inputUserName.length > 0) {
+			document.cookie = "decomment-user-name=" + inputUserName + ";expires=2147483647";
+		}
+		return inputUserName;
+	},
+
+	/**
+	 * Check user name is inputed.
+	 */
+	isUserNameEmpty : function() {
+		return this.getCookie('decomment-user-name') === null && this.getUserName().length === 0;
+	},
+
+	/**
+	 * Get cookie from key
+	 */
+	getCookie: function (key){
+		var cookies = document.cookie.split('; ');
+		for (var i = 0; i < cookies.length; i++){
+			var c = cookies[i].split('=');
+			if(c[0] === key){
+				return c[1];
+			}
+		}
+		return null;
+	},
+
 	/**
 	 * Setup key down event
 	 */
diff --git a/dbflute-engine/embedded/templates/doc/html/table.vm b/dbflute-engine/embedded/templates/doc/html/table.vm
index 637b402ef..f9fcf115b 100644
--- a/dbflute-engine/embedded/templates/doc/html/table.vm
+++ b/dbflute-engine/embedded/templates/doc/html/table.vm
@@ -21,6 +21,9 @@ ${table.aliasExpression}${table.tableDispName}
 #if ($table.hasFirstDate())
 &nbsp;<span class="tablefirstdatetitle">since ${table.firstDateSimpleExp}</span>
 #end
+#if ($database.isSchemaHtmlArrangeQueryValid() && $table.hasArrangeQuery())
+&nbsp;<span class="arrqycount"><a href="${database.sharp}${table.tableIdForSchemaHtml}_arrqy">(arrangeQuery=${table.arrangeQuerySize})</a></span>
+#end
 #if ($database.isSchemaHtmlOutsideSqlValid() && $table.hasBehaviorQueryPath())
 &nbsp;<span class="bqpcount"><a href="${database.sharp}${table.tableIdForSchemaHtml}_sql">(outsideSql=${table.behaviorQueryPathList.size()})</a></span>
 #end
diff --git a/dbflute-engine/embedded/templates/om/java/allcommon/DBFluteInitializer.vm b/dbflute-engine/embedded/templates/om/java/allcommon/DBFluteInitializer.vm
index bb9e667e2..f687b21d2 100644
--- a/dbflute-engine/embedded/templates/om/java/allcommon/DBFluteInitializer.vm
+++ b/dbflute-engine/embedded/templates/om/java/allcommon/DBFluteInitializer.vm
@@ -145,6 +145,9 @@ public class ${glDBFluteInitializer} {
         return dataSourceFqcn.startsWith("org.apache.commons.dbcp.")
             || dataSourceFqcn.startsWith("org.apache.commons.dbcp2.")
             || dataSourceFqcn.startsWith("org.apache.tomcat.jdbc.pool.")
+#if ($database.hasDBFluteBeansTransactionalDataSourcePackage())
+            || dataSourceFqcn.startsWith("${database.DBFluteBeansTransactionalDataSourcePackage}.") // your data source
+#end
             || dataSourceFqcn.startsWith("com.zaxxer.hikari.");
     }
 
diff --git a/dbflute-engine/embedded/templates/om/java/allcommon/DBMetaInstanceHandler.vm b/dbflute-engine/embedded/templates/om/java/allcommon/DBMetaInstanceHandler.vm
index 6bee14fcd..44ac4b5a1 100644
--- a/dbflute-engine/embedded/templates/om/java/allcommon/DBMetaInstanceHandler.vm
+++ b/dbflute-engine/embedded/templates/om/java/allcommon/DBMetaInstanceHandler.vm
@@ -290,7 +290,7 @@ public class ${glDBMetaInstanceHandler} implements DBMetaProvider {
 
     protected static Entity newEntity(Class<?> entityType) {
         try {
-            return (Entity)entityType.newInstance();
+            return (Entity)entityType.getDeclaredConstructor().newInstance();
         } catch (Exception e) {
             String msg = "Failed to new the instance: " + entityType;
             throw new IllegalStateException(msg, e);
diff --git a/dbflute-engine/embedded/templates/om/java/allcommon/container/spring/SpringDBFluteBeansJavaConfig.vm b/dbflute-engine/embedded/templates/om/java/allcommon/container/spring/SpringDBFluteBeansJavaConfig.vm
index 99426df85..d7860495b 100644
--- a/dbflute-engine/embedded/templates/om/java/allcommon/container/spring/SpringDBFluteBeansJavaConfig.vm
+++ b/dbflute-engine/embedded/templates/om/java/allcommon/container/spring/SpringDBFluteBeansJavaConfig.vm
@@ -15,10 +15,10 @@
 ##
 ${database.allClassCopyright}package ${glPackageBaseCommon};
 
-import javax.annotation.Resource;
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationContext;
 #if ($database.needsDBFluteBeansHybritScanConfig())
 import org.springframework.context.annotation.ComponentScan;
@@ -55,7 +55,8 @@ public class ${glDBFluteBeansJavaConfig} {
     @Autowired
     protected ApplicationContext _container;
 
-    @Resource(name="${database.DBFluteBeansDataSourceName}")
+    @Autowired
+    @Qualifier("${database.DBFluteBeansDataSourceName}")
     protected DataSource _dataSource; // name basis here for multiple DB
 
     // ===================================================================================
diff --git a/dbflute-engine/embedded/templates/om/java/cbean/AbstractBsConditionQuery.vm b/dbflute-engine/embedded/templates/om/java/cbean/AbstractBsConditionQuery.vm
index b1b65028f..19bb7f245 100644
--- a/dbflute-engine/embedded/templates/om/java/cbean/AbstractBsConditionQuery.vm
+++ b/dbflute-engine/embedded/templates/om/java/cbean/AbstractBsConditionQuery.vm
@@ -245,7 +245,7 @@ public abstract class ${myClassName} extends AbstractConditionQuery {
      * ${col.aliasExpression}${col.name}: {${col.columnDefinitionLineDisp}}
      * @param ${tmpUncapitalisedJavaName}List The collection of ${col.uncapitalisedJavaName} as inScope. (basically NotNull, NotEmpty: error as default, or no condition as option)
      */
-    ${col.propertySettingModifier} void set${tmpJavaName}_InScope(Collection<${col.javaNative}> ${tmpUncapitalisedJavaName}List) {
+    ${col.propertySettingModifierOfNativeInScope} void set${tmpJavaName}_InScope(Collection<${col.javaNative}> ${tmpUncapitalisedJavaName}List) {
         doSet${tmpJavaName}_InScope(${tmpUncapitalisedJavaName}List);
     }
 #if ($col.hasClassification())
@@ -291,7 +291,7 @@ public abstract class ${myClassName} extends AbstractConditionQuery {
      * ${col.aliasExpression}${col.name}: {${col.columnDefinitionLineDisp}}
      * @param ${tmpUncapitalisedJavaName}List The collection of ${col.uncapitalisedJavaName} as notInScope. (basically NotNull, NotEmpty: error as default, or no condition as option)
      */
-    ${col.propertySettingModifier} void set${tmpJavaName}_NotInScope(Collection<${col.javaNative}> ${tmpUncapitalisedJavaName}List) {
+    ${col.propertySettingModifierOfNativeInScope} void set${tmpJavaName}_NotInScope(Collection<${col.javaNative}> ${tmpUncapitalisedJavaName}List) {
         doSet${tmpJavaName}_NotInScope(${tmpUncapitalisedJavaName}List);
     }
 #if ($col.hasClassification())
@@ -723,7 +723,7 @@ public abstract class ${myClassName} extends AbstractConditionQuery {
      * ${col.aliasExpression}${col.name}: {${col.columnDefinitionLineDisp}}
      * @param ${tmpUncapitalisedJavaName}List The collection of ${col.uncapitalisedJavaName} as inScope. (basically NotNull, NotEmpty: error as default, or no condition as option)
      */
-    ${col.propertySettingModifier} void set${tmpJavaName}_InScope(Collection<${col.javaNative}> ${tmpUncapitalisedJavaName}List) {
+    ${col.propertySettingModifierOfNativeInScope} void set${tmpJavaName}_InScope(Collection<${col.javaNative}> ${tmpUncapitalisedJavaName}List) {
         doSet${tmpJavaName}_InScope(${tmpUncapitalisedJavaName}List);
     }
 #if ($col.hasClassification())
@@ -769,7 +769,7 @@ public abstract class ${myClassName} extends AbstractConditionQuery {
      * ${col.aliasExpression}${col.name}: {${col.columnDefinitionLineDisp}}
      * @param ${tmpUncapitalisedJavaName}List The collection of ${col.uncapitalisedJavaName} as notInScope. (basically NotNull, NotEmpty: error as default, or no condition as option)
      */
-    ${col.propertySettingModifier} void set${tmpJavaName}_NotInScope(Collection<${col.javaNative}> ${tmpUncapitalisedJavaName}List) {
+    ${col.propertySettingModifierOfNativeInScope} void set${tmpJavaName}_NotInScope(Collection<${col.javaNative}> ${tmpUncapitalisedJavaName}List) {
         doSet${tmpJavaName}_NotInScope(${tmpUncapitalisedJavaName}List);
     }
 #if ($col.hasClassification())
diff --git a/dbflute-engine/lib/dbflute-runtime.jar b/dbflute-engine/lib/dbflute-runtime.jar
index 77de4712a..b1e0a31dd 100644
Binary files a/dbflute-engine/lib/dbflute-runtime.jar and b/dbflute-engine/lib/dbflute-runtime.jar differ
diff --git a/dbflute-engine/lib/sources/dbflute-runtime-sources.jar b/dbflute-engine/lib/sources/dbflute-runtime-sources.jar
index dfa230534..5ca4afd60 100644
Binary files a/dbflute-engine/lib/sources/dbflute-runtime-sources.jar and b/dbflute-engine/lib/sources/dbflute-runtime-sources.jar differ
diff --git a/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Column.java b/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Column.java
index 92fd706fa..22514dda6 100644
--- a/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Column.java
+++ b/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Column.java
@@ -1922,6 +1922,14 @@ public boolean isPropertySettingModifierClosed() { // for native setter
         return isForceClassificationSetting();
     }
 
+    public String getPropertySettingModifierOfNativeInScope() { // for compatible
+        final DfLittleAdjustmentProperties prop = getLittleAdjustmentProperties();
+        if (prop.isCompatibleNativeInScopePublicForcedly()) {
+            return getLanguageDependency().getLanguageGrammar().getPublicModifier();
+        }
+        return getPropertySettingModifier();
+    }
+
     // ===================================================================================
     //                                                               Sql2Entity Definition
     //                                                               =====================
@@ -2667,12 +2675,15 @@ protected String getSql2EntityRelatedTableClassificationName() {
     // ===================================================================================
     //                                                                            Sequence
     //                                                                            ========
+    public boolean isSequence() {
+        return isPrimaryKey() && getTable().hasSinglePrimaryKey() && getTable().isUseSequence();
+    }
+
     public boolean isIdentityOrSequence() { // for Schema HTML
         if (isIdentity()) {
             return true;
         }
-        final Table table = getTable();
-        if (isPrimaryKey() && table.hasSinglePrimaryKey() && table.isUseSequence()) {
+        if (isSequence()) {
             return true;
         }
         return false;
diff --git a/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Database.java b/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Database.java
index f3698524e..426fc431e 100644
--- a/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Database.java
+++ b/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Database.java
@@ -153,7 +153,9 @@
 import org.dbflute.helper.message.ExceptionMessageBuilder;
 import org.dbflute.infra.core.DfDatabaseNameMapping;
 import org.dbflute.infra.doc.decomment.DfDecoMapPickup;
-import org.dbflute.logic.doc.schemahtml.DfSchemaHtmlProcedure;
+import org.dbflute.logic.doc.arrqy.DfArrangeQueryTable;
+import org.dbflute.logic.doc.schemahtml.DfSchemaHtmlDataArrangeQuery;
+import org.dbflute.logic.doc.schemahtml.DfSchemaHtmlDataProcedure;
 import org.dbflute.logic.doc.supplement.firstdate.DfFirstDateAgent;
 import org.dbflute.logic.generate.deletefile.DfOldClassHandler;
 import org.dbflute.logic.generate.exdirect.DfCopyrightResolver;
@@ -1774,6 +1776,14 @@ public boolean isDBFluteBeansJavaConfigLazy() {
         return getProperties().getDependencyInjectionProperties().isDBFluteBeansJavaConfigLazy();
     }
 
+    public boolean hasDBFluteBeansTransactionalDataSourcePackage() {
+        return getProperties().getDependencyInjectionProperties().hasDBFluteBeansTransactionalDataSourcePackage();
+    }
+
+    public String getDBFluteBeansTransactionalDataSourcePackage() {
+        return getProperties().getDependencyInjectionProperties().getDBFluteBeansTransactionalDataSourcePackage();
+    }
+
     // -----------------------------------------------------
     //                                                 Guice
     //                                                 -----
@@ -2386,6 +2396,13 @@ public boolean isEntityJavaDocDbCommentValid() {
     // -----------------------------------------------------
     //                                            SchemaHtml
     //                                            ----------
+    public boolean isSchemaHtmlArrangeQueryValid() {
+        if (getProperties().getDocumentProperties().isSuppressSchemaHtmlArrangeQuery()) {
+            return false;
+        }
+        return hasArrangeQueryTableMap();
+    }
+
     public boolean isSchemaHtmlOutsideSqlValid() {
         if (getProperties().getDocumentProperties().isSuppressSchemaHtmlOutsideSql()) {
             return false;
@@ -2883,7 +2900,7 @@ protected DfOutsideSqlPack collectOutsideSql() {
     // ===================================================================================
     //                                                                  Procedure Document
     //                                                                  ==================
-    protected final DfSchemaHtmlProcedure _schemaHtmlProcedure = new DfSchemaHtmlProcedure(); // contains cache
+    protected final DfSchemaHtmlDataProcedure _schemaHtmlProcedure = new DfSchemaHtmlDataProcedure(); // contains cache
 
     public boolean hasSeveralProcedureSchema() throws SQLException {
         return getAvailableSchemaProcedureMap().size() >= 2;
@@ -2897,6 +2914,19 @@ public Map<String, List<DfProcedureMeta>> getAvailableSchemaProcedureMap() throw
         return _schemaHtmlProcedure.getAvailableSchemaProcedureMap(() -> getDataSource());
     }
 
+    // ===================================================================================
+    //                                                               ArrangeQuery Document
+    //                                                               =====================
+    protected final DfSchemaHtmlDataArrangeQuery _schemaHtmlArrangeQuery = new DfSchemaHtmlDataArrangeQuery(); // contains cache
+
+    public boolean hasArrangeQueryTableMap() { // basically called by Java
+        return !getArrangeQueryTableMap().isEmpty();
+    }
+
+    public Map<String, DfArrangeQueryTable> getArrangeQueryTableMap() { // basically called by Java
+        return _schemaHtmlArrangeQuery.getArrangeQueryTableMap(getTableList());
+    }
+
     // ===================================================================================
     //                                                                          DataSource
     //                                                                          ==========
diff --git a/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/ForeignKey.java b/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/ForeignKey.java
index 13560d959..e154a46fb 100644
--- a/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/ForeignKey.java
+++ b/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/ForeignKey.java
@@ -129,32 +129,25 @@
 
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
 import org.dbflute.DfBuildProperties;
-import org.dbflute.cbean.chelper.HpFixedConditionQueryResolver;
-import org.dbflute.exception.DfFixedConditionInvalidClassificationEmbeddedCommentException;
-import org.dbflute.exception.DfFixedConditionOptionConstraintFailureException;
 import org.dbflute.exception.DfTableNotFoundException;
 import org.dbflute.helper.StringKeyMap;
 import org.dbflute.helper.message.ExceptionMessageBuilder;
 import org.dbflute.logic.generate.column.DfColumnListToStringBuilder;
-import org.dbflute.logic.generate.language.DfLanguageDependency;
+import org.dbflute.logic.generate.foreignkey.DfFixedConditionDynamicAnalyzer;
+import org.dbflute.logic.generate.foreignkey.DfFixedConditionOptionChecker;
 import org.dbflute.logic.generate.language.grammar.DfLanguageGrammar;
-import org.dbflute.logic.generate.language.pkgstyle.DfLanguagePropertyPackageResolver;
 import org.dbflute.properties.DfBasicProperties;
 import org.dbflute.properties.DfClassificationProperties;
 import org.dbflute.properties.DfDocumentProperties;
 import org.dbflute.properties.DfIncludeQueryProperties;
 import org.dbflute.properties.DfLittleAdjustmentProperties;
 import org.dbflute.properties.DfMultipleFKPropertyProperties;
-import org.dbflute.properties.assistant.classification.DfClassificationElement;
-import org.dbflute.properties.assistant.classification.DfClassificationGroup;
-import org.dbflute.properties.assistant.classification.DfClassificationTop;
 import org.dbflute.util.DfCollectionUtil;
 import org.dbflute.util.Srl;
 import org.xml.sax.Attributes;
@@ -1065,47 +1058,9 @@ public String getFixedConditionArg() {
     }
 
     protected void checkOptionConstraints() {
-        if (_fixedInline) {
-            final String localAliasMark = HpFixedConditionQueryResolver.LOCAL_ALIAS_MARK;
-            if (_fixedCondition != null && _fixedCondition.contains(localAliasMark)) {
-                String msg = "fixedInline with " + localAliasMark + " is not available.";
-                throwFixedConditionOptionConstraintFailureException(msg);
-            }
-        }
-        if (_fixedReferrer) {
-            if (_fixedInline) {
-                String msg = "fixedReferrer with fixedInline is not available.";
-                throwFixedConditionOptionConstraintFailureException(msg);
-            }
-            if (!_dynamicFixedConditionMap.isEmpty()) {
-                String msg = "fixedReferrer with bind variables is not available.";
-                throwFixedConditionOptionConstraintFailureException(msg);
-            }
-            final String foreignAliasMark = HpFixedConditionQueryResolver.FOREIGN_ALIAS_MARK;
-            if (_fixedCondition != null && _fixedCondition.contains(foreignAliasMark)) {
-                String msg = "fixedReferrer with " + foreignAliasMark + " is not available.";
-                throwFixedConditionOptionConstraintFailureException(msg);
-            }
-        }
-    }
-
-    protected void throwFixedConditionOptionConstraintFailureException(String notice) {
-        final ExceptionMessageBuilder br = new ExceptionMessageBuilder();
-        br.addNotice(notice);
-        br.addItem("DBFlute Property");
-        br.addElement("additionalForeignKeyMap.dfprop");
-        br.addItem("FK Name");
-        br.addElement(_name);
-        br.addItem("fixedCondition");
-        br.addElement(_fixedCondition);
-        br.addItem("fixedSuffix");
-        br.addElement(_fixedSuffix);
-        br.addItem("fixedInline");
-        br.addElement(_fixedInline);
-        br.addItem("fixedReferrer");
-        br.addElement(_fixedReferrer);
-        final String msg = br.buildExceptionMessage();
-        throw new DfFixedConditionOptionConstraintFailureException(msg);
+        final DfFixedConditionOptionChecker checker =
+                new DfFixedConditionOptionChecker(this, _fixedCondition, _dynamicFixedConditionMap, _fixedInline, _fixedReferrer);
+        checker.checkOptionConstraints();
     }
 
     public boolean hasFixedCondition() {
@@ -1234,199 +1189,14 @@ protected String buildDynamicFixedConditionArgsJavaDocString(boolean nest) {
     }
 
     protected void analyzeDynamicFixedConditionIfNeeds() { // lazy called
-        if (!_dynamicFixedConditionMap.isEmpty()) {
-            return; // already initialized
-        }
-        if (_fixedCondition == null || _fixedCondition.trim().length() == 0) {
-            return; // no fixed condition
-        }
-        if (!_fixedCondition.contains("/*") || !_fixedCondition.contains("*/")) {
-            return; //  no dynamic (no bind variable) fixed condition
-        }
-        final Map<String, String> fixedConditionReplacementMap = new LinkedHashMap<String, String>();
-        String currentString = _fixedCondition;
-        while (true) {
-            if (currentString == null || currentString.trim().length() == 0) {
-                break;
-            }
-            final int startIndex = currentString.indexOf("/*");
-            if (startIndex < 0) {
-                break;
-            }
-            final int endIndex = currentString.indexOf("*/");
-            if (endIndex < 0) {
-                break;
-            }
-            if (startIndex >= endIndex) {
-                break;
-            }
-            // e.g.
-            //  /*targetDate(Date)*/ -> targetDate(Date)
-            //  /*$cls(MemberStatus.Formalized)*/ -> $cls(MemberStatus.Formalized)
-            final String peace = currentString.substring(startIndex + "/*".length(), endIndex);
-
-            // Modify the variable 'currentString' for next loop!
-            currentString = currentString.substring(endIndex + "*/".length());
-
-            final int typeStartIndex = peace.indexOf("(");
-            if (typeStartIndex < 0) {
-                continue;
-            }
-            final int typeEndIndex = peace.indexOf(")");
-            if (typeEndIndex < 0) {
-                continue;
-            }
-            if (typeStartIndex >= typeEndIndex) {
-                continue;
-            }
-
-            // e.g.
-            //  /*targetDate(Date)*/ -> Date
-            //  /*$cls(MemberStatus.Formalized)*/ -> MemberStatus.Formalized
-            String parameterType = peace.substring(typeStartIndex + "(".length(), typeEndIndex);
-            if (peace.startsWith("$cls")) { // embedded classification
-                // Not Dynamic (Embedded)
-                // e.g. $$localAlias$$.MEMBER_STATUS_CODE = /*$cls(MemberStatus.Formalized)*/null
-                final String code = extractFixedConditionEmbeddedCommentClassification(peace, parameterType);
-                final String expression = "/*" + peace + "*/";
-
-                // Remove test value because of hard code.
-                fixedConditionReplacementMap.put(expression + "null", expression);
-                fixedConditionReplacementMap.put(expression + "Null", expression);
-                fixedConditionReplacementMap.put(expression + "NULL", expression);
-
-                fixedConditionReplacementMap.put(expression, code);
-            } else { // dynamic binding
-                parameterType = filterDynamicFixedConditionParameterType(parameterType);
-                final String parameterName = peace.substring(0, typeStartIndex);
-                _dynamicFixedConditionMap.put(parameterName, parameterType);
-                final String parameterMapName = "parameterMap" + getForeignPropertyNameInitCap();
-                final String parameterBase = "$$locationBase$$." + parameterMapName;
-                final String bindVariableExp = "/*" + parameterBase + "." + parameterName + "*/";
-                fixedConditionReplacementMap.put("/*" + peace + "*/", bindVariableExp);
-
-                // e.g. /*IF $$parameterBase$$.foo != null*/
-                final String parameterBaseKey = "$$parameterBase$$";
-                if (!fixedConditionReplacementMap.containsKey(parameterBaseKey)) {
-                    fixedConditionReplacementMap.put(parameterBaseKey, parameterBase);
-                }
-            }
-        }
-        if (fixedConditionReplacementMap.isEmpty()) {
-            return;
-        }
-        for (Entry<String, String> entry : fixedConditionReplacementMap.entrySet()) {
+        final DfFixedConditionDynamicAnalyzer analyzer =
+                new DfFixedConditionDynamicAnalyzer(this, _fixedCondition, _dynamicFixedConditionMap);
+        final Map<String, String> replacementMap = analyzer.analyzeToReplacementMap();
+        for (Entry<String, String> entry : replacementMap.entrySet()) {
             _fixedCondition = replace(_fixedCondition, entry.getKey(), entry.getValue());
         }
     }
 
-    protected String filterDynamicFixedConditionParameterType(String parameterType) {
-        final DfLanguageDependency lang = getBasicProperties().getLanguageDependency();
-        final DfLanguagePropertyPackageResolver resolver = lang.getLanguagePropertyPackageResolver();
-        return resolver.resolvePackageName(parameterType);
-    }
-
-    // -----------------------------------------------------
-    //                        EmbeddedComment Classification
-    //                        ------------------------------
-    protected String extractFixedConditionEmbeddedCommentClassification(String peace, String parameterType) {
-        // peace is e.g. $cls(MemberStatus.Formalized)
-        // parameterType is e.g. MemberStatus.Formalized
-        if (!parameterType.contains(".")) {
-            String msg = "The classification expression should be 'classificationName.elementName':";
-            msg = msg + " expression=" + parameterType + " embeddedComment=" + peace;
-            throw new DfFixedConditionInvalidClassificationEmbeddedCommentException(msg);
-        }
-        final String classificationName = parameterType.substring(0, parameterType.indexOf(".")); // e.g. MemberStatus
-        final String elementName = parameterType.substring(parameterType.indexOf(".") + ".".length()); // e.g. Formalized
-        final Map<String, DfClassificationTop> topMap = getClassificationProperties().getClassificationTopMap();
-        final DfClassificationTop classificationTop = topMap.get(classificationName);
-        if (classificationTop == null) {
-            throwFixedConditionEmbeddedCommentClassificationNotFoundException(classificationName);
-        }
-        String code = doExtractFixedConditionEmbeddedCommentClassificationNormalCode(classificationTop, elementName);
-        if (code != null) {
-            return code;
-        }
-        // may be group here
-        code = doExtractFixedConditionEmbeddedCommentClassificationGroupCode(classificationTop, elementName);
-        if (code != null) {
-            return code;
-        }
-        throwFixedConditionEmbeddedCommentClassificationElementNotFoundException(classificationTop, elementName);
-        return null; // unreachable
-    }
-
-    protected String doExtractFixedConditionEmbeddedCommentClassificationNormalCode(DfClassificationTop classificationTop,
-            String elementName) {
-        final List<DfClassificationElement> elementList = classificationTop.getClassificationElementList();
-        String code = null;
-        for (final DfClassificationElement element : elementList) {
-            final String name = element.getName();
-            if (elementName.equals(name)) {
-                code = quoteClassifiationElementIfNeeds(classificationTop, element.getCode());
-                break;
-            }
-        }
-        return code;
-    }
-
-    protected String doExtractFixedConditionEmbeddedCommentClassificationGroupCode(DfClassificationTop classificationTop, String elementName) {
-        String code = null;
-        final List<DfClassificationGroup> groupList = classificationTop.getGroupList();
-        for (DfClassificationGroup group : groupList) {
-            final String groupName = group.getGroupName();
-            if (elementName.equals(groupName)) {
-                final List<DfClassificationElement> groupElementList = group.getElementList();
-                StringBuilder sb = new StringBuilder();
-                for (DfClassificationElement groupelement : groupElementList) {
-                    if (sb.length() > 0) {
-                        sb.append(", ");
-                    }
-                    sb.append(quoteClassifiationElementIfNeeds(classificationTop, groupelement.getCode()));
-                }
-                sb.insert(0, "(").append(")");
-                code = sb.toString();
-                break;
-            }
-        }
-        return code;
-    }
-
-    protected String quoteClassifiationElementIfNeeds(DfClassificationTop classificationTop, String code) {
-        return classificationTop.isCodeTypeNeedsQuoted() ? Srl.quoteSingle(code) : code;
-    }
-
-    protected void throwFixedConditionEmbeddedCommentClassificationNotFoundException(String classificationName) {
-        final ExceptionMessageBuilder br = new ExceptionMessageBuilder();
-        br.addNotice("Not found the classification in fixed condition.");
-        br.addItem("Foreign Key");
-        br.addElement(_name);
-        br.addItem("NotFound Classification");
-        br.addElement(classificationName);
-        final String msg = br.buildExceptionMessage();
-        throw new DfFixedConditionInvalidClassificationEmbeddedCommentException(msg);
-    }
-
-    protected void throwFixedConditionEmbeddedCommentClassificationElementNotFoundException(DfClassificationTop classificationTop,
-            String elementName) {
-        final ExceptionMessageBuilder br = new ExceptionMessageBuilder();
-        br.addNotice("Not found the classification element in fixed condition.");
-        br.addItem("Foreign Key");
-        br.addElement(_name);
-        br.addItem("Classification Name");
-        br.addElement(classificationTop.getClassificationName());
-        br.addItem("NotFound Element");
-        br.addElement(elementName);
-        br.addItem("Defined Element");
-        final List<DfClassificationElement> elementList = classificationTop.getClassificationElementList();
-        for (DfClassificationElement element : elementList) {
-            br.addElement(element);
-        }
-        final String msg = br.buildExceptionMessage();
-        throw new DfFixedConditionInvalidClassificationEmbeddedCommentException(msg);
-    }
-
     // ===================================================================================
     //                                                                          Class Name
     //                                                                          ==========
diff --git a/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Table.java b/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Table.java
index a9560133a..bdc2c6002 100644
--- a/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Table.java
+++ b/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Table.java
@@ -152,6 +152,7 @@
 import org.dbflute.helper.StringKeyMap;
 import org.dbflute.helper.StringSet;
 import org.dbflute.helper.jdbc.context.DfSchemaSource;
+import org.dbflute.logic.doc.arrqy.DfArrangeQueryTable;
 import org.dbflute.logic.doc.schemahtml.DfSchemaHtmlBuilder;
 import org.dbflute.logic.generate.column.DfColumnListToStringBuilder;
 import org.dbflute.logic.generate.language.DfLanguageDependency;
@@ -4307,6 +4308,23 @@ public String getBehaviorQueryPathSqlApProjectName(String behaviorQueryPath) {
     //public List<String> getBehaviorQueryPathDefinitionList() {
     //}
 
+    // ===================================================================================
+    //                                                                       Arrange Query
+    //                                                                       =============
+    public boolean hasArrangeQuery() {
+        return getArrangeQueryTable() != null;
+    }
+
+    public int getArrangeQuerySize() {
+        final DfArrangeQueryTable table = getArrangeQueryTable();
+        return table != null ? table.getBeanMethodList().size() + table.getQueryMethodList().size() : 0;
+    }
+
+    public DfArrangeQueryTable getArrangeQueryTable() {
+        final Map<String, DfArrangeQueryTable> arrangeQueryTableMap = getDatabase().getArrangeQueryTableMap();
+        return arrangeQueryTableMap.get(getTableDbName());
+    }
+
     // ===================================================================================
     //                                                                      Basic Override
     //                                                                      ==============
diff --git a/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Unique.java b/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Unique.java
index 0dc401a83..801563519 100644
--- a/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Unique.java
+++ b/dbflute-engine/src/main/java/org/apache/torque/engine/database/model/Unique.java
@@ -128,6 +128,7 @@
  */
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -164,9 +165,10 @@ public String toString() {
         StringBuffer result = new StringBuffer();
         result.append(" <unique name=\"").append(getName()).append("\">\n");
 
-        final Set<Integer> ordinalPositionKeySet = getIndexColumnMap().keySet();
+        final Map<Integer, String> indexColumnMap = getIndexColumnMap();
+        final Set<Integer> ordinalPositionKeySet = indexColumnMap.keySet();
         for (final Integer ordinalPosition : ordinalPositionKeySet) {
-            final String columnName = getIndexColumnMap().get(ordinalPositionKeySet);
+            final String columnName = indexColumnMap.get(ordinalPosition);
             result.append("  <unique-column name=\"").append(columnName).append("\"");
             result.append(" position=\"").append(ordinalPosition).append("\"/>\n");
         }
diff --git a/dbflute-engine/src/main/java/org/dbflute/exception/DfSchemaPolicyCheckUnknownVariableException.java b/dbflute-engine/src/main/java/org/dbflute/exception/DfSchemaPolicyCheckUnknownVariableException.java
new file mode 100644
index 000000000..cad41f947
--- /dev/null
+++ b/dbflute-engine/src/main/java/org/dbflute/exception/DfSchemaPolicyCheckUnknownVariableException.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014-2018 the original author or authors.
+ *
+ * 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.dbflute.exception;
+
+/**
+ * @author jflute
+ */
+public class DfSchemaPolicyCheckUnknownVariableException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+
+    public DfSchemaPolicyCheckUnknownVariableException(String msg) {
+        super(msg);
+    }
+}
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/doc/arrqy/DfArrangeQueryDocSetupper.java b/dbflute-engine/src/main/java/org/dbflute/logic/doc/arrqy/DfArrangeQueryDocSetupper.java
new file mode 100644
index 000000000..9003e7d0a
--- /dev/null
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/doc/arrqy/DfArrangeQueryDocSetupper.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2014-2018 the original author or authors.
+ *
+ * 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.dbflute.logic.doc.arrqy;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.torque.engine.database.model.Table;
+import org.dbflute.DfBuildProperties;
+import org.dbflute.helper.filesystem.FileTextIO;
+import org.dbflute.properties.DfBasicProperties;
+import org.dbflute.properties.DfDocumentProperties;
+import org.dbflute.properties.DfLittleAdjustmentProperties;
+import org.dbflute.util.Srl;
+import org.dbflute.util.Srl.ScopeInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author jflute
+ * @since 1.1.9 (2018/12/31 Monday)
+ */
+public class DfArrangeQueryDocSetupper {
+
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
+    /** The logger instance for this class. (NotNull) */
+    private static final Logger _log = LoggerFactory.getLogger(DfArrangeQueryDocSetupper.class);
+
+    public static final String METHOD_PREFIX = "arrange";
+
+    // ===================================================================================
+    //                                                                         Constructor
+    //                                                                         ===========
+    public DfArrangeQueryDocSetupper() {
+    }
+
+    // ===================================================================================
+    //                                                                              Set up 
+    //                                                                              ======
+    public Map<String, DfArrangeQueryTable> extractArrangeQuery(List<Table> tableList) {
+        if (getDocumentProperties().isSuppressSchemaHtmlArrangeQuery()) { // already checked so just in case
+            _log.info("*ArrangeQuery Doc is suppressed!");
+            return Collections.emptyMap();
+        }
+        try {
+            return doExtractArrangeQuery(tableList);
+        } catch (RuntimeException e) { // just in case for now
+            _log.warn("Failed to extract arrange query meta.", e);
+            return Collections.emptyMap();
+        }
+    }
+
+    protected Map<String, DfArrangeQueryTable> doExtractArrangeQuery(List<Table> tableList) {
+        final Map<String, DfArrangeQueryTable> resultMap = new LinkedHashMap<String, DfArrangeQueryTable>();
+        for (Table table : tableList) {
+            final String tableDbName = table.getTableDbName();
+            String beanClassName = table.getExtendedConditionBeanClassName();
+            String queryClassName = table.getExtendedConditionQueryClassName();
+            final DfArrangeQueryTable arrangeQueryTable = new DfArrangeQueryTable(tableDbName, beanClassName, queryClassName);
+            {
+                final String cbeanPath = prepareConditionBeanPath(table);
+                final List<DfArrangeQueryMethod> beanMethodList = searchArrangeQueryMethodList(tableDbName, cbeanPath);
+                if (!beanMethodList.isEmpty()) {
+                    _log.info(" [{}]", arrangeQueryTable.getBeanClassName());
+                }
+                for (DfArrangeQueryMethod method : beanMethodList) {
+                    _log.info("  o {}() // {}", method.getMethodName(), method.getTitle());
+                    arrangeQueryTable.addBeanMethod(method);
+                }
+            }
+            {
+                final String queryPath = prepareConditionQueryPath(table);
+                final List<DfArrangeQueryMethod> queryMethodList = searchArrangeQueryMethodList(tableDbName, queryPath);
+                if (!queryMethodList.isEmpty()) {
+                    _log.info(" [{}]", arrangeQueryTable.getQueryClassName());
+                }
+                for (DfArrangeQueryMethod method : queryMethodList) {
+                    _log.info("  o {}() // {}", method.getMethodName(), method.getTitle());
+                    arrangeQueryTable.addQueryMethod(method);
+                }
+            }
+            if (!arrangeQueryTable.getBeanMethodList().isEmpty() || !arrangeQueryTable.getQueryMethodList().isEmpty()) {
+                resultMap.put(tableDbName, arrangeQueryTable);
+            }
+        }
+        if (resultMap.isEmpty()) {
+            _log.info(" -> no arrange query");
+        }
+        return resultMap;
+    }
+
+    // ===================================================================================
+    //                                                                          Class File
+    //                                                                          ==========
+    protected String prepareConditionBeanPath(Table table) {
+        final String pkg = getBasicProperties().getLanguageDependency().getLanguageClassPackage().getConditionBeanPackage();
+        final String className = table.getExtendedConditionBeanClassName();
+        return doPrepareConditionAnyPath(pkg, className);
+    }
+
+    protected String prepareConditionQueryPath(Table table) {
+        final String pkg = getBasicProperties().getLanguageDependency().getLanguageClassPackage().getConditionQueryPackage();
+        final String className = table.getExtendedConditionQueryClassName();
+        return doPrepareConditionAnyPath(pkg, className);
+    }
+
+    protected String doPrepareConditionAnyPath(String pkg, String className) {
+        final DfBasicProperties basicProp = getBasicProperties();
+        final String generateOutputDirectory = basicProp.getGenerateOutputDirectory();
+        final String packageBase = basicProp.getPackageBase();
+        final String packagePath = Srl.replace(packageBase + "." + pkg, ".", "/");
+        final String classFileExtension = basicProp.getLanguageDependency().getLanguageGrammar().getClassFileExtension();
+        return generateOutputDirectory + "/" + packagePath + "/" + className + "." + classFileExtension;
+    }
+
+    protected FileTextIO prepareSourceFileTextIO() {
+        final FileTextIO textIO = new FileTextIO();
+        textIO.setEncoding(getBasicProperties().getSourceFileEncoding());
+        return textIO;
+    }
+
+    // ===================================================================================
+    //                                                                      Analyze Method
+    //                                                                      ==============
+    protected List<DfArrangeQueryMethod> searchArrangeQueryMethodList(String tableDbName, String classFilePath) {
+        final FileTextIO textIO = prepareSourceFileTextIO();
+        if (!new File(classFilePath).exists()) { // e.g. generate-only of table-except
+            return Collections.emptyList();
+        }
+        final String cqText = textIO.read(classFilePath);
+        final List<String> lineList = Srl.splitList(cqText, "\n");
+        return analyzeArrangeQueryLineList(tableDbName, lineList);
+    }
+
+    protected List<DfArrangeQueryMethod> analyzeArrangeQueryLineList(String tableDbName, List<String> lineList) {
+        // #hope jflute should use Java parser? (2018/12/31)
+        final List<DfArrangeQueryMethod> methodList = new ArrayList<DfArrangeQueryMethod>();
+        String javadocTitle = null;
+        boolean inJavaDoc = false;
+        for (String line : lineList) {
+            final String trimmedLine = Srl.trim(line);
+            if (Srl.equalsPlain(trimmedLine, "/**")) {
+                inJavaDoc = true;
+                javadocTitle = null;
+            } else if (Srl.contains(trimmedLine, "*/")) {
+                inJavaDoc = false;
+            } else if (inJavaDoc && Srl.startsWith(trimmedLine, "*")) {
+                if (javadocTitle == null) { // to use first line
+                    javadocTitle = Srl.substringFirstRear(line, "*").trim();
+                }
+            } else if (trimmedLine.isEmpty()) { // empty line
+                javadocTitle = null; // may be different
+            } else if (trimmedLine.startsWith("//")) { // line comment line
+                javadocTitle = null; // may be different
+            } else if (Srl.containsAny(line, "public", "protected", "private") && !Srl.contains(line, METHOD_PREFIX)) { // other field or method
+                javadocTitle = null;
+            }
+            if (isArrangeQueryMethodFirstLine(line, trimmedLine)) {
+                final ScopeInfo scopeFirst = Srl.extractScopeFirst(line, METHOD_PREFIX, "(");
+                if (scopeFirst == null) { // basically no way, but just in case
+                    continue;
+                }
+                final String businessName = scopeFirst.getContent();
+                if (businessName.isEmpty()) { // e.g. arrange(), may be in TemplateClass
+                    continue;
+                }
+                final String methodName = METHOD_PREFIX + businessName;
+                final DfArrangeQueryMethod method = new DfArrangeQueryMethod(tableDbName, methodName);
+                if (javadocTitle != null) {
+                    method.setTitle(javadocTitle);
+                }
+                methodList.add(method);
+            }
+        }
+        return methodList;
+    }
+
+    protected boolean isArrangeQueryMethodFirstLine(String line, String trimmedLine) {
+        return trimmedLine.startsWith("public ") && Srl.containsAll(trimmedLine, METHOD_PREFIX, "(");
+    }
+
+    // ===================================================================================
+    //                                                                            Accessor
+    //                                                                            ========
+    protected DfBuildProperties getProperties() {
+        return DfBuildProperties.getInstance();
+    }
+
+    protected DfBasicProperties getBasicProperties() {
+        return getProperties().getBasicProperties();
+    }
+
+    protected DfDocumentProperties getDocumentProperties() {
+        return getProperties().getDocumentProperties();
+    }
+
+    protected DfLittleAdjustmentProperties getLittleAdjustmentProperties() {
+        return getProperties().getLittleAdjustmentProperties();
+    }
+
+    protected boolean isApplicationBehaviorProject() {
+        return getBasicProperties().isApplicationBehaviorProject();
+    }
+
+    protected String getLibraryProjectPrefix() {
+        return getBasicProperties().getLibraryProjectPrefix();
+    }
+
+    protected String getApplicationBehaviorAdditionalSuffix() {
+        return getBasicProperties().getApplicationBehaviorAdditionalSuffix();
+    }
+
+    protected String getBhvApResolvedProjectPrefix() {
+        return getBasicProperties().getBhvApResolvedProjectPrefix();
+    }
+
+    protected String getBhvApResolvedBehaviorSuffix() {
+        return getBasicProperties().getBhvApResolvedBehaviorSuffix();
+    }
+}
\ No newline at end of file
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/doc/arrqy/DfArrangeQueryMethod.java b/dbflute-engine/src/main/java/org/dbflute/logic/doc/arrqy/DfArrangeQueryMethod.java
new file mode 100644
index 000000000..df1a7984b
--- /dev/null
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/doc/arrqy/DfArrangeQueryMethod.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2014-2018 the original author or authors.
+ *
+ * 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.dbflute.logic.doc.arrqy;
+
+import org.dbflute.logic.doc.supplement.escape.DfDocumentTextResolver;
+
+/**
+ * @author jflute
+ * @since 1.1.9 (2018/12/31 Monday)
+ */
+public class DfArrangeQueryMethod {
+
+    // ===================================================================================
+    //                                                                           Attribute
+    //                                                                           =========
+    protected final String _tableDbName; // not null
+    protected final String _methodName; // not null
+    // no argument for now
+    //protected List<String> _argumentList;
+    protected String _title; // one liner, null allowed
+    protected String _description; // null allowed
+
+    protected final DfDocumentTextResolver _documentTextResolver = new DfDocumentTextResolver();
+
+    // ===================================================================================
+    //                                                                         Constructor
+    //                                                                         ===========
+    public DfArrangeQueryMethod(String tableDbName, String methodName) {
+        _tableDbName = tableDbName;
+        _methodName = methodName;
+    }
+
+    // ===================================================================================
+    //                                                                     HTML Expression
+    //                                                                     ===============
+    public String buildTitleExpForSchemaHtml() {
+        final StringBuilder sb = new StringBuilder();
+        sb.append(_methodName).append("()");
+        if (_title != null) {
+            // #thinking jflute should HTML-escape? (JavaDoc is HTML, however ...) (2018/12/31)
+            //final String resolvedTitle = _documentTextResolver.resolveSchemaHtmlContent(_title);
+            sb.append(" <span class=\"commentdesc\">// ").append(_title).append("</span>");
+        }
+        return sb.toString();
+    }
+
+    public String buildDescriptionExpForSchemaHtml() {
+        return "&nbsp;"; // #hope jflute from JavaDoc (2018/12/31)
+    }
+
+    // ===================================================================================
+    //                                                                            Accessor
+    //                                                                            ========
+    public String getTableDbName() {
+        return _tableDbName;
+    }
+
+    public String getMethodName() {
+        return _methodName;
+    }
+
+    public String getTitle() {
+        return _title;
+    }
+
+    public void setTitle(String title) {
+        _title = title;
+    }
+
+    public String getDescription() {
+        return _description;
+    }
+
+    public void setDescription(String description) {
+        _description = description;
+    }
+}
\ No newline at end of file
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/doc/arrqy/DfArrangeQueryTable.java b/dbflute-engine/src/main/java/org/dbflute/logic/doc/arrqy/DfArrangeQueryTable.java
new file mode 100644
index 000000000..11d8c1c29
--- /dev/null
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/doc/arrqy/DfArrangeQueryTable.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2014-2018 the original author or authors.
+ *
+ * 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.dbflute.logic.doc.arrqy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author jflute
+ * @since 1.1.9 (2018/12/31 Monday)
+ */
+public class DfArrangeQueryTable {
+
+    // ===================================================================================
+    //                                                                           Attribute
+    //                                                                           =========
+    protected final String _tableDbName;
+    protected final String _beanClassName;
+    protected final String _queryClassName;
+    protected final List<DfArrangeQueryMethod> _beanMethodList = new ArrayList<DfArrangeQueryMethod>();
+    protected final List<DfArrangeQueryMethod> _queryMethodList = new ArrayList<DfArrangeQueryMethod>();
+
+    // ===================================================================================
+    //                                                                         Constructor
+    //                                                                         ===========
+    public DfArrangeQueryTable(String tableDbName, String beanClassName, String queryClassName) {
+        _tableDbName = tableDbName;
+        _beanClassName = beanClassName;
+        _queryClassName = queryClassName;
+    }
+
+    // ===================================================================================
+    //                                                                            Accessor
+    //                                                                            ========
+    public String getTableDbName() {
+        return _tableDbName;
+    }
+
+    public String getBeanClassName() {
+        return _beanClassName;
+    }
+
+    public String getQueryClassName() {
+        return _queryClassName;
+    }
+
+    public void addBeanMethod(DfArrangeQueryMethod meta) {
+        _beanMethodList.add(meta);
+    }
+
+    public List<DfArrangeQueryMethod> getBeanMethodList() {
+        return _beanMethodList;
+    }
+
+    public void addQueryMethod(DfArrangeQueryMethod meta) {
+        _queryMethodList.add(meta);
+    }
+
+    public List<DfArrangeQueryMethod> getQueryMethodList() {
+        return _queryMethodList;
+    }
+}
\ No newline at end of file
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/doc/historyhtml/DfSchemaHistory.java b/dbflute-engine/src/main/java/org/dbflute/logic/doc/historyhtml/DfSchemaHistory.java
index 29c3c388c..3320cd817 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/doc/historyhtml/DfSchemaHistory.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/doc/historyhtml/DfSchemaHistory.java
@@ -52,12 +52,13 @@ public class DfSchemaHistory {
     // -----------------------------------------------------
     //                                        Basic Resource
     //                                        --------------
-    protected final String _historyFile;
+    protected final String _historyFile; // not null
 
     // -----------------------------------------------------
     //                                             Hacomment
     //                                             ---------
-    protected DfHacoMapPickup _hacoMapPickup; // loaded when call loadHacoMap
+    // basically used by only HistoryHTML (keep null if SchemaSyncCheck)
+    protected DfHacoMapPickup _hacoMapPickup; // loaded when call loadHacoMap, null allowed
 
     // -----------------------------------------------------
     //                                          Load History
@@ -253,7 +254,8 @@ public List<DfSchemaDiff> getSchemaDiffList() {
         return _schemaDiffList;
     }
 
-    public List<DfHacoMapDiffPart> getHacoMapDiffList() {
-        return _hacoMapPickup.getDiffList();
+    public List<DfHacoMapDiffPart> getHacoMapDiffList() { // if loaded
+        // should be empty list if null, for e.g. SchemaSyncCheck (unrelated to hacomment)
+        return _hacoMapPickup != null ? _hacoMapPickup.getDiffList() : DfCollectionUtil.emptyList();
     }
 }
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/doc/lreverse/DfLReverseProcess.java b/dbflute-engine/src/main/java/org/dbflute/logic/doc/lreverse/DfLReverseProcess.java
index 1956331ed..2500ff872 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/doc/lreverse/DfLReverseProcess.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/doc/lreverse/DfLReverseProcess.java
@@ -142,7 +142,7 @@ protected Database prepareDatabase() {
     }
 
     protected DfSchemaXmlSerializer createSchemaXmlSerializer(String schemaXml) {
-        return DfSchemaXmlSerializer.createAsManage(_dataSource, schemaXml, null);
+        return DfSchemaXmlSerializer.createAsManage(_dataSource, schemaXml, /*historyFile*/null);
     }
 
     protected DfSchemaXmlReader createSchemaXmlReader(String schemaXml) {
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/doc/schemahtml/DfSchemaHtmlDataArrangeQuery.java b/dbflute-engine/src/main/java/org/dbflute/logic/doc/schemahtml/DfSchemaHtmlDataArrangeQuery.java
new file mode 100644
index 000000000..2664288f0
--- /dev/null
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/doc/schemahtml/DfSchemaHtmlDataArrangeQuery.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2018 the original author or authors.
+ *
+ * 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.dbflute.logic.doc.schemahtml;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.torque.engine.database.model.Table;
+import org.dbflute.logic.doc.arrqy.DfArrangeQueryDocSetupper;
+import org.dbflute.logic.doc.arrqy.DfArrangeQueryTable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author jflute
+ * @since 1.1.9 (2018/12/31 Monday)
+ */
+public class DfSchemaHtmlDataArrangeQuery {
+
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
+    private static final Logger _log = LoggerFactory.getLogger(DfSchemaHtmlDataArrangeQuery.class);
+
+    // ===================================================================================
+    //                                                                           Attribute
+    //                                                                           =========
+    protected Map<String, DfArrangeQueryTable> _arrangeQueryTableMap;
+
+    // ===================================================================================
+    //                                                                 Available Procedure
+    //                                                                 ===================
+    public Map<String, DfArrangeQueryTable> getArrangeQueryTableMap(List<Table> tableList) {
+        if (_arrangeQueryTableMap != null) {
+            return _arrangeQueryTableMap;
+        }
+        _log.info(" ");
+        _log.info("...Setting up arrange queries for documents (ArrangeQueryDoc)");
+        _arrangeQueryTableMap = new DfArrangeQueryDocSetupper().extractArrangeQuery(tableList);
+        return _arrangeQueryTableMap;
+    }
+}
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/doc/schemahtml/DfSchemaHtmlProcedure.java b/dbflute-engine/src/main/java/org/dbflute/logic/doc/schemahtml/DfSchemaHtmlDataProcedure.java
similarity index 98%
rename from dbflute-engine/src/main/java/org/dbflute/logic/doc/schemahtml/DfSchemaHtmlProcedure.java
rename to dbflute-engine/src/main/java/org/dbflute/logic/doc/schemahtml/DfSchemaHtmlDataProcedure.java
index b82cc8f8f..aee311781 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/doc/schemahtml/DfSchemaHtmlProcedure.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/doc/schemahtml/DfSchemaHtmlDataProcedure.java
@@ -34,12 +34,12 @@
  * @author jflute
  * @since 1.1.3 (2017/03/19 Sunday)
  */
-public class DfSchemaHtmlProcedure {
+public class DfSchemaHtmlDataProcedure {
 
     // ===================================================================================
     //                                                                          Definition
     //                                                                          ==========
-    private static final Logger _log = LoggerFactory.getLogger(DfSchemaHtmlProcedure.class);
+    private static final Logger _log = LoggerFactory.getLogger(DfSchemaHtmlDataProcedure.class);
 
     // ===================================================================================
     //                                                                           Attribute
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/DfSPolicyColumnStatementChecker.java b/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/DfSPolicyColumnStatementChecker.java
index eafa1477e..a4f13ff62 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/DfSPolicyColumnStatementChecker.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/DfSPolicyColumnStatementChecker.java
@@ -86,7 +86,8 @@ protected boolean isIfTrue(DfSPolicyStatement statement, DfSPolicyIfPart ifPart,
         final String ifValue = ifPart.getIfValue();
         final boolean notIfValue = ifPart.isNotIfValue();
         if (ifItem.equalsIgnoreCase("tableName")) { // if tableName is ...
-            return isHitExp(toComparingTableName(column), ifValue) == !notIfValue;
+            final String comparingTableName = toComparingTableName(column);
+            return isHitExp(statement, comparingTableName, ifValue) == !notIfValue;
         } else if (ifItem.equalsIgnoreCase("column")) { // if column is ...
             if ("notNull".equalsIgnoreCase(ifValue)) {
                 return column.isNotNull() == !notIfValue;
@@ -94,6 +95,8 @@ protected boolean isIfTrue(DfSPolicyStatement statement, DfSPolicyIfPart ifPart,
                 return column.isAutoIncrement() == !notIfValue;
             } else if ("pk".equalsIgnoreCase(ifValue)) {
                 return column.isPrimaryKey() == !notIfValue;
+            } else if ("singlePK".equalsIgnoreCase(ifValue)) {
+                return (column.isPrimaryKey() && !column.isTwoOrMoreColumnPrimaryKey()) == !notIfValue;
             } else if ("fk".equalsIgnoreCase(ifValue)) {
                 return column.isForeignKey() == !notIfValue;
             } else if ("unique".equalsIgnoreCase(ifValue)) {
@@ -106,23 +109,28 @@ protected boolean isIfTrue(DfSPolicyStatement statement, DfSPolicyIfPart ifPart,
                 throwSchemaPolicyCheckIllegalIfThenStatementException(statement, "Unknown if-value: " + ifValue);
             }
         } else if (ifItem.equalsIgnoreCase("columnName")) { // if columnName is ...
-            return isHitExp(toComparingColumnName(column), toColumnNameComparingIfValue(column, ifValue)) == !notIfValue;
+            final String comparingColumnName = toComparingColumnName(column);
+            final String comparingIfValue = toColumnNameComparingIfValue(column, ifValue);
+            return isHitExp(statement, comparingColumnName, comparingIfValue) == !notIfValue;
         } else if (ifItem.equalsIgnoreCase("tableColumnName")) { // if tableColumnName is ...
-            return isHitExp(toComparingTableColumnName(column), toColumnNameComparingIfValue(column, ifValue)) == !notIfValue;
+            final String comparingTableColumnName = toComparingTableColumnName(column);
+            final String comparingIfValue = toColumnNameComparingIfValue(column, ifValue);
+            return isHitExp(statement, comparingTableColumnName, comparingIfValue) == !notIfValue;
         } else if (ifItem.equalsIgnoreCase("alias")) { // if alias is ...
-            return isHitExp(column.getAlias(), toAliasComparingIfValue(column, ifValue)) == !notIfValue;
+            final String comparingIfValue = toAliasComparingIfValue(column, ifValue);
+            return isHitExp(statement, column.getAlias(), comparingIfValue) == !notIfValue;
         } else if (ifItem.equalsIgnoreCase("dbType")) { // if dbType is ...
             if (column.hasDbType()) { // just in case
-                return isHitExp(column.getDbType(), ifValue) == !notIfValue;
+                return isHitExp(statement, column.getDbType(), ifValue) == !notIfValue;
             }
         } else if (ifItem.equalsIgnoreCase("size")) { // if size is ...
             if (column.hasColumnSize()) { // just in case
-                return isHitExp(column.getColumnSize(), ifValue) == !notIfValue;
+                return isHitExp(statement, column.getColumnSize(), ifValue) == !notIfValue;
             }
         } else if (ifItem.equalsIgnoreCase("dbType_with_size")) { // e.g. if dbType_with_size is char(3)
             if (column.hasDbType() && column.hasColumnSize()) { // just in case
                 final String exp = toComparingDbTypeWithSize(column);
-                return isHitExp(exp, ifValue) == !notIfValue;
+                return isHitExp(statement, exp, ifValue) == !notIfValue;
             }
         } else if (ifItem.equalsIgnoreCase("firstDate")) { // if firstDate is after:2018/05/03
             return determineFirstDate(statement, ifValue, notIfValue, column);
@@ -268,9 +276,9 @@ protected String doEvaluateColumnThenItemValue(DfSPolicyStatement statement, DfS
         final String thenValue = thenPart.getThenValue();
         final boolean notThenValue = thenPart.isNotThenValue();
         if (thenItem.equalsIgnoreCase("tableName")) { // e.g. tableName is prefix:CLS_
-            final String tableName = toComparingTableName(column);
-            if (!isHitExp(tableName, thenValue) == !notThenValue) {
-                return violationCall.apply(tableName);
+            final String comparingTableName = toComparingTableName(column);
+            if (!isHitExp(statement, comparingTableName, thenValue) == !notThenValue) {
+                return violationCall.apply(comparingTableName);
             }
         } else if (thenItem.equalsIgnoreCase("column")) { // e.g. column is notNull
             if ("notNull".equalsIgnoreCase(thenValue)) {
@@ -288,6 +296,11 @@ protected String doEvaluateColumnThenItemValue(DfSPolicyStatement statement, DfS
                 if (!determination == !notThenValue) {
                     return violationCall.apply(String.valueOf(determination));
                 }
+            } else if ("singlePK".equalsIgnoreCase(thenValue)) {
+                final boolean determination = column.isPrimaryKey() && !column.isTwoOrMoreColumnPrimaryKey();
+                if (!determination == !notThenValue) {
+                    return violationCall.apply(String.valueOf(determination));
+                }
             } else if ("fk".equalsIgnoreCase(thenValue)) {
                 final boolean determination = column.isForeignKey();
                 if (!determination == !notThenValue) {
@@ -312,38 +325,41 @@ protected String doEvaluateColumnThenItemValue(DfSPolicyStatement statement, DfS
                 throwSchemaPolicyCheckIllegalIfThenStatementException(statement, "Unknown then-value: " + thenValue);
             }
         } else if (thenItem.equalsIgnoreCase("columnName")) { // e.g. columnName is suffix:_ID
-            final String columnName = toComparingColumnName(column);
-            if (!isHitExp(columnName, toColumnNameComparingThenValue(column, thenValue)) == !notThenValue) {
-                return violationCall.apply(columnName);
+            final String comparingColumnName = toComparingColumnName(column);
+            final String comparingThenValue = toColumnNameComparingThenValue(column, thenValue);
+            if (!isHitExp(statement, comparingColumnName, comparingThenValue) == !notThenValue) {
+                return violationCall.apply(comparingColumnName);
             }
         } else if (thenItem.equalsIgnoreCase("tableColumnName")) { // e.g. tableColumnName is contain:R.M
-            final String tableColumnName = toComparingTableColumnName(column);
-            if (!isHitExp(tableColumnName, toColumnNameComparingThenValue(column, thenValue)) == !notThenValue) {
-                return violationCall.apply(tableColumnName);
+            final String comparingTableColumnName = toComparingTableColumnName(column);
+            final String comparingThenValue = toColumnNameComparingThenValue(column, thenValue);
+            if (!isHitExp(statement, comparingTableColumnName, comparingThenValue) == !notThenValue) {
+                return violationCall.apply(comparingTableColumnName);
             }
         } else if (thenItem.equalsIgnoreCase("alias")) { // e.g. alias is suffix:ID
             final String alias = column.getAlias();
-            if (!isHitExp(alias, toAliasComparingThenValue(column, thenValue)) == !notThenValue) {
+            final String comparingThenValue = toAliasComparingThenValue(column, thenValue);
+            if (!isHitExp(statement, alias, comparingThenValue) == !notThenValue) {
                 return violationCall.apply(alias);
             }
         } else if (thenItem.equalsIgnoreCase("dbType")) { // e.g. dbType is integer
             final String dbType = column.getDbType();
-            if (!isHitExp(dbType, thenValue) == !notThenValue) {
+            if (!isHitExp(statement, dbType, thenValue) == !notThenValue) {
                 return violationCall.apply(dbType);
             }
         } else if (thenItem.equalsIgnoreCase("size")) { // e.g. size is 200
             final String size = column.getColumnSize(); // String expression #for_now
-            if (!isHitExp(size, thenValue) == !notThenValue) {
+            if (!isHitExp(statement, size, thenValue) == !notThenValue) {
                 return violationCall.apply(size);
             }
         } else if (thenItem.equalsIgnoreCase("dbType_with_size")) { // e.g. dbType_with_size is char(3)
             final String dbTypeWithSize = toComparingDbTypeWithSize(column);
-            if (!isHitExp(dbTypeWithSize, thenValue) == !notThenValue) {
+            if (!isHitExp(statement, dbTypeWithSize, thenValue) == !notThenValue) {
                 return violationCall.apply(dbTypeWithSize);
             }
         } else if (thenItem.equalsIgnoreCase("comment")) { // e.g. comment is contain:SEA
             final String comment = column.getComment();
-            if (!isHitExp(comment, thenValue) == !notThenValue) {
+            if (!isHitExp(statement, comment, thenValue) == !notThenValue) {
                 return violationCall.apply(comment);
             }
         } else {
@@ -361,41 +377,71 @@ protected String toAliasComparingThenValue(Column column, String thenValue) {
     }
 
     protected String buildViolation(Column column, DfSPolicyThenPart thenPart, String actual) {
-        final String thenItem = thenPart.getThenItem();
-        final String thenValue = thenPart.getThenValue();
-        final String notOr = thenPart.isNotThenValue() ? "not " : "";
+        // change message to be simple, because it can be debugged by only statement display by jflute (2018/05/22)
+        //final String thenItem = thenPart.getThenItem();
+        //final String thenValue = thenPart.getThenValue();
+        //final String notOr = thenPart.isNotThenValue() ? "not " : "";
         final String columnDisp = toColumnDisp(column);
-        return "The " + thenItem + " should " + notOr + "be " + thenValue + " but " + actual + ": " + columnDisp;
+        return "but " + actual + ": " + columnDisp;
+        //return "The " + thenItem + " should " + notOr + "be " + thenValue + " but " + actual + ": " + columnDisp;
     }
 
     // ===================================================================================
     //                                                                     Comparing Value
     //                                                                     ===============
+    // *The "(df:emptyXxx)" is dummy value for $$variable$$ of no-value not to hit unrelated value
     protected String convertToColumnNameComparingValue(Column column, String yourValue) { // @since 1.1.8
         String comparingValue = yourValue;
-        final String tableName = toComparingTableName(column); // e.g. columnName is $$table$$_ID
-        comparingValue = Srl.replace(comparingValue, "$$table$$", tableName);
-        comparingValue = Srl.replace(comparingValue, "$$Table$$", tableName);
-        comparingValue = Srl.replace(comparingValue, "$$TABLE$$", tableName);
+        {
+            final String tableName = toComparingTableName(column); // e.g. columnName is $$table$$_ID
+            comparingValue = replaceComparingValue(comparingValue, "tableName", tableName, /*suppressUpper*/true); // @since 1.1.9
+            comparingValue = replaceComparingValue(comparingValue, "table", tableName); // old style, @since 1.1.8
+        }
+        {
+            final String comment = column.hasComment() ? column.getComment() : "(df:emptyComment)";
+            comparingValue = replaceComparingValue(comparingValue, "comment", comment); // @since 1.1.9
+        }
         return comparingValue;
     }
 
-    protected String convertToAliasComparingValue(Column column, String yourValue) { // @since 1.1.8
+    protected String convertToAliasComparingValue(Column column, String yourValue) {
         String comparingValue = yourValue;
-        final Table table = column.getTable();
-        if (table.hasAlias()) {
-            final String tableAlias = table.getAlias(); // alias is $$tableAlias$$ID
-            comparingValue = Srl.replace(comparingValue, "$$tableAlias$$", tableAlias);
-            comparingValue = Srl.replace(comparingValue, "$$TableAlias$$", tableAlias);
+        {
+            final String columnDbName = column.getName();
+            comparingValue = replaceComparingValue(comparingValue, "columnName", columnDbName, /*suppressUpper*/true); // @since 1.1.9
+            comparingValue = replaceComparingValue(comparingValue, "column", columnDbName); // facade style, @since 1.1.9
+        }
+        {
+            final Table table = column.getTable();
+            final String tableAlias = table.hasAlias() ? table.getAlias() : "(df:emptyTableAlias)";
+            comparingValue = replaceComparingValue(comparingValue, "tableAlias", tableAlias, /*suppressUpper*/true); // @since 1.1.9
+        }
+        {
+            final String comment = column.hasComment() ? column.getComment() : "(df:emptyComment)";
+            comparingValue = replaceComparingValue(comparingValue, "comment", comment); // @since 1.1.9
         }
         return comparingValue;
     }
 
+    protected String replaceComparingValue(String comparingValue, String variableName, String targetStr) {
+        return replaceComparingValue(comparingValue, variableName, targetStr, false);
+    }
+
+    protected String replaceComparingValue(String comparingValue, String variableName, String targetStr, boolean suppressUpper) {
+        String filtered = comparingValue;
+        filtered = Srl.replace(filtered, "$$" + variableName + "$$", targetStr); // e.g. $$table$$
+        filtered = Srl.replace(filtered, "$$" + Srl.initCap(variableName) + "$$", targetStr); // e.g. $$Table$$
+        if (!suppressUpper) {
+            filtered = Srl.replace(filtered, "$$" + variableName.toUpperCase() + "$$", targetStr); // e.g. $$TABLE$$
+        }
+        return filtered;
+    }
+
     // ===================================================================================
     //                                                                        Assist Logic
     //                                                                        ============
-    protected boolean isHitExp(String exp, String hint) {
-        return _logicalSecretary.isHitExp(exp, hint);
+    protected boolean isHitExp(DfSPolicyStatement statement, String exp, String hint) {
+        return _logicalSecretary.isHitExp(statement, exp, hint);
     }
 
     protected String toComparingTableName(Column column) {
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/DfSPolicyTableStatementChecker.java b/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/DfSPolicyTableStatementChecker.java
index d9ad45240..8df5320f6 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/DfSPolicyTableStatementChecker.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/DfSPolicyTableStatementChecker.java
@@ -89,42 +89,51 @@ protected boolean isIfTrue(DfSPolicyStatement statement, DfSPolicyIfPart ifPart,
         final String ifValue = ifPart.getIfValue();
         final boolean notIfValue = ifPart.isNotIfValue();
         if (ifItem.equalsIgnoreCase("tableName")) { // if tableName is ...
-            return isHitExp(toComparingTableName(table), ifValue) == !notIfValue;
+            final String comparingTableName = toComparingTableName(table);
+            final String comparingIfValue = toTableNameComparingIfValue(table, ifValue);
+            return isHitExp(statement, comparingTableName, comparingIfValue) == !notIfValue;
         } else if (ifItem.equalsIgnoreCase("alias")) { // if alias is ...
-            return isHitExp(table.getAlias(), ifValue) == !notIfValue;
+            final String comparingIfValue = toAliasComparingIfValue(table, ifValue);
+            return isHitExp(statement, table.getAlias(), comparingIfValue) == !notIfValue;
         } else if (ifItem.equalsIgnoreCase("firstDate")) { // if firstDate is after:2018/05/03
-            return determineFirstDate(statement, ifValue, notIfValue, table);
+            return determineFirstDateIfValue(statement, ifValue, notIfValue, table);
+        } else if (ifItem.equalsIgnoreCase("pk_columnName")) {
+            return determinePkSomethingIfValue(statement, table, ifValue, notIfValue, pk -> toComparingColumnName(pk));
         } else if (ifItem.equalsIgnoreCase("pk_dbType") || ifItem.equalsIgnoreCase("pkDbType")) { // for compatible
-            if (table.hasPrimaryKey()) {
-                final List<Column> pkList = table.getPrimaryKey();
-                for (Column pk : pkList) { // required here (for PK's something)
-                    return isHitExp(pk.getDbType(), ifValue) == !notIfValue;
-                }
-            }
+            return determinePkSomethingIfValue(statement, table, ifValue, notIfValue, pk -> pk.getDbType());
         } else if (ifItem.equalsIgnoreCase("pk_size")) {
-            if (table.hasPrimaryKey()) {
-                final List<Column> pkList = table.getPrimaryKey();
-                for (Column pk : pkList) { // required here (for PK's something)
-                    return isHitExp(pk.getColumnSize(), ifValue) == !notIfValue;
-                }
-            }
+            return determinePkSomethingIfValue(statement, table, ifValue, notIfValue, pk -> pk.getColumnSize());
         } else if (ifItem.equalsIgnoreCase("pk_dbType_with_size")) {
-            if (table.hasPrimaryKey()) {
-                final List<Column> pkList = table.getPrimaryKey();
-                for (Column pk : pkList) { // required here (for PK's something)
-                    return isHitExp(toComparingDbTypeWithSize(pk), ifValue) == !notIfValue;
-                }
-            }
+            return determinePkSomethingIfValue(statement, table, ifValue, notIfValue, pk -> toComparingDbTypeWithSize(pk));
         } else {
             throwSchemaPolicyCheckIllegalIfThenStatementException(statement, "Unknown if-item: " + ifItem);
         }
         return false;
     }
 
-    protected boolean determineFirstDate(DfSPolicyStatement statement, String ifValue, boolean notIfValue, Table table) {
+    protected boolean determineFirstDateIfValue(DfSPolicyStatement statement, String ifValue, boolean notIfValue, Table table) {
         return _firstDateSecretary.determineTableFirstDate(statement, ifValue, notIfValue, table);
     }
 
+    protected boolean determinePkSomethingIfValue(DfSPolicyStatement statement, Table table, String ifValue, boolean notIfValue,
+            Function<Column, String> valueProvider) {
+        if (table.hasPrimaryKey()) {
+            final List<Column> pkList = table.getPrimaryKey();
+            for (Column pk : pkList) { // required here (for PK's something)
+                return isHitExp(statement, valueProvider.apply(pk), ifValue) == !notIfValue;
+            }
+        }
+        return false;
+    }
+
+    protected String toTableNameComparingIfValue(Table table, String ifValue) {
+        return convertToTableNameComparingValue(table, ifValue);
+    }
+
+    protected String toAliasComparingIfValue(Table table, String ifValue) {
+        return convertToAliasComparingValue(table, ifValue);
+    }
+
     // ===================================================================================
     //                                                                         Then Clause
     //                                                                         ===========
@@ -167,6 +176,10 @@ protected void evaluateTableThenTheme(DfSPolicyStatement statement, DfSPolicyRes
             if (_logicalSecretary.isNotIdentityIfPureIDPK(table) == !notThenClause) {
                 result.violate(policy, "The primary key should " + notOr + "be identity: " + toTableDisp(table));
             }
+        } else if (thenTheme.contains("sequenceIfPureIDPK")) {
+            if (_logicalSecretary.isNotSequenceIfPureIDPK(table) == !notThenClause) {
+                result.violate(policy, "The primary key should " + notOr + "be sequence: " + toTableDisp(table));
+            }
         } else if (thenTheme.contains("hasCommonColumn")) {
             if (!table.hasAllCommonColumn() == !notThenClause) {
                 result.violate(policy, "The table should " + notOr + "have common columns: " + toTableDisp(table));
@@ -208,25 +221,25 @@ protected String doEvaluateColumnThenItemValue(DfSPolicyStatement statement, DfS
         final boolean notThenValue = thenPart.isNotThenValue();
         if (thenItem.equalsIgnoreCase("tableName")) { // e.g. tableName is prefix:CLS_
             final String tableName = toComparingTableName(table);
-            if (!isHitExp(tableName, thenValue) == !notThenValue) {
+            if (!isHitExp(statement, tableName, toTableNameComparingThenValue(table, thenValue)) == !notThenValue) {
                 return violationCall.apply(tableName);
             }
         } else if (thenItem.equalsIgnoreCase("alias")) { // e.g. alias is suffix:History
             final String alias = table.getAlias();
-            if (!isHitExp(alias, thenValue) == !notThenValue) {
+            if (!isHitExp(statement, alias, toAliasComparingThenValue(table, thenValue)) == !notThenValue) {
                 return violationCall.apply(alias);
             }
         } else if (thenItem.equalsIgnoreCase("comment")) { // e.g. comment is contain:SEA
             final String comment = table.getComment();
-            if (!isHitExp(comment, thenValue) == !notThenValue) {
+            if (!isHitExp(statement, comment, thenValue) == !notThenValue) {
                 return violationCall.apply(comment);
             }
         } else if (thenItem.equalsIgnoreCase("pkName")) { // e.g. pkName is prefix:PK_
             if (table.hasPrimaryKey()) {
                 final Column pk = table.getPrimaryKey().get(0); // same name if compound
                 final String pkName = pk.getPrimaryKeyName();
-                final String comparingValue = toConstraintComparingValue(table, thenValue);
-                if (!isHitExp(pkName, comparingValue) == !notThenValue) {
+                final String comparingThenValue = toConstraintNameComparingThenValue(table, thenValue);
+                if (!isHitExp(statement, pkName, comparingThenValue) == !notThenValue) {
                     final String disp = pkName + (pk.isAdditionalPrimaryKey() ? ADDITIONAL_SUFFIX : "");
                     return violationCall.apply(disp);
                 }
@@ -234,8 +247,8 @@ protected String doEvaluateColumnThenItemValue(DfSPolicyStatement statement, DfS
         } else if (thenItem.equalsIgnoreCase("fkName")) { // e.g. fkName is prefix:FK_
             for (ForeignKey fk : table.getForeignKeyList()) {
                 final String fkName = fk.getName();
-                final String comparingValue = toConstraintComparingValue(table, thenValue);
-                if (!isHitExp(fkName, comparingValue) == !notThenValue) {
+                final String comparingThenValue = toConstraintNameComparingThenValue(table, thenValue);
+                if (!isHitExp(statement, fkName, comparingThenValue) == !notThenValue) {
                     final String disp = fkName + (fk.isAdditionalForeignKey() ? ADDITIONAL_SUFFIX : "");
                     return violationCall.apply(disp);
                 }
@@ -243,8 +256,8 @@ protected String doEvaluateColumnThenItemValue(DfSPolicyStatement statement, DfS
         } else if (thenItem.equalsIgnoreCase("uniqueName")) { // e.g. uniqueName is prefix:UQ_ 
             for (Unique uq : table.getUniqueList()) {
                 final String uqName = uq.getName();
-                final String comparingValue = toConstraintComparingValue(table, thenValue);
-                if (!isHitExp(uqName, comparingValue)) {
+                final String comparingThenValue = toConstraintNameComparingThenValue(table, thenValue);
+                if (!isHitExp(statement, uqName, comparingThenValue)) {
                     final String disp = uqName + (uq.isAdditional() ? ADDITIONAL_SUFFIX : "");
                     return violationCall.apply(disp);
                 }
@@ -252,83 +265,124 @@ protected String doEvaluateColumnThenItemValue(DfSPolicyStatement statement, DfS
         } else if (thenItem.equalsIgnoreCase("indexName")) { // e.g. indexName is prefix:IX_ 
             for (Index ix : table.getIndexList()) {
                 final String ixName = ix.getName();
-                final String comparingValue = toConstraintComparingValue(table, thenValue);
-                if (!isHitExp(ixName, comparingValue) == !notThenValue) {
+                final String comparingThenValue = toConstraintNameComparingThenValue(table, thenValue);
+                if (!isHitExp(statement, ixName, comparingThenValue) == !notThenValue) {
                     return violationCall.apply(ixName);
                 }
             }
         } else if (thenItem.equalsIgnoreCase("pk_columnName")) {
-            if (table.hasPrimaryKey()) {
-                final List<Column> pkList = table.getPrimaryKey();
-                for (Column pk : pkList) {
-                    final String columnName = pk.getName();
-                    if (!isHitExp(columnName, thenValue) == !notThenValue) {
-                        return violationCall.apply(columnName);
-                    }
-                }
-            }
+            return determinePkSomethingThenValue(statement, table, violationCall, thenValue, notThenValue, pk -> toComparingColumnName(pk));
         } else if (thenItem.equalsIgnoreCase("pk_dbType") || thenItem.equalsIgnoreCase("pkDbType")) { // for compatible
-            if (table.hasPrimaryKey()) {
-                final List<Column> pkList = table.getPrimaryKey();
-                for (Column pk : pkList) {
-                    final String dbType = pk.getDbType();
-                    if (!isHitExp(dbType, thenValue) == !notThenValue) {
-                        return violationCall.apply(dbType);
-                    }
-                }
-            }
+            return determinePkSomethingThenValue(statement, table, violationCall, thenValue, notThenValue, pk -> pk.getDbType());
         } else if (thenItem.equalsIgnoreCase("pk_size")) {
-            if (table.hasPrimaryKey()) {
-                final List<Column> pkList = table.getPrimaryKey();
-                for (Column pk : pkList) {
-                    final String size = pk.getColumnSize();
-                    if (!isHitExp(size, thenValue) == !notThenValue) {
-                        return violationCall.apply(size);
-                    }
-                }
-            }
+            return determinePkSomethingThenValue(statement, table, violationCall, thenValue, notThenValue, pk -> pk.getColumnSize());
         } else if (thenItem.equalsIgnoreCase("pk_dbType_with_size")) { // e.g. char(3)
-            if (table.hasPrimaryKey()) {
-                final List<Column> pkList = table.getPrimaryKey();
-                for (Column pk : pkList) {
-                    final String dbTypeWithSize = toComparingDbTypeWithSize(pk);
-                    if (!isHitExp(dbTypeWithSize, thenValue) == !notThenValue) {
-                        return violationCall.apply(dbTypeWithSize);
-                    }
-                }
-            }
+            return determinePkSomethingThenValue(statement, table, violationCall, thenValue, notThenValue,
+                    pk -> toComparingDbTypeWithSize(pk));
         } else {
             throwSchemaPolicyCheckIllegalIfThenStatementException(statement, "Unknown then-item: " + thenItem);
         }
         return null; // no violation
     }
 
-    protected String toConstraintComparingValue(Table table, String thenValue) {
+    protected String determinePkSomethingThenValue(DfSPolicyStatement statement, Table table, Function<String, String> violationCall,
+            String thenValue, boolean notThenValue, Function<Column, String> valueProvider) {
+        if (table.hasPrimaryKey()) {
+            final List<Column> pkList = table.getPrimaryKey();
+            for (Column pk : pkList) {
+                final String comparingValue = valueProvider.apply(pk);
+                if (!isHitExp(statement, comparingValue, thenValue) == !notThenValue) {
+                    return violationCall.apply(comparingValue);
+                }
+            }
+        }
+        return null;
+    }
+
+    protected String toTableNameComparingThenValue(Table table, String thenValue) {
+        return convertToTableNameComparingValue(table, thenValue);
+    }
+
+    protected String toAliasComparingThenValue(Table table, String thenValue) {
+        return convertToAliasComparingValue(table, thenValue);
+    }
+
+    protected String toConstraintNameComparingThenValue(Table table, String thenValue) {
+        return convertToConstraintNameComparingValue(table, thenValue);
+    }
+
+    protected String buildViolation(Table table, DfSPolicyThenPart thenPart, String actual) {
+        // change message to be simple, because it can be debugged by only statement display by jflute (2018/05/22)
+        //final String thenItem = thenPart.getThenItem();
+        //final String thenValue = thenPart.getThenValue();
+        //final String notOr = thenPart.isNotThenValue() ? "not " : "";
+        final String columnDisp = toTableDisp(table);
+        return "but " + actual + ": " + columnDisp;
+        //return "The " + thenItem + " should " + notOr + "be " + thenValue + " but " + actual + ": " + columnDisp;
+    }
+
+    // ===================================================================================
+    //                                                                     Comparing Value
+    //                                                                     ===============
+    // *The "(df:emptyXxx)" is dummy value for $$variable$$ of no-value not to hit unrelated value
+    protected String convertToTableNameComparingValue(Table table, String yourValue) { // @since 1.1.9
+        String comparingValue = yourValue;
+        {
+            final String comment = table.hasComment() ? table.getComment() : "(df:emptyComment)";
+            comparingValue = replaceComparingValue(comparingValue, "comment", comment); // @since 1.1.9
+        }
+        return comparingValue;
+    }
+
+    protected String convertToAliasComparingValue(Table table, String yourValue) { // @since 1.1.9
+        String comparingValue = yourValue;
+        final String tableName = toComparingTableName(table);
+        {
+            comparingValue = replaceComparingValue(comparingValue, "tableName", tableName, /*suppressUpper*/true); // @since 1.1.9
+            comparingValue = replaceComparingValue(comparingValue, "table", tableName); // facade style, @since 1.1.9
+        }
+        {
+            final String comment = table.hasComment() ? table.getComment() : "(df:emptyComment)";
+            comparingValue = replaceComparingValue(comparingValue, "comment", comment); // @since 1.1.9
+        }
+        return comparingValue;
+    }
+
+    protected String convertToConstraintNameComparingValue(Table table, String thenValue) {
         final String tableName = toComparingTableName(table);
         String comparingValue = thenValue;
-        comparingValue = Srl.replace(comparingValue, "$$table$$", tableName);
-        comparingValue = Srl.replace(comparingValue, "$$Table$$", tableName);
-        comparingValue = Srl.replace(comparingValue, "$$TABLE$$", tableName);
+        comparingValue = replaceComparingValue(comparingValue, "tableName", tableName, /*suppressUpper*/true); // @since 1.1.9
+        comparingValue = replaceComparingValue(comparingValue, "table", tableName); // facade style, @since first
         return comparingValue;
     }
 
-    protected String buildViolation(Table table, DfSPolicyThenPart thenPart, String actual) {
-        final String thenItem = thenPart.getThenItem();
-        final String thenValue = thenPart.getThenValue();
-        final String notOr = thenPart.isNotThenValue() ? "not " : "";
-        final String columnDisp = toTableDisp(table);
-        return "The " + thenItem + " should " + notOr + "be " + thenValue + " but " + actual + ": " + columnDisp;
+    protected String replaceComparingValue(String comparingValue, String variableName, String targetStr) {
+        return replaceComparingValue(comparingValue, variableName, targetStr, false);
+    }
+
+    protected String replaceComparingValue(String comparingValue, String variableName, String targetStr, boolean suppressUpper) {
+        String filtered = comparingValue;
+        filtered = Srl.replace(filtered, "$$" + variableName + "$$", targetStr); // e.g. $$table$$
+        filtered = Srl.replace(filtered, "$$" + Srl.initCap(variableName) + "$$", targetStr); // e.g. $$Table$$
+        if (!suppressUpper) {
+            filtered = Srl.replace(filtered, "$$" + variableName.toUpperCase() + "$$", targetStr); // e.g. $$TABLE$$
+        }
+        return filtered;
     }
 
     // ===================================================================================
     //                                                                        Assist Logic
     //                                                                        ============
-    protected boolean isHitExp(String exp, String hint) {
-        return _logicalSecretary.isHitExp(exp, hint);
+    protected boolean isHitExp(DfSPolicyStatement statement, String exp, String hint) {
+        return _logicalSecretary.isHitExp(statement, exp, hint);
     }
 
     protected String toComparingTableName(Table table) {
-        return _logicalSecretary.toComparingTableName(table);
+        return _logicalSecretary.toComparingTableName(table); // e.g. MEMBER
+    }
+
+    protected String toComparingColumnName(Column column) {
+        return _logicalSecretary.toComparingColumnName(column); // e.g. MEMBER_NAME
     }
 
     protected String toComparingDbTypeWithSize(Column column) {
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/DfSPolicyTableThemeChecker.java b/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/DfSPolicyTableThemeChecker.java
index 4c2693b12..fca921be1 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/DfSPolicyTableThemeChecker.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/DfSPolicyTableThemeChecker.java
@@ -21,6 +21,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import org.apache.torque.engine.database.model.Column;
 import org.apache.torque.engine.database.model.Table;
 import org.dbflute.helper.StringKeyMap;
 import org.dbflute.logic.doc.spolicy.result.DfSPolicyResult;
@@ -97,7 +98,10 @@ protected void prepareTableTheme(Map<String, BiConsumer<Table, DfSPolicyResult>>
             return "The table name should be on lower case basis: " + toTableDisp(table);
         });
         define(themeMap, "identityIfPureIDPK", table -> _logicalSecretary.isNotIdentityIfPureIDPK(table), table -> {
-            return "The primary key should be identity: " + toTableDisp(table) + "." + table.getPrimaryKeyAsOne().getName();
+            return "The primary key should be identity: " + toColumnDisp(table.getPrimaryKeyAsOne());
+        });
+        define(themeMap, "sequenceIfPureIDPK", table -> _logicalSecretary.isNotSequenceIfPureIDPK(table), table -> {
+            return "The primary key should be sequence: " + toColumnDisp(table.getPrimaryKeyAsOne());
         });
         define(themeMap, "hasCommonColumn", table -> !table.hasAllCommonColumn(), table -> {
             return "The table should have common columns: " + toTableDisp(table);
@@ -130,6 +134,10 @@ protected String toTableDisp(Table table) {
         return _logicalSecretary.toTableDisp(table);
     }
 
+    protected String toColumnDisp(Column column) {
+        return _logicalSecretary.toColumnDisp(column);
+    }
+
     // ===================================================================================
     //                                                                           Exception
     //                                                                           =========
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/parsed/DfSPolicyStatement.java b/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/parsed/DfSPolicyStatement.java
index ace7e1144..f7e378725 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/parsed/DfSPolicyStatement.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/parsed/DfSPolicyStatement.java
@@ -139,9 +139,9 @@ public static class DfSPolicyThenClause {
 
         protected final String _thenTheme; // null allowed
         protected final boolean _notThenTheme;
-        protected final List<DfSPolicyThenPart> _thenPartList; // at least one element if non-theme
+        protected final List<DfSPolicyThenPart> _thenPartList; // not null, at least one element if non-theme
         protected final boolean _connectedByOr;
-        protected final String _supplement;
+        protected final String _supplement; // for "=> {}", null allowed
 
         public DfSPolicyThenClause(String thenTheme, boolean notThenTheme, List<DfSPolicyThenPart> thenPartList, boolean connectedByOr,
                 String supplement) {
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/secretary/DfSPolicyLogicalSecretary.java b/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/secretary/DfSPolicyLogicalSecretary.java
index b5694cf28..c043053ae 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/secretary/DfSPolicyLogicalSecretary.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/doc/spolicy/secretary/DfSPolicyLogicalSecretary.java
@@ -26,6 +26,7 @@
 import org.dbflute.exception.DfSchemaPolicyCheckIllegalIfThenStatementException;
 import org.dbflute.exception.DfSchemaPolicyCheckUnknownPropertyException;
 import org.dbflute.exception.DfSchemaPolicyCheckUnknownThemeException;
+import org.dbflute.exception.DfSchemaPolicyCheckUnknownVariableException;
 import org.dbflute.exception.DfSchemaPolicyCheckViolationException;
 import org.dbflute.helper.message.ExceptionMessageBuilder;
 import org.dbflute.logic.doc.spolicy.parsed.DfSPolicyStatement;
@@ -182,17 +183,19 @@ protected List<String> splitClauseByConnector(String clause, String connector) {
     // ===================================================================================
     //                                                                           Hit Logic
     //                                                                           =========
-    public boolean isHitExp(String exp, String hint) {
-        return determineHitBy(exp, hint);
+    public boolean isHitExp(DfSPolicyStatement statement, String exp, String hint) {
+        return determineHitBy(statement, exp, hint);
     }
 
-    protected boolean determineHitBy(String name, String hint) { // hint is e.g. prefix:MEMBER
+    protected boolean determineHitBy(DfSPolicyStatement statement, String name, String hint) { // hint is e.g. prefix:MEMBER
         if (name == null) {
             return false;
         }
         if ("$$ALL$$".equalsIgnoreCase(hint)) { // e.g. tableName is $$ALL$$
             return true;
-        } else if (hint.contains(" and ")) { // e.g. tableName is prefix:MEMBER and suffix:_HISTORY
+        }
+        checkUnknownVariable(statement, name, hint); // should be after $$ALL$$ process
+        if (hint.contains(" and ")) { // e.g. tableName is prefix:MEMBER and suffix:_HISTORY
             final List<String> elementHintList = Srl.splitListTrimmed(hint, " and ");
             for (String elementHint : elementHintList) {
                 if (!DfNameHintUtil.isHitByTheHint(name, elementHint)) {
@@ -213,6 +216,37 @@ protected boolean determineHitBy(String name, String hint) { // hint is e.g. pre
         }
     }
 
+    protected void checkUnknownVariable(DfSPolicyStatement statement, String name, String hint) {
+        if (Srl.count(hint, "$$") >= 2) {
+            ExceptionMessageBuilder br = new ExceptionMessageBuilder();
+            br.addNotice("Unknown variable in the SchemaPolicyCheck statement.");
+            br.addItem("Advice");
+            br.addElement("Confirm your statement in schemaPolicyMap.dfprop");
+            br.addElement("and see the official document.");
+            br.addElement("You can use only reserved variables.");
+            br.addElement("For example:");
+            br.addElement("  (o):");
+            br.addElement("    columnName is $$ALL$$");
+            br.addElement("    fkName is prefix:FK_$$table$$");
+            br.addElement("    alias is not $$columnName$$");
+            br.addElement("    alias is not $$comment$$");
+            br.addElement("  (x):");
+            br.addElement("    columnName is $$sea$$");
+            br.addElement("    columnName is $$land$$");
+            br.addElement("    columnName is $$piari$$");
+            br.addElement("    columnName is $$bonvo$$");
+            br.addElement("    columnName is $$dstore$$");
+            br.addItem("Statement");
+            br.addElement(statement.getNativeExp());
+            br.addItem("Current Data");
+            br.addElement(name);
+            br.addItem("Unresolved Keyword");
+            br.addElement(hint);
+            final String msg = br.buildExceptionMessage();
+            throw new DfSchemaPolicyCheckUnknownVariableException(msg);
+        }
+    }
+
     // ===================================================================================
     //                                                            Conversion for Comparing
     //                                                            ========================
@@ -234,7 +268,13 @@ public String toComparingDbTypeWithSize(Column column) {
     //                                                              Conversion for Display
     //                                                              ======================
     public String toTableDisp(Table table) {
-        return table.getAliasExpression() + table.getTableDispName();
+        final StringBuilder sb = new StringBuilder();
+        sb.append(table.getAliasExpression());
+        sb.append(table.getTableDispName());
+        if (table.hasComment()) {
+            sb.append(" // ").append(Srl.cut(table.getComment(), 10, "..."));
+        }
+        return sb.toString();
     }
 
     public String toColumnDisp(Column column) { // e.g. (Sea.Sea Name)SEA.SEA_NAME VARCHAR(100) (NotNull) 
@@ -256,6 +296,9 @@ public String toColumnDisp(Column column) { // e.g. (Sea.Sea Name)SEA.SEA_NAME V
             sb.append("(").append(column.getColumnSize()).append(")");
         }
         sb.append(" ").append(column.isNotNull() ? "(NotNull)" : "(NullAllowed)");
+        if (column.hasComment()) {
+            sb.append(" // ").append(Srl.cut(column.getComment(), 10, "..."));
+        }
         return sb.toString();
     }
 
@@ -265,7 +308,16 @@ public String toColumnDisp(Column column) { // e.g. (Sea.Sea Name)SEA.SEA_NAME V
     public boolean isNotIdentityIfPureIDPK(Table table) {
         if (table.hasPrimaryKey() && table.hasSinglePrimaryKey()) {
             final Column pk = table.getPrimaryKeyAsOne();
-            return !pk.isForeignKey() && Srl.endsWith(pk.getName(), "ID") && !pk.isIdentity();
+            return !pk.isForeignKey() && Srl.endsWithIgnoreCase(pk.getName(), "ID") && !pk.isIdentity();
+        } else {
+            return false;
+        }
+    }
+
+    public boolean isNotSequenceIfPureIDPK(Table table) {
+        if (table.hasPrimaryKey() && table.hasSinglePrimaryKey()) {
+            final Column pk = table.getPrimaryKeyAsOne();
+            return !pk.isForeignKey() && Srl.endsWithIgnoreCase(pk.getName(), "ID") && !pk.isSequence();
         } else {
             return false;
         }
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/doc/supplement/author/DfDocumentAuthorLogic.java b/dbflute-engine/src/main/java/org/dbflute/logic/doc/supplement/author/DfDocumentAuthorLogic.java
index 245487c98..7713290b5 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/doc/supplement/author/DfDocumentAuthorLogic.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/doc/supplement/author/DfDocumentAuthorLogic.java
@@ -89,7 +89,9 @@ public String getAuthor() {
 
     public OptionalThing<String> getGitBranch() {
         try {
-            return OptionalThing.of(_gitBranchSupplier.get());
+            return OptionalThing.ofNullable(_gitBranchSupplier.get(), () -> {
+                throw new IllegalStateException("Cannot get branch name.");
+            });
         } catch (IllegalStateException e) {
             return OptionalThing.ofNullable(null, () -> {
                 throw e;
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/doc/synccheck/DfSchemaSyncChecker.java b/dbflute-engine/src/main/java/org/dbflute/logic/doc/synccheck/DfSchemaSyncChecker.java
index a513b1963..0be87583b 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/doc/synccheck/DfSchemaSyncChecker.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/doc/synccheck/DfSchemaSyncChecker.java
@@ -112,7 +112,7 @@ protected DfSchemaXmlSerializer diffSchema() {
         _log.info("*    Target Schema (previous)   *");
         _log.info("*                               *");
         _log.info("* * * * * * * * * * * * * * * * *");
-        serializeTargetSchema();
+        serializeTargetSchema(); // should be before main schema, making only schemaXml
 
         _log.info("");
         _log.info("* * * * * * * * * * * * * * * * *");
@@ -120,10 +120,10 @@ protected DfSchemaXmlSerializer diffSchema() {
         _log.info("*       Main Schema (next)      *");
         _log.info("*                               *");
         _log.info("* * * * * * * * * * * * * * * * *");
-        return serializeMainSchema();
+        return serializeMainSchema(); // with diff process
     }
 
-    protected DfSchemaXmlSerializer serializeTargetSchema() {
+    protected DfSchemaXmlSerializer serializeTargetSchema() { // as previous
         final DataSource targetDs = prepareTargetDataSource();
         final DfSchemaXmlSerializer targetSerializer = createTargetSerializer(targetDs);
         targetSerializer.suppressSchemaDiff(); // same reason as main schema
@@ -131,7 +131,7 @@ protected DfSchemaXmlSerializer serializeTargetSchema() {
         return targetSerializer;
     }
 
-    protected DfSchemaXmlSerializer serializeMainSchema() {
+    protected DfSchemaXmlSerializer serializeMainSchema() { // as next
         final DfSchemaXmlSerializer mainSerializer = createMainSerializer();
         mainSerializer.suppressSchemaDiff(); // because of comparison with other schema
         mainSerializer.serialize();
@@ -177,19 +177,20 @@ protected void throwSchemaSyncCheckTragedyResultException() {
     // ===================================================================================
     //                                                                          Serializer
     //                                                                          ==========
-    protected DfSchemaXmlSerializer createTargetSerializer(DataSource targetDs) {
+    protected DfSchemaXmlSerializer createTargetSerializer(DataSource targetDs) { // as previous
         final UnifiedSchema targetSchema = getDocumentProperties().getSchemaSyncCheckDatabaseSchema();
         _log.info("schema: " + targetSchema);
-        return doCreateSerializer(new DfSchemaSource(targetDs, targetSchema));
+        final String historyFile = /*historyFile*/null; // to make only schemaXml as target (previous)
+        return doCreateSerializer(new DfSchemaSource(targetDs, targetSchema), historyFile);
     }
 
-    protected DfSchemaXmlSerializer createMainSerializer() {
+    protected DfSchemaXmlSerializer createMainSerializer() { // as next
         _log.info("schema: " + _mainSource.getSchema());
-        return doCreateSerializer(_mainSource);
+        final String historyFile = getDiffMapFile(); // needs to make for comparing with target (previous)
+        return doCreateSerializer(_mainSource, historyFile);
     }
 
-    protected DfSchemaXmlSerializer doCreateSerializer(DfSchemaSource dataSource) {
-        final String historyFile = getDiffMapFile();
+    protected DfSchemaXmlSerializer doCreateSerializer(DfSchemaSource dataSource, String historyFile) {
         final String schemaXml = getSchemaXml();
         final DfSchemaXmlSerializer serializer = DfSchemaXmlSerializer.createAsManage(dataSource, schemaXml, historyFile);
         final String craftMetaDir = getSchemaSyncCheckCraftMetaDir();
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/generate/foreignkey/DfFixedConditionDynamicAnalyzer.java b/dbflute-engine/src/main/java/org/dbflute/logic/generate/foreignkey/DfFixedConditionDynamicAnalyzer.java
new file mode 100644
index 000000000..a2775a01d
--- /dev/null
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/generate/foreignkey/DfFixedConditionDynamicAnalyzer.java
@@ -0,0 +1,277 @@
+package org.dbflute.logic.generate.foreignkey;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.torque.engine.database.model.ForeignKey;
+import org.dbflute.DfBuildProperties;
+import org.dbflute.exception.DfFixedConditionInvalidClassificationEmbeddedCommentException;
+import org.dbflute.helper.message.ExceptionMessageBuilder;
+import org.dbflute.logic.generate.language.DfLanguageDependency;
+import org.dbflute.logic.generate.language.pkgstyle.DfLanguagePropertyPackageResolver;
+import org.dbflute.properties.DfBasicProperties;
+import org.dbflute.properties.DfClassificationProperties;
+import org.dbflute.properties.assistant.classification.DfClassificationElement;
+import org.dbflute.properties.assistant.classification.DfClassificationGroup;
+import org.dbflute.properties.assistant.classification.DfClassificationTop;
+import org.dbflute.util.Srl;
+import org.dbflute.util.Srl.ScopeInfo;
+
+/**
+ * @author jflute
+ * @since 1.1.9 (2018/10/05 Friday)
+ */
+public class DfFixedConditionDynamicAnalyzer {
+
+    // ===================================================================================
+    //                                                                           Attribute
+    //                                                                           =========
+    protected final ForeignKey _foreignKey;
+    protected final String _fixedCondition;
+    protected final Map<String, String> _dynamicFixedConditionMap;
+
+    // ===================================================================================
+    //                                                                         Constructor
+    //                                                                         ===========
+    public DfFixedConditionDynamicAnalyzer(ForeignKey foreignKey, String fixedCondition, Map<String, String> dynamicFixedConditionMap) {
+        _foreignKey = foreignKey;
+        _fixedCondition = fixedCondition;
+        _dynamicFixedConditionMap = dynamicFixedConditionMap;
+    }
+
+    // ===================================================================================
+    //                                                                             Analyze
+    //                                                                             =======
+    public Map<String, String> analyzeToReplacementMap() {
+        if (!_dynamicFixedConditionMap.isEmpty()) {
+            return Collections.emptyMap(); // already initialized
+        }
+        if (_fixedCondition == null || _fixedCondition.trim().length() == 0) {
+            return Collections.emptyMap(); // no fixed condition
+        }
+        if (!_fixedCondition.contains("/*") || !_fixedCondition.contains("*/")) {
+            return Collections.emptyMap(); //  no dynamic (no bind variable) fixed condition
+        }
+        final Map<String, String> replacementMap = new LinkedHashMap<String, String>();
+        String currentString = _fixedCondition;
+        while (true) {
+            if (currentString == null || currentString.trim().length() == 0) {
+                break;
+            }
+            final int startIndex = currentString.indexOf("/*");
+            if (startIndex < 0) {
+                break;
+            }
+            final int endIndex = currentString.indexOf("*/");
+            if (endIndex < 0) {
+                break;
+            }
+            if (startIndex >= endIndex) {
+                break;
+            }
+            // e.g.
+            //  /*targetDate(Date)*/ -> targetDate(Date)
+            //  /*$cls(MemberStatus.Formalized)*/ -> $cls(MemberStatus.Formalized)
+            //  /*IF $$parameterBase$$.serviceRank != null*/
+            final String piece = currentString.substring(startIndex + "/*".length(), endIndex);
+
+            // Modify the variable 'currentString' for next loop!
+            currentString = currentString.substring(endIndex + "*/".length());
+
+            if (piece.startsWith("IF ")) { // e.g. /*IF $$parameterBase$$.serviceRank != null*/
+                resolveIfCommentDynamic(piece, replacementMap);
+            } else { // mainly here
+                final int typeStartIndex = piece.indexOf("(");
+                if (typeStartIndex < 0) {
+                    continue;
+                }
+                final int typeEndIndex = piece.indexOf(")");
+                if (typeEndIndex < 0) {
+                    continue;
+                }
+                if (typeStartIndex >= typeEndIndex) {
+                    continue;
+                }
+
+                // e.g.
+                //  /*targetDate(Date)*/ -> Date
+                //  /*$cls(MemberStatus.Formalized)*/ -> MemberStatus.Formalized
+                String parameterType = piece.substring(typeStartIndex + "(".length(), typeEndIndex);
+                if (piece.startsWith("$cls")) { // embedded classification
+                    // Not Dynamic (Embedded)
+                    // e.g. $$localAlias$$.MEMBER_STATUS_CODE = /*$cls(MemberStatus.Formalized)*/null
+                    final String code = extractEmbeddedCommentClassification(piece, parameterType);
+                    final String expression = "/*" + piece + "*/";
+
+                    // Remove test value because of hard code.
+                    replacementMap.put(expression + "null", expression);
+                    replacementMap.put(expression + "Null", expression);
+                    replacementMap.put(expression + "NULL", expression);
+
+                    replacementMap.put(expression, code);
+                } else { // dynamic binding
+                    parameterType = filterDynamicFixedConditionParameterType(parameterType);
+                    final String parameterName = piece.substring(0, typeStartIndex);
+                    _dynamicFixedConditionMap.put(parameterName, parameterType);
+                    final String parameterMapName = "parameterMap" + _foreignKey.getForeignPropertyNameInitCap();
+                    final String parameterBase = "$$locationBase$$." + parameterMapName;
+                    final String bindVariableExp = "/*" + parameterBase + "." + parameterName + "*/";
+                    replacementMap.put("/*" + piece + "*/", bindVariableExp);
+
+                    // e.g. /*IF $$parameterBase$$.serviceRank != null*/
+                    //  then piece is "IF $$parameterBase$$.serviceRank != null"
+                    final String parameterBaseKey = "$$parameterBase$$";
+                    if (!replacementMap.containsKey(parameterBaseKey)) {
+                        replacementMap.put(parameterBaseKey, parameterBase);
+                    }
+                }
+            }
+        }
+        return replacementMap;
+    }
+
+    protected String filterDynamicFixedConditionParameterType(String parameterType) {
+        final DfLanguageDependency lang = getBasicProperties().getLanguageDependency();
+        final DfLanguagePropertyPackageResolver resolver = lang.getLanguagePropertyPackageResolver();
+        return resolver.resolvePackageName(parameterType);
+    }
+
+    // ===================================================================================
+    //                                                                          IF Comment
+    //                                                                          ==========
+    protected void resolveIfCommentDynamic(String piece, Map<String, String> replacementMap) {
+        // e.g. /*IF $$parameterBase$$.serviceRank.code() == $cls(ServiceRank.Bronze)*/
+        //  then piece is "IF $$parameterBase$$.serviceRank.code() == $cls(ServiceRank.Bronze)"
+        // (code() is required for now, because cannot compare "CDef == string" in DBFlute Runtime)
+        final String operandPrefix = "== ";
+        final String clsMark = "$cls";
+        if (piece.contains(operandPrefix + clsMark) && piece.endsWith(")")) { // cannot use "&&", "||" for now
+            final ScopeInfo scopeInfo = Srl.extractScopeFirst(piece, clsMark + "(", ")");
+            if (scopeInfo != null) { // basically here, just in case
+                final String clsReplacementKey = operandPrefix + scopeInfo.getScope(); // e.g. "== $cls(ServiceRank.Bronze)"
+                if (!replacementMap.containsKey(clsReplacementKey)) {
+                    final String clsType = scopeInfo.getContent(); // ServiceRank.Bronze
+                    final String clsCode = extractEmbeddedCommentClassification(piece, clsType);
+                    replacementMap.put(clsReplacementKey, operandPrefix + clsCode);
+                }
+            }
+        }
+    }
+
+    // ===================================================================================
+    //                                                      EmbeddedComment Classification
+    //                                                      ==============================
+    protected String extractEmbeddedCommentClassification(String peace, String parameterType) {
+        // peace is e.g. $cls(MemberStatus.Formalized)
+        // parameterType is e.g. MemberStatus.Formalized
+        if (!parameterType.contains(".")) {
+            String msg = "The classification expression should be 'classificationName.elementName':";
+            msg = msg + " expression=" + parameterType + " embeddedComment=" + peace;
+            throw new DfFixedConditionInvalidClassificationEmbeddedCommentException(msg);
+        }
+        final String classificationName = parameterType.substring(0, parameterType.indexOf(".")); // e.g. MemberStatus
+        final String elementName = parameterType.substring(parameterType.indexOf(".") + ".".length()); // e.g. Formalized
+        final Map<String, DfClassificationTop> topMap = getClassificationProperties().getClassificationTopMap();
+        final DfClassificationTop classificationTop = topMap.get(classificationName);
+        if (classificationTop == null) {
+            throwFixedConditionEmbeddedCommentClassificationNotFoundException(classificationName);
+        }
+        String code = doExtractEmbeddedCommentClassificationNormalCode(classificationTop, elementName);
+        if (code != null) {
+            return code;
+        }
+        // may be group here
+        code = doExtractEmbeddedCommentClassificationGroupCode(classificationTop, elementName);
+        if (code != null) {
+            return code;
+        }
+        throwFixedConditionEmbeddedCommentClassificationElementNotFoundException(classificationTop, elementName);
+        return null; // unreachable
+    }
+
+    protected String doExtractEmbeddedCommentClassificationNormalCode(DfClassificationTop classificationTop, String elementName) {
+        final List<DfClassificationElement> elementList = classificationTop.getClassificationElementList();
+        String code = null;
+        for (final DfClassificationElement element : elementList) {
+            final String name = element.getName();
+            if (elementName.equals(name)) {
+                code = quoteClassifiationElementIfNeeds(classificationTop, element.getCode());
+                break;
+            }
+        }
+        return code;
+    }
+
+    protected String doExtractEmbeddedCommentClassificationGroupCode(DfClassificationTop classificationTop, String elementName) {
+        String code = null;
+        final List<DfClassificationGroup> groupList = classificationTop.getGroupList();
+        for (DfClassificationGroup group : groupList) {
+            final String groupName = group.getGroupName();
+            if (elementName.equals(groupName)) {
+                final List<DfClassificationElement> groupElementList = group.getElementList();
+                StringBuilder sb = new StringBuilder();
+                for (DfClassificationElement groupelement : groupElementList) {
+                    if (sb.length() > 0) {
+                        sb.append(", ");
+                    }
+                    sb.append(quoteClassifiationElementIfNeeds(classificationTop, groupelement.getCode()));
+                }
+                sb.insert(0, "(").append(")");
+                code = sb.toString();
+                break;
+            }
+        }
+        return code;
+    }
+
+    protected String quoteClassifiationElementIfNeeds(DfClassificationTop classificationTop, String code) {
+        return classificationTop.isCodeTypeNeedsQuoted() ? Srl.quoteSingle(code) : code;
+    }
+
+    protected void throwFixedConditionEmbeddedCommentClassificationNotFoundException(String classificationName) {
+        final ExceptionMessageBuilder br = new ExceptionMessageBuilder();
+        br.addNotice("Not found the classification in fixed condition.");
+        br.addItem("Foreign Key");
+        br.addElement(_foreignKey.getName());
+        br.addItem("NotFound Classification");
+        br.addElement(classificationName);
+        final String msg = br.buildExceptionMessage();
+        throw new DfFixedConditionInvalidClassificationEmbeddedCommentException(msg);
+    }
+
+    protected void throwFixedConditionEmbeddedCommentClassificationElementNotFoundException(DfClassificationTop classificationTop,
+            String elementName) {
+        final ExceptionMessageBuilder br = new ExceptionMessageBuilder();
+        br.addNotice("Not found the classification element in fixed condition.");
+        br.addItem("Foreign Key");
+        br.addElement(_foreignKey.getName());
+        br.addItem("Classification Name");
+        br.addElement(classificationTop.getClassificationName());
+        br.addItem("NotFound Element");
+        br.addElement(elementName);
+        br.addItem("Defined Element");
+        final List<DfClassificationElement> elementList = classificationTop.getClassificationElementList();
+        for (DfClassificationElement element : elementList) {
+            br.addElement(element);
+        }
+        final String msg = br.buildExceptionMessage();
+        throw new DfFixedConditionInvalidClassificationEmbeddedCommentException(msg);
+    }
+
+    // ===================================================================================
+    //                                                                          Properties
+    //                                                                          ==========
+    protected DfBuildProperties getProperties() {
+        return DfBuildProperties.getInstance();
+    }
+
+    protected DfBasicProperties getBasicProperties() {
+        return getProperties().getBasicProperties();
+    }
+
+    protected DfClassificationProperties getClassificationProperties() {
+        return getProperties().getClassificationProperties();
+    }
+}
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/generate/foreignkey/DfFixedConditionOptionChecker.java b/dbflute-engine/src/main/java/org/dbflute/logic/generate/foreignkey/DfFixedConditionOptionChecker.java
new file mode 100644
index 000000000..e962f6fff
--- /dev/null
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/generate/foreignkey/DfFixedConditionOptionChecker.java
@@ -0,0 +1,83 @@
+package org.dbflute.logic.generate.foreignkey;
+
+import java.util.Map;
+
+import org.apache.torque.engine.database.model.ForeignKey;
+import org.dbflute.cbean.chelper.HpFixedConditionQueryResolver;
+import org.dbflute.exception.DfFixedConditionOptionConstraintFailureException;
+import org.dbflute.helper.message.ExceptionMessageBuilder;
+
+/**
+ * @author jflute
+ * @since 1.1.9 (2018/10/05 Friday)
+ */
+public class DfFixedConditionOptionChecker {
+
+    // ===================================================================================
+    //                                                                           Attribute
+    //                                                                           =========
+    protected final ForeignKey _foreignKey;
+    protected final String _fixedCondition;
+    protected final Map<String, String> _dynamicFixedConditionMap;
+    protected final boolean _fixedInline;
+    protected final boolean _fixedReferrer;
+
+    // ===================================================================================
+    //                                                                         Constructor
+    //                                                                         ===========
+    public DfFixedConditionOptionChecker(ForeignKey foreignKey, String fixedCondition, Map<String, String> dynamicFixedConditionMap,
+            boolean fixedInline, boolean fixedReferrer) {
+        _foreignKey = foreignKey;
+        _fixedCondition = fixedCondition;
+        _dynamicFixedConditionMap = dynamicFixedConditionMap;
+        _fixedInline = fixedInline;
+        _fixedReferrer = fixedReferrer;
+    }
+
+    // ===================================================================================
+    //                                                                         Constraints
+    //                                                                         ===========
+    public void checkOptionConstraints() {
+        if (_fixedInline) {
+            final String localAliasMark = HpFixedConditionQueryResolver.LOCAL_ALIAS_MARK;
+            if (_fixedCondition != null && _fixedCondition.contains(localAliasMark)) {
+                String msg = "fixedInline with " + localAliasMark + " is not available.";
+                throwFixedConditionOptionConstraintFailureException(msg);
+            }
+        }
+        if (_fixedReferrer) {
+            if (_fixedInline) {
+                String msg = "fixedReferrer with fixedInline is not available.";
+                throwFixedConditionOptionConstraintFailureException(msg);
+            }
+            if (!_dynamicFixedConditionMap.isEmpty()) {
+                String msg = "fixedReferrer with bind variables is not available.";
+                throwFixedConditionOptionConstraintFailureException(msg);
+            }
+            final String foreignAliasMark = HpFixedConditionQueryResolver.FOREIGN_ALIAS_MARK;
+            if (_fixedCondition != null && _fixedCondition.contains(foreignAliasMark)) {
+                String msg = "fixedReferrer with " + foreignAliasMark + " is not available.";
+                throwFixedConditionOptionConstraintFailureException(msg);
+            }
+        }
+    }
+
+    protected void throwFixedConditionOptionConstraintFailureException(String notice) {
+        final ExceptionMessageBuilder br = new ExceptionMessageBuilder();
+        br.addNotice(notice);
+        br.addItem("DBFlute Property");
+        br.addElement("additionalForeignKeyMap.dfprop");
+        br.addItem("FK Name");
+        br.addElement(_foreignKey.getName());
+        br.addItem("fixedCondition");
+        br.addElement(_fixedCondition);
+        br.addItem("fixedSuffix");
+        br.addElement(_foreignKey.getFixedSuffix());
+        br.addItem("fixedInline");
+        br.addElement(_fixedInline);
+        br.addItem("fixedReferrer");
+        br.addElement(_fixedReferrer);
+        final String msg = br.buildExceptionMessage();
+        throw new DfFixedConditionOptionConstraintFailureException(msg);
+    }
+}
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackage.java b/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackage.java
index 331b1021b..4e44bf870 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackage.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackage.java
@@ -48,6 +48,8 @@ public interface DfLanguageClassPackage {
 
     String getConditionBeanPackage();
 
+    String getConditionQueryPackage();
+
     String getExtendedBehaviorPackage();
 
     String getExtendedDaoPackage();
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackageCSharp.java b/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackageCSharp.java
index d756001a1..ec29b62f7 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackageCSharp.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackageCSharp.java
@@ -78,6 +78,10 @@ public String getConditionBeanPackage() {
         return "CBean";
     }
 
+    public String getConditionQueryPackage() {
+        return getConditionBeanPackage() + ".Cq";
+    }
+
     public String getExtendedBehaviorPackage() {
         return "ExBhv";
     }
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackageJava.java b/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackageJava.java
index 790e2c0c8..2a39833c1 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackageJava.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackageJava.java
@@ -78,6 +78,10 @@ public String getConditionBeanPackage() {
         return "cbean";
     }
 
+    public String getConditionQueryPackage() {
+        return getConditionBeanPackage() + ".cq";
+    }
+
     public String getExtendedBehaviorPackage() {
         return "exbhv";
     }
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackagePhp.java b/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackagePhp.java
index 83888461c..af6831a97 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackagePhp.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/generate/language/pkgstyle/DfLanguageClassPackagePhp.java
@@ -76,6 +76,10 @@ public String getConditionBeanPackage() {
         return "cbean";
     }
 
+    public String getConditionQueryPackage() {
+        return getConditionBeanPackage() + ".cq";
+    }
+
     public String getExtendedBehaviorPackage() {
         return "exbhv";
     }
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/jdbc/metadata/synonym/DfSynonymExtractorOracle.java b/dbflute-engine/src/main/java/org/dbflute/logic/jdbc/metadata/synonym/DfSynonymExtractorOracle.java
index 8237a118d..c377d551a 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/jdbc/metadata/synonym/DfSynonymExtractorOracle.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/jdbc/metadata/synonym/DfSynonymExtractorOracle.java
@@ -610,7 +610,7 @@ protected Map<String, Map<Integer, String>> getDBLinkSynonymUQMap(Connection con
                 final String constraintName = rs.getString("CONSTRAINT_NAME");
                 final String columnName = rs.getString("COLUMN_NAME");
                 final Integer position = rs.getInt("POSITION");
-                Map<Integer, String> uniqueElementMap = uniqueMap.get(uniqueMap);
+                Map<Integer, String> uniqueElementMap = uniqueMap.get(constraintName);
                 if (uniqueElementMap == null) {
                     uniqueElementMap = new LinkedHashMap<Integer, String>();
                     uniqueMap.put(constraintName, uniqueElementMap);
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/jdbc/schemadiff/DfSchemaDiff.java b/dbflute-engine/src/main/java/org/dbflute/logic/jdbc/schemadiff/DfSchemaDiff.java
index 04ec2c7ad..7761b06f2 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/jdbc/schemadiff/DfSchemaDiff.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/jdbc/schemadiff/DfSchemaDiff.java
@@ -368,6 +368,10 @@ public void loadPreviousSchema() { // before loading next schema
         final DfSchemaXmlReader reader = _previousReader;
         if (!reader.exists()) {
             _firstTime = true;
+
+            // to make history of the first time @since 1.1.9
+            _previousDb = new Database(); // dummy database (has no object, can return empty)
+            _previousTableCount = 0; // fixedly no table
             return;
         }
         try {
@@ -380,11 +384,12 @@ public void loadPreviousSchema() { // before loading next schema
     }
 
     public void loadNextSchema() { // after loading previous schema
-        if (isFirstTime()) {
-            String msg = "You should not call this because of first time.";
-            throw new IllegalStateException(msg);
-        }
-        if (_previousDb == null) {
+        // to make history of the first time @since 1.1.9
+        //if (isFirstTime()) {
+        //    String msg = "You should not call this because of first time.";
+        //    throw new IllegalStateException(msg);
+        //}
+        if (_previousDb == null) { // always exists after loadPreviousSchema() even if first time
             String msg = "You should not call this because of previous not loaded.";
             throw new IllegalStateException(msg);
         }
@@ -392,6 +397,7 @@ public void loadNextSchema() { // after loading previous schema
         try {
             _nextDb = reader.read().getDatabase();
         } catch (RuntimeException e) {
+            _loadingFailure = true;
             handleReadingException(e, reader);
         }
         _diffDate = DBFluteSystem.currentDate();
@@ -688,7 +694,7 @@ protected void processDeletedTable() {
 
     /**
      * Find the table from next schema by table object. <br>
-     * This method can be used after {@link #loadNextSchema()}.
+     * This method can be used after loadNextSchema().
      *
      * @param table The object of target table that has table name. (NotNull)
      * @return The object of found table. (NullAllowed: if null, not found)
@@ -699,7 +705,7 @@ protected Table findNextTable(Table table) {
 
     /**
      * Find the table from previous schema by table object. <br>
-     * This method can be used after {@link #loadPreviousSchema()}.
+     * This method can be used after loadPreviousSchema().
      *
      * @param table The object of target table that has table name. (NotNull)
      * @return The object of found table. (NullAllowed: if null, not found)
@@ -710,7 +716,7 @@ protected Table findPreviousTable(Table table) {
 
     /**
      * Find the table from previous schema by table name. <br>
-     * This method can be used after {@link #loadPreviousSchema()}.
+     * This method can be used after loadPreviousSchema().
      *
      * @param tableDbName The DB name of target table. (NotNull)
      * @return The object of found table. (NullAllowed: if null, not found)
@@ -1552,13 +1558,15 @@ public boolean hasDiff() {
     }
 
     public boolean canReadNext() {
-        return !isFirstTime() && !isLoadingFailure();
+        // can read even if first time, to make history of first time @since 1.1.9
+        //return !isFirstTime() && !isLoadingFailure();
+        return !isLoadingFailure();
     }
 
     /**
      * Is the first time to read the schema? <br>
      * It also means previous schema info was not found. <br>
-     * This determination is set after {@link #loadPreviousSchema()}.
+     * This determination is set after loadPreviousSchema().
      *
      * @return The determination, true or false.
      */
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/replaceschema/loaddata/impl/DfXlsDataHandlerImpl.java b/dbflute-engine/src/main/java/org/dbflute/logic/replaceschema/loaddata/impl/DfXlsDataHandlerImpl.java
index 86d5a5aef..611cb09cc 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/replaceschema/loaddata/impl/DfXlsDataHandlerImpl.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/replaceschema/loaddata/impl/DfXlsDataHandlerImpl.java
@@ -386,7 +386,7 @@ protected String buildWriteFailureMessage(String dataDirectory, File file, Strin
         br.addItem("Data Directory");
         br.addElement(dataDirectory);
         br.addItem("Xls File");
-        br.addElement(file);
+        br.addElement(file.getName());
         br.addItem("Table");
         br.addElement(tableDbName);
         br.addItem("SQLException");
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/replaceschema/process/altercheck/DfAlterCheckProcess.java b/dbflute-engine/src/main/java/org/dbflute/logic/replaceschema/process/altercheck/DfAlterCheckProcess.java
index f9e0e1a52..dcaeba30d 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/replaceschema/process/altercheck/DfAlterCheckProcess.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/replaceschema/process/altercheck/DfAlterCheckProcess.java
@@ -877,7 +877,7 @@ protected DfSchemaDiff schemaDiff() {
         final DfSchemaDiff schemaDiff = DfSchemaDiff.createAsAlterCheck(previousXml, nextXml);
         schemaDiff.enableCraftDiff(getMigrationAlterCheckCraftMetaDir());
         schemaDiff.loadPreviousSchema();
-        schemaDiff.loadNextSchema();
+        schemaDiff.loadNextSchema(); // always can read here so no check
         schemaDiff.analyzeDiff();
         return schemaDiff;
     }
diff --git a/dbflute-engine/src/main/java/org/dbflute/logic/sql2entity/analyzer/DfParameterBeanResolver.java b/dbflute-engine/src/main/java/org/dbflute/logic/sql2entity/analyzer/DfParameterBeanResolver.java
index 0288a62c3..b6a78ef82 100644
--- a/dbflute-engine/src/main/java/org/dbflute/logic/sql2entity/analyzer/DfParameterBeanResolver.java
+++ b/dbflute-engine/src/main/java/org/dbflute/logic/sql2entity/analyzer/DfParameterBeanResolver.java
@@ -158,6 +158,7 @@ protected void resolveSuperClassSimplePagingBean(DfPmbMetaData pmbMetaData) {
                 || Srl.equalsIgnoreCase(superExp, "SPB")) { // an old style for compatibility before 0.9.7.5
             final String superClassName = SimplePagingBean.class.getSimpleName();
             pmbMetaData.setSuperClassName(superClassName);
+            // #hope use superExp instead of superClassName and you can use manual-paging forcedly by jflute (2018/06/12)
             if (Srl.equalsIgnoreCase(superClassName, "Paging", "SqlSkipPaging", "ManualPaging")) {
                 pmbMetaData.setPagingType(DfPagingType.MANUAL);
             } else if (Srl.equalsIgnoreCase(superClassName, "CursorSkipPaging", "AutoPaging")) {
diff --git a/dbflute-engine/src/main/java/org/dbflute/properties/DfDependencyInjectionProperties.java b/dbflute-engine/src/main/java/org/dbflute/properties/DfDependencyInjectionProperties.java
index 4ad82e992..2c044c631 100644
--- a/dbflute-engine/src/main/java/org/dbflute/properties/DfDependencyInjectionProperties.java
+++ b/dbflute-engine/src/main/java/org/dbflute/properties/DfDependencyInjectionProperties.java
@@ -265,6 +265,15 @@ protected String getDBFluteBeansRuntimeComponentPrefix() { // closet, Java Only
         return getProperty("dbfluteBeansRuntimeComponentPrefix", null);
     }
 
+    public boolean hasDBFluteBeansTransactionalDataSourcePackage() { // Java Only
+        return getDBFluteBeansTransactionalDataSourcePackage() != null;
+    }
+
+    public String getDBFluteBeansTransactionalDataSourcePackage() { // Java Only
+        // you can add needsSpringTransactionalDataSource() determination for e.g. AbstractRoutingDataSource
+        return getProperty("dbfluteBeansTransactionalDataSourcePackage", null);
+    }
+
     // ===================================================================================
     //                                                                            Lasta Di
     //                                                                            ========
diff --git a/dbflute-engine/src/main/java/org/dbflute/properties/DfDocumentProperties.java b/dbflute-engine/src/main/java/org/dbflute/properties/DfDocumentProperties.java
index 7ae954568..ec0974c3b 100644
--- a/dbflute-engine/src/main/java/org/dbflute/properties/DfDocumentProperties.java
+++ b/dbflute-engine/src/main/java/org/dbflute/properties/DfDocumentProperties.java
@@ -247,6 +247,10 @@ public String getSchemaHtmlFileName(String projectName) {
         return getProperty("schemaHtmlFileName", defaultName, getDocumentMap());
     }
 
+    public boolean isSuppressSchemaHtmlArrangeQuery() {
+        return isProperty("isSuppressSchemaHtmlArrangeQuery", false, getDocumentMap());
+    }
+
     public boolean isSuppressSchemaHtmlOutsideSql() {
         return isProperty("isSuppressSchemaHtmlOutsideSql", false, getDocumentMap());
     }
diff --git a/dbflute-engine/src/main/java/org/dbflute/properties/DfLittleAdjustmentProperties.java b/dbflute-engine/src/main/java/org/dbflute/properties/DfLittleAdjustmentProperties.java
index 5b13de804..167b1d3c8 100644
--- a/dbflute-engine/src/main/java/org/dbflute/properties/DfLittleAdjustmentProperties.java
+++ b/dbflute-engine/src/main/java/org/dbflute/properties/DfLittleAdjustmentProperties.java
@@ -1652,6 +1652,10 @@ public boolean isCompatibleUserMessagesVariableNotOrdered() { // closet
         return isProperty("isCompatibleUserMessagesVariableNotOrdered", false);
     }
 
+    public boolean isCompatibleNativeInScopePublicForcedly() { // closet
+        return isProperty("isCompatibleNativeInScopePublicForcedly", false);
+    }
+
     // -----------------------------------------------------
     //                                      Java8 Compatible
     //                                      ----------------
diff --git a/dbflute-engine/src/main/java/org/dbflute/properties/DfReplaceSchemaProperties.java b/dbflute-engine/src/main/java/org/dbflute/properties/DfReplaceSchemaProperties.java
index 4f283eeaf..f315e384d 100644
--- a/dbflute-engine/src/main/java/org/dbflute/properties/DfReplaceSchemaProperties.java
+++ b/dbflute-engine/src/main/java/org/dbflute/properties/DfReplaceSchemaProperties.java
@@ -338,11 +338,17 @@ protected Map<String, String> getFilterVariablesMap() {
 
     protected void setupDefaultFilterVariables(Map<String, String> filterVariablesMap) {
         final DfDatabaseProperties prop = getDatabaseProperties();
+        final String databaseUser = prop.getDatabaseUser();
+
+        // basic
         filterVariablesMap.put("dfprop.mainCatalog", prop.getDatabaseCatalog());
         filterVariablesMap.put("dfprop.mainSchema", prop.getDatabaseSchema().getPureSchema());
-        filterVariablesMap.put("dfprop.mainUser", prop.getDatabaseUser());
+        filterVariablesMap.put("dfprop.mainUser", databaseUser);
         filterVariablesMap.put("dfprop.mainPassword", prop.getDatabasePassword());
 
+        // special expression
+        filterVariablesMap.put("dfprop.mainUserNoAtServer", Srl.substringFirstFront(databaseUser, "@")); // for e.g. Azure
+
         try {
             // absolute path of DBFlute client
             filterVariablesMap.put("sys.basedir", new File(".").getCanonicalPath());
@@ -559,7 +565,7 @@ public boolean isAdditionalUserSkipIfNotFoundPasswordFileAndDefault(String addit
             final String password = propertyMap.get("password");
             if (Srl.is_NotNull_and_NotTrimmedEmpty(password)) {
                 final DfOutsideFileVariableInfo pwdInfo = analyzeOutsideFileVariable(password);
-                if (!pwdInfo.getDispatchFile().exists() && pwdInfo.getOutsideValue() == null) { // both not found
+                if (!pwdInfo.getDispatchFile().exists() && pwdInfo.getNofileDefaultValue() == null) { // both not found
                     result = true;
                 }
             }
diff --git a/dbflute-engine/src/main/java/org/dbflute/properties/assistant/base/dispatch/DfDispatchVariableResolver.java b/dbflute-engine/src/main/java/org/dbflute/properties/assistant/base/dispatch/DfDispatchVariableResolver.java
index 417eca3e5..aa819374d 100644
--- a/dbflute-engine/src/main/java/org/dbflute/properties/assistant/base/dispatch/DfDispatchVariableResolver.java
+++ b/dbflute-engine/src/main/java/org/dbflute/properties/assistant/base/dispatch/DfDispatchVariableResolver.java
@@ -70,7 +70,7 @@ protected void throwDispatchFileNotFoundException(String propTitle, String plain
     // ===================================================================================
     //                                                                   Password Variable
     //                                                                   =================
-    public String resolvePasswordVariable(final String propTitle, final String user, String password) {
+    public String resolvePasswordVariable(String propTitle, String user, String password) {
         final String resolved = doResolveDispatchVariable(propTitle, password, new DfDispatchVariableCallback() {
             public void throwNotFoundException(String propTitle, String plainValue, File dispatchFile) {
                 throwDatabaseUserPasswordFileNotFoundException(propTitle, user, plainValue, dispatchFile);
@@ -108,11 +108,11 @@ protected String doResolveDispatchVariable(String propTitle, String plainValue,
         if (Srl.is_Null_or_TrimmedEmpty(plainValue)) {
             return plainValue;
         }
+        // first: resolve $$env:
+        // second: resolve outside-file (contains env-resolved)
         final DfEnvironmentVariableInfo envInfo = handleEnvironmentVariable(propTitle, plainValue);
-        if (envInfo != null) {
-            return envInfo.getEnvValue();
-        }
-        return handleOutsideFileVariable(propTitle, plainValue, callback);
+        final String envResolvedValue = envInfo != null ? envInfo.getEnvValue() : plainValue;
+        return handleOutsideFileVariable(propTitle, envResolvedValue, callback);
     }
 
     // -----------------------------------------------------
@@ -121,27 +121,48 @@ protected String doResolveDispatchVariable(String propTitle, String plainValue,
     protected DfEnvironmentVariableInfo handleEnvironmentVariable(String propTitle, String plainValue) {
         final String prefix = "$$env:";
         final String suffix = "$$";
-        if (plainValue != null && plainValue.startsWith(prefix) && plainValue.endsWith(suffix)) {
-            final ScopeInfo scopeInfo = Srl.extractScopeWide(plainValue, prefix, suffix);
-            final ProcessBuilder pb = new ProcessBuilder();
-            final Map<String, String> map = pb.environment();
-            if (map != null) { // might be no way, just in case
-                final String key = scopeInfo.getContent().trim();
-                final String realValue = map.get(key);
-                if (realValue != null) {
-                    final DfEnvironmentVariableInfo info = new DfEnvironmentVariableInfo();
-                    info.setEnvName(key);
-                    info.setEnvValue(realValue);
-                    return info;
-                } else {
-                    throwNotFoundEnvironmentVariableException(propTitle, plainValue, key, map);
-                }
+        if (!existsEnvironmentVariable(propTitle, plainValue, prefix, suffix)) {
+            return null;
+        }
+        // e.g. $$env:DBFLUTE_MAIHAMADB_JDBC_URL$$
+        final Map<String, String> envMap = extractEnvironmentMap();
+        final ScopeInfo scopeInfo = Srl.extractScopeFirst(plainValue, prefix, suffix);
+        final String envKey = scopeInfo.getContent().trim(); // e.g. DBFLUTE_MAIHAMADB_JDBC_URL
+        final String envValue = envMap.get(envKey);
+        final String realValue;
+        if (envValue != null) { // switch variable to value
+            final String front = Srl.ltrim(scopeInfo.substringInterspaceToPrevious());
+            final String rear = Srl.rtrim(Srl.substringFirstFront(scopeInfo.substringInterspaceToNext(), "|"));
+            realValue = front + envValue + rear;
+        } else { // no environment
+            final String interspaceToNext = scopeInfo.substringInterspaceToNext().trim();
+            if (interspaceToNext.contains("|")) {
+                // e.g. $$env:DBFLUTE_MAIHAMADB_JDBC_URL$$ | jdbc:mysql://localhost:3306/maihamadb
+                realValue = Srl.substringFirstRear(interspaceToNext, "|").trim();
+            } else {
+                throwNotFoundEnvironmentVariableException(propTitle, plainValue, envKey, envMap);
+                return null; // unreachable
             }
         }
-        return null;
+        final DfEnvironmentVariableInfo info = new DfEnvironmentVariableInfo();
+        info.setEnvName(envKey);
+        info.setEnvValue(realValue);
+        return info;
+    }
+
+    protected boolean existsEnvironmentVariable(String propTitle, String plainValue, String prefix, String suffix) {
+        // e.g. $$env:DBFLUTE_MAIHAMADB_JDBC_URL$$
+        //   or $$env:DBFLUTE_MAIHAMADB_JDBC_URL$$ | jdbc:mysql://localhost:3306/maihamadb
+        return plainValue != null && plainValue.contains(prefix) && Srl.substringFirstRear(plainValue, prefix).contains(suffix);
+    }
+
+    protected Map<String, String> extractEnvironmentMap() {
+        final ProcessBuilder pb = new ProcessBuilder();
+        return pb.environment(); // not null (see source code)
     }
 
-    protected void throwNotFoundEnvironmentVariableException(String propTitle, String definedValue, String key, Map<String, String> map) {
+    protected void throwNotFoundEnvironmentVariableException(String propTitle, String definedValue, String envKey,
+            Map<String, String> envMap) {
         final ExceptionMessageBuilder br = new ExceptionMessageBuilder();
         br.addNotice("Not found the environment variable for the key");
         br.addItem("Property Title");
@@ -149,9 +170,9 @@ protected void throwNotFoundEnvironmentVariableException(String propTitle, Strin
         br.addItem("Defined in dfprop");
         br.addElement(definedValue);
         br.addItem("NotFound Key");
-        br.addElement(key);
+        br.addElement(envKey);
         br.addItem("Existing Variable");
-        br.addElement(map.keySet());
+        br.addElement(envMap.keySet());
         final String msg = br.buildExceptionMessage();
         throw new DfIllegalPropertySettingException(msg);
     }
@@ -165,27 +186,14 @@ protected String handleOutsideFileVariable(String propTitle, String plainValue,
             return plainValue;
         }
         final File dispatchFile = outsideFileInfo.getDispatchFile();
-        final String resolved = outsideFileInfo.getOutsideValue();
-        if (!dispatchFile.exists()) {
-            if (resolved == null) {
+        final String defaultValue = outsideFileInfo.getNofileDefaultValue(); // means default value
+        if (existsOutsideFile(dispatchFile)) {
+            return readOutsideFileFirstLine(dispatchFile, defaultValue);
+        } else {
+            if (defaultValue == null) {
                 callback.throwNotFoundException(propTitle, plainValue, dispatchFile);
             }
-            return resolved; // no dispatch file
-        }
-        BufferedReader br = null;
-        try {
-            br = new BufferedReader(new InputStreamReader(new FileInputStream(dispatchFile), "UTF-8"));
-            final String line = br.readLine();
-            return line; // first line in the dispatch file is value
-        } catch (Exception continued) {
-            _log.info("Failed to read the dispatch file: " + dispatchFile);
-            return resolved; // e.g. no password
-        } finally {
-            if (br != null) {
-                try {
-                    br.close();
-                } catch (IOException ignored) {}
-            }
+            return defaultValue; // no dispatch file
         }
     }
 
@@ -195,21 +203,43 @@ public DfOutsideFileVariableInfo analyzeOutsideFileVariable(String plainValue) {
             return null;
         }
         final String fileName;
-        final String outsideValue;
+        final String defaultValue;
         {
             final String content = Srl.substringFirstRear(plainValue, prefix);
             if (content.contains("|")) {
-                fileName = Srl.substringFirstFront(content, "|");
-                outsideValue = Srl.substringFirstRear(content, "|");
+                fileName = Srl.substringFirstFront(content, "|").trim();
+                defaultValue = Srl.substringFirstRear(content, "|").trim();
             } else {
                 fileName = content;
-                outsideValue = null;
+                defaultValue = null;
             }
         }
         final File dispatchFile = new File("./dfprop/" + fileName);
         final DfOutsideFileVariableInfo variableInfo = new DfOutsideFileVariableInfo();
         variableInfo.setDispatchFile(dispatchFile);
-        variableInfo.setOutsideValue(outsideValue);
+        variableInfo.setNofileDefaultValue(defaultValue);
         return variableInfo;
     }
+
+    protected boolean existsOutsideFile(File dispatchFile) {
+        return dispatchFile.exists();
+    }
+
+    protected String readOutsideFileFirstLine(File dispatchFile, String defaultValue) {
+        BufferedReader br = null;
+        try {
+            br = new BufferedReader(new InputStreamReader(new FileInputStream(dispatchFile), "UTF-8"));
+            final String line = br.readLine();
+            return line; // first line in the dispatch file is value
+        } catch (Exception continued) {
+            _log.info("Failed to read the dispatch file: " + dispatchFile);
+            return defaultValue; // e.g. no password
+        } finally {
+            if (br != null) {
+                try {
+                    br.close();
+                } catch (IOException ignored) {}
+            }
+        }
+    }
 }
diff --git a/dbflute-engine/src/main/java/org/dbflute/properties/assistant/base/dispatch/DfOutsideFileVariableInfo.java b/dbflute-engine/src/main/java/org/dbflute/properties/assistant/base/dispatch/DfOutsideFileVariableInfo.java
index 21fa84896..1fdc0eb78 100644
--- a/dbflute-engine/src/main/java/org/dbflute/properties/assistant/base/dispatch/DfOutsideFileVariableInfo.java
+++ b/dbflute-engine/src/main/java/org/dbflute/properties/assistant/base/dispatch/DfOutsideFileVariableInfo.java
@@ -24,7 +24,7 @@
 public class DfOutsideFileVariableInfo {
 
     protected File _dispatchFile;
-    protected String _outsideValue;
+    protected String _nofileDefaultValue;
 
     public File getDispatchFile() {
         return _dispatchFile;
@@ -34,11 +34,11 @@ public void setDispatchFile(File dispatchFile) {
         _dispatchFile = dispatchFile;
     }
 
-    public String getOutsideValue() {
-        return _outsideValue;
+    public String getNofileDefaultValue() {
+        return _nofileDefaultValue;
     }
 
-    public void setOutsideValue(String outsideValue) {
-        _outsideValue = outsideValue;
+    public void setNofileDefaultValue(String nofileDefaultValue) {
+        _nofileDefaultValue = nofileDefaultValue;
     }
 }
diff --git a/dbflute-engine/src/test/java/org/dbflute/logic/doc/policycheck/DfSchemaPolicyMiscSecretaryTest.java b/dbflute-engine/src/test/java/org/dbflute/logic/doc/policycheck/DfSchemaPolicyMiscSecretaryTest.java
deleted file mode 100644
index 5a220c587..000000000
--- a/dbflute-engine/src/test/java/org/dbflute/logic/doc/policycheck/DfSchemaPolicyMiscSecretaryTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2014-2018 the original author or authors.
- *
- * 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.dbflute.logic.doc.policycheck;
-
-import org.dbflute.logic.doc.spolicy.secretary.DfSPolicyLogicalSecretary;
-import org.dbflute.unit.EngineTestCase;
-
-/**
- * @author jflute
- * @since 1.1.2 (2016/12/31 Saturday)
- */
-public class DfSchemaPolicyMiscSecretaryTest extends EngineTestCase {
-
-    public void test_isHitExp_basic() {
-        // ## Arrange ##
-        DfSPolicyLogicalSecretary secretary = new DfSPolicyLogicalSecretary();
-
-        // ## Act ##
-        // ## Assert ##
-        assertTrue(secretary.isHitExp("SEA_MEMBER", "prefix:SEA_"));
-        assertFalse(secretary.isHitExp("SEA_MEMBER", "prefix:LAND_"));
-        assertTrue(secretary.isHitExp("SEA_MEMBER", "prefix:SEA_ and suffix:_MEMBER"));
-        assertTrue(secretary.isHitExp("SEA_MEMBER", "prefix:SEA_ or prefix:LAND_"));
-        assertTrue(secretary.isHitExp("LAND_MEMBER", "prefix:SEA_ or prefix:LAND_"));
-        assertFalse(secretary.isHitExp("PIARI_MEMBER", "prefix:SEA_ or prefix:LAND_"));
-    }
-}
diff --git a/dbflute-engine/src/test/java/org/dbflute/logic/doc/spolicy/secretary/DfSPolicyMiscSecretaryTest.java b/dbflute-engine/src/test/java/org/dbflute/logic/doc/spolicy/secretary/DfSPolicyLogicalSecretaryTest.java
similarity index 58%
rename from dbflute-engine/src/test/java/org/dbflute/logic/doc/spolicy/secretary/DfSPolicyMiscSecretaryTest.java
rename to dbflute-engine/src/test/java/org/dbflute/logic/doc/spolicy/secretary/DfSPolicyLogicalSecretaryTest.java
index 782ab9130..d7c4f80b2 100644
--- a/dbflute-engine/src/test/java/org/dbflute/logic/doc/spolicy/secretary/DfSPolicyMiscSecretaryTest.java
+++ b/dbflute-engine/src/test/java/org/dbflute/logic/doc/spolicy/secretary/DfSPolicyLogicalSecretaryTest.java
@@ -17,13 +17,57 @@
 
 import java.util.List;
 
+import org.dbflute.exception.DfSchemaPolicyCheckUnknownVariableException;
+import org.dbflute.logic.doc.spolicy.parsed.DfSPolicyStatement;
+import org.dbflute.logic.doc.spolicy.parsed.DfSPolicyStatement.DfSPolicyIfClause;
+import org.dbflute.logic.doc.spolicy.parsed.DfSPolicyStatement.DfSPolicyIfPart;
+import org.dbflute.logic.doc.spolicy.parsed.DfSPolicyStatement.DfSPolicyThenClause;
 import org.dbflute.unit.EngineTestCase;
+import org.dbflute.util.DfCollectionUtil;
 
 /**
  * @author jflute
  * @since 1.1.2 (2017/1/3 Tuesday)
  */
-public class DfSPolicyMiscSecretaryTest extends EngineTestCase {
+public class DfSPolicyLogicalSecretaryTest extends EngineTestCase {
+
+    // ===================================================================================
+    //                                                                          isHitExp()
+    //                                                                          ==========
+    public void test_isHitExp_basic() {
+        // ## Arrange ##
+        DfSPolicyLogicalSecretary secretary = new DfSPolicyLogicalSecretary();
+        DfSPolicyStatement statement = createMockStatement();
+
+        // ## Act ##
+        // ## Assert ##
+        assertTrue(secretary.isHitExp(statement, "SEA_MEMBER", "prefix:SEA_"));
+        assertFalse(secretary.isHitExp(statement, "SEA_MEMBER", "prefix:LAND_"));
+        assertTrue(secretary.isHitExp(statement, "SEA_MEMBER", "prefix:SEA_ and suffix:_MEMBER"));
+        assertTrue(secretary.isHitExp(statement, "SEA_MEMBER", "prefix:SEA_ or prefix:LAND_"));
+        assertTrue(secretary.isHitExp(statement, "LAND_MEMBER", "prefix:SEA_ or prefix:LAND_"));
+        assertFalse(secretary.isHitExp(statement, "PIARI_MEMBER", "prefix:SEA_ or prefix:LAND_"));
+        assertTrue(secretary.isHitExp(statement, "SEA_MEMBER", "$$ALL$$"));
+        try {
+            assertTrue(secretary.isHitExp(statement, "SEA_MEMBER", "$$sea$$_ID"));
+            fail();
+        } catch (DfSchemaPolicyCheckUnknownVariableException e) {
+            log(e.getMessage());
+        }
+        try {
+            assertTrue(secretary.isHitExp(statement, "SEA_MEMBER", "sea-mystic$$land-oneman$$piari-plaza"));
+            fail();
+        } catch (DfSchemaPolicyCheckUnknownVariableException e) {
+            log(e.getMessage());
+        }
+    }
+
+    protected DfSPolicyStatement createMockStatement() {
+        List<DfSPolicyIfPart> ifPartList = newArrayList(new DfSPolicyIfPart("columnName", "$$ALL$$", false));
+        DfSPolicyIfClause ifClause = new DfSPolicyIfClause(ifPartList, false);
+        DfSPolicyThenClause thenClause = new DfSPolicyThenClause("bad", false, DfCollectionUtil.emptyList(), false, null);
+        return new DfSPolicyStatement("if columnName is $$ALL$$ then bad", ifClause, thenClause);
+    }
 
     // ===================================================================================
     //                                                            splitClauseByConnector()
diff --git a/dbflute-engine/src/test/java/org/dbflute/properties/assistant/base/dispatch/DfDispatchVariableResolverTest.java b/dbflute-engine/src/test/java/org/dbflute/properties/assistant/base/dispatch/DfDispatchVariableResolverTest.java
new file mode 100644
index 000000000..02bfaff11
--- /dev/null
+++ b/dbflute-engine/src/test/java/org/dbflute/properties/assistant/base/dispatch/DfDispatchVariableResolverTest.java
@@ -0,0 +1,175 @@
+package org.dbflute.properties.assistant.base.dispatch;
+
+import java.io.File;
+import java.util.Map;
+
+import org.dbflute.exception.DfIllegalPropertySettingException;
+import org.dbflute.unit.EngineTestCase;
+import org.dbflute.util.DfCollectionUtil;
+
+/**
+ * @author jflute
+ */
+public class DfDispatchVariableResolverTest extends EngineTestCase {
+
+    // ===================================================================================
+    //                                                           resolveDispatchVariable()
+    //                                                           =========================
+    public void test_resolveDispatchVariable_default_basic() {
+        // ## Arrange ##
+        DfDispatchVariableResolver resolver = createBasicResolver();
+
+        // ## Act ##
+        // ## Assert ##
+        assertEquals("sea", resolver.resolveDispatchVariable("url", "$$env:DBFLUTE_UT_TMP$$ | sea"));
+        assertEquals("land", resolver.resolveDispatchVariable("url", "$$env:DBFLUTE_UT_TMP$$ | df:dfprop/sea.dfprop | land"));
+        assertException(IllegalStateException.class, () -> {
+            resolver.resolveDispatchVariable("url", "$$env:DBFLUTE_UT_TMP$$ | df:dfprop/sea.dfprop");
+        });
+    }
+
+    public void test_resolveDispatchVariable_default_part() {
+        // ## Arrange ##
+        DfDispatchVariableResolver resolver = createBasicResolver();
+
+        // ## Act ##
+        // ## Assert ##
+        assertEquals("sea", resolver.resolveDispatchVariable("url", "mystic$$env:DBFLUTE_UT_TMP$$oneman | sea"));
+        assertEquals("land", resolver.resolveDispatchVariable("url", "mytic$$env:DBFLUTE_UT_TMP$$oneman | df:dfprop/sea.dfprop | land"));
+        assertException(IllegalStateException.class, () -> {
+            resolver.resolveDispatchVariable("url", "mystic$$env:DBFLUTE_UT_TMP$$over | df:dfprop/sea.dfprop");
+        });
+    }
+
+    public void test_resolveDispatchVariable_env_basic() {
+        // ## Arrange ##
+        DfDispatchVariableResolver resolver = createEnvResolver("maihama");
+
+        // ## Act ##
+        // ## Assert ##
+        assertEquals("maihama", resolver.resolveDispatchVariable("url", "$$env:DBFLUTE_UT_TMP$$ | sea"));
+        assertEquals("maihama", resolver.resolveDispatchVariable("url", "$$env:DBFLUTE_UT_TMP$$ | df:dfprop/sea.dfprop | land"));
+        assertEquals("maihama", resolver.resolveDispatchVariable("url", "$$env:DBFLUTE_UT_TMP$$ | df:dfprop/sea.dfprop"));
+    }
+
+    public void test_resolveDispatchVariable_env_part() {
+        // ## Arrange ##
+        DfDispatchVariableResolver resolver = createEnvResolver("maihama");
+
+        // ## Act ##
+        // ## Assert ##
+        assertEquals("mysticmaihamaoneman", resolver.resolveDispatchVariable("url", "mystic$$env:DBFLUTE_UT_TMP$$oneman | sea"));
+        assertEquals("mystic maihama oneman", resolver.resolveDispatchVariable("url", "mystic $$env:DBFLUTE_UT_TMP$$ oneman | sea"));
+        assertEquals("mysticmaihamaoneman",
+                resolver.resolveDispatchVariable("url", "mystic$$env:DBFLUTE_UT_TMP$$oneman | df:dfprop/sea.dfprop | land"));
+        assertEquals("mysticmaihamaoneman",
+                resolver.resolveDispatchVariable("url", "mystic$$env:DBFLUTE_UT_TMP$$oneman | df:dfprop/sea.dfprop"));
+    }
+
+    public void test_resolveDispatchVariable_outsideFile() {
+        // ## Arrange ##
+        DfDispatchVariableResolver resolver = new DfDispatchVariableResolver() {
+            @Override
+            protected boolean existsOutsideFile(File dispatchFile) {
+                return true;
+            }
+
+            @Override
+            protected String readOutsideFileFirstLine(File dispatchFile, String defaultValue) {
+                return "land";
+            }
+        };
+
+        // ## Act ##
+        // ## Assert ##
+        assertEquals("land", resolver.resolveDispatchVariable("url", "df:dfprop/sea.dfprop"));
+        assertEquals("land", resolver.resolveDispatchVariable("url", "$$env:DBFLUTE_UT_TMP$$ | df:dfprop/sea.dfprop"));
+    }
+
+    // ===================================================================================
+    //                                                         handleEnvironmentVariable()
+    //                                                         ===========================
+    public void test_handleEnvironmentVariable_basic() {
+        // ## Arrange ##
+        DfDispatchVariableResolver resolver = createBasicResolver();
+
+        // ## Act ##
+        // ## Assert ##
+        assertNull(resolver.handleEnvironmentVariable("url", "jdbc:mysql://localhost:3306/maihamadb"));
+    }
+
+    public void test_handleEnvironmentVariable_env_basic() {
+        // ## Arrange ##
+        DfDispatchVariableResolver resolver = createEnvResolver("sea");
+
+        // ## Act ##
+        DfEnvironmentVariableInfo info = resolver.handleEnvironmentVariable("url", "$$env:DBFLUTE_UT_TMP$$");
+
+        // ## Assert ##
+        assertEquals("sea", info.getEnvValue());
+    }
+
+    public void test_handleEnvironmentVariable_env_default() {
+        // ## Arrange ##
+        DfDispatchVariableResolver resolver = createBasicResolver();
+
+        // ## Act ##
+        DfEnvironmentVariableInfo info = resolver.handleEnvironmentVariable("url", "$$env:DBFLUTE_UT_TMP$$ | sea");
+
+        // ## Assert ##
+        assertEquals("sea", info.getEnvValue());
+    }
+
+    public void test_handleEnvironmentVariable_env_notFound() {
+        // ## Arrange ##
+        DfDispatchVariableResolver resolver = createBasicResolver();
+
+        // ## Act ##
+        // ## Assert ##
+        assertException(DfIllegalPropertySettingException.class, () -> resolver.handleEnvironmentVariable("url", "$$env:DBFLUTE_UT_TMP$$"));
+    }
+
+    public void test_handleEnvironmentVariable_env_part() {
+        // ## Arrange ##
+        DfDispatchVariableResolver resolver = new DfDispatchVariableResolver() {
+            @Override
+            protected Map<String, String> extractEnvironmentMap() {
+                return DfCollectionUtil.newHashMap("DBFLUTE_UT_TMP", "sea");
+            }
+        };
+
+        // ## Act ##
+        DfEnvironmentVariableInfo info = resolver.handleEnvironmentVariable("url", "mystic$$env:DBFLUTE_UT_TMP$$oneman");
+
+        // ## Assert ##
+        assertEquals("mysticseaoneman", info.getEnvValue());
+    }
+
+    public void test_handleEnvironmentVariable_env_with_outsideFile_default() {
+        // ## Arrange ##
+        DfDispatchVariableResolver resolver = createBasicResolver();
+
+        // ## Act ##
+        String plainValue = "$$env:DBFLUTE_UT_TMP$$ | df:dfprop/sea.dfprop | land";
+        DfEnvironmentVariableInfo info = resolver.handleEnvironmentVariable("url", plainValue);
+
+        // ## Assert ##
+        assertEquals("df:dfprop/sea.dfprop | land", info.getEnvValue());
+    }
+
+    // ===================================================================================
+    //                                                                        Assist Logic
+    //                                                                        ============
+    private DfDispatchVariableResolver createBasicResolver() {
+        return new DfDispatchVariableResolver();
+    }
+
+    private DfDispatchVariableResolver createEnvResolver(String envValue) {
+        return new DfDispatchVariableResolver() {
+            @Override
+            protected Map<String, String> extractEnvironmentMap() {
+                return DfCollectionUtil.newHashMap("DBFLUTE_UT_TMP", envValue);
+            }
+        };
+    }
+}
diff --git a/dbflute-engine/src/test/java/org/dbflute/theme/DfMigrationFromAntTest.java b/dbflute-engine/src/test/java/org/dbflute/theme/DfMigrationFromAntTest.java
new file mode 100644
index 000000000..3c7eb4e85
--- /dev/null
+++ b/dbflute-engine/src/test/java/org/dbflute/theme/DfMigrationFromAntTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2014-2018 the original author or authors.
+ *
+ * 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.dbflute.theme;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+
+import org.apache.tools.ant.util.FileUtils;
+import org.dbflute.helper.filesystem.FileTextIO;
+import org.dbflute.unit.EngineTestCase;
+
+/**
+ * @author jflute
+ */
+public class DfMigrationFromAntTest extends EngineTestCase {
+
+    // ===================================================================================
+    //                                                                           FileUtils
+    //                                                                           =========
+    public void test_FileUtils_to_Path() throws IOException {
+        // ## Arrange ##
+        String dirPath = getTestCaseBuildDir().getCanonicalPath() + "/fromant";
+        File testDir = new File(dirPath);
+        if (testDir.exists()) {
+            testDir.delete();
+        }
+        testDir.mkdir();
+        File srcFile = new File(dirPath + "/fromant-src.txt");
+        File destByAntFile = new File(dirPath + "/fromant-desc-by-ant.txt");
+        File destByNioFile = new File(dirPath + "/fromant-desc-by-nio.txt");
+        String writtenText = "sea in \u821e\u6d5c"; // sea in maihama(as kanji)
+        FileTextIO textIO = new FileTextIO().encodeAsUTF8();
+        textIO.write(new FileOutputStream(srcFile), writtenText);
+        assertTrue(srcFile.exists());
+        try {
+            // ## Act ##
+            FileUtils.getFileUtils().copyFile(srcFile, destByAntFile); // AlterCheck uses
+            Files.copy(srcFile.toPath(), destByNioFile.toPath(), StandardCopyOption.COPY_ATTRIBUTES);
+
+            // ## Assert ##
+            assertTrue(destByAntFile.exists());
+            assertTrue(destByNioFile.exists());
+            String byAntText = textIO.read(new FileInputStream(destByAntFile));
+            String byNioText = textIO.read(new FileInputStream(destByNioFile));
+            assertEquals(byAntText, byNioText);
+        } finally {
+            if (srcFile.exists()) {
+                srcFile.delete();
+            }
+            if (destByAntFile.exists()) {
+                destByAntFile.delete();
+            }
+            if (destByNioFile.exists()) {
+                destByNioFile.delete();
+            }
+        }
+    }
+}
diff --git a/dbflute-engine/src/test/java/org/dbflute/unit/EngineTestCase.java b/dbflute-engine/src/test/java/org/dbflute/unit/EngineTestCase.java
index c4df9c0f2..b12378600 100644
--- a/dbflute-engine/src/test/java/org/dbflute/unit/EngineTestCase.java
+++ b/dbflute-engine/src/test/java/org/dbflute/unit/EngineTestCase.java
@@ -461,6 +461,112 @@ protected void assertHasZeroElement(Collection<?> emptyList) {
         }
     }
 
+    // -----------------------------------------------------
+    //                                             Exception
+    //                                             ---------
+    /**
+     * Assert that the callback throws the exception.
+     * <pre>
+     * String <span style="color: #553000">str</span> = <span style="color: #70226C">null</span>;
+     * <span style="color: #CC4747">assertException</span>(NullPointerException.<span style="color: #70226C">class</span>, () <span style="color: #90226C; font-weight: bold"><span style="font-size: 120%">-</span>&gt;</span> <span style="color: #553000">str</span>.toString());
+     * 
+     * <span style="color: #CC4747">assertException</span>(NullPointerException.<span style="color: #70226C">class</span>, () <span style="color: #90226C; font-weight: bold"><span style="font-size: 120%">-</span>&gt;</span> <span style="color: #553000">str</span>.toString()).<span style="color: #994747">handle</span>(<span style="color: #553000">cause</span> <span style="color: #90226C; font-weight: bold"><span style="font-size: 120%">-</span>&gt;</span> {
+     *     assertContains(<span style="color: #553000">cause</span>.getMessage(), ...);
+     * });
+     * </pre>
+     * @param <CAUSE> The type of expected cause exception. 
+     * @param exceptionType The expected exception type. (NotNull)
+     * @param noArgInLambda The callback for calling methods that should throw the exception. (NotNull)
+     * @return The after object that has handler of expected cause for chain call. (NotNull) 
+     */
+    protected <CAUSE extends Throwable> ExceptionExpectationAfter<CAUSE> assertException(Class<CAUSE> exceptionType,
+            ExceptionExaminer noArgInLambda) {
+        assertNotNull(exceptionType);
+        final String expected = exceptionType.getSimpleName();
+        Throwable cause = null;
+        try {
+            noArgInLambda.examine();
+        } catch (Throwable e) {
+            cause = e;
+            final Class<? extends Throwable> causeClass = cause.getClass();
+            final String exp = buildExceptionSimpleExp(cause);
+            if (!exceptionType.isAssignableFrom(causeClass)) {
+                final String actual = causeClass.getSimpleName();
+                log("*Different exception, expected: {} but...", exceptionType.getName(), cause);
+                fail("*Different exception, expected: " + expected + " but: " + actual + " => " + exp);
+            } else {
+                log("expected: " + exp);
+            }
+        }
+        if (cause == null) {
+            fail("*No exception, expected: " + expected);
+        }
+        @SuppressWarnings("unchecked")
+        final CAUSE castCause = (CAUSE) cause;
+        return new ExceptionExpectationAfter<CAUSE>(castCause);
+    }
+
+    private String buildExceptionSimpleExp(Throwable cause) {
+        final StringBuilder sb = new StringBuilder();
+        final String firstMsg = cause.getMessage();
+        boolean line = firstMsg != null && firstMsg.contains(ln());
+        sb.append("(").append(cause.getClass().getSimpleName()).append(")").append(firstMsg);
+        final Throwable secondCause = cause.getCause();
+        if (secondCause != null) {
+            final String secondMsg = secondCause.getMessage();
+            line = line || secondMsg != null && secondMsg.contains(ln());
+            sb.append(line ? ln() : " / ");
+            sb.append("(").append(secondCause.getClass().getSimpleName()).append(")").append(secondMsg);
+            final Throwable thirdCause = secondCause.getCause();
+            if (thirdCause != null) {
+                final String thirdMsg = thirdCause.getMessage();
+                line = line || thirdMsg != null && thirdMsg.contains(ln());
+                sb.append(line ? ln() : " / ");
+                sb.append("(").append(thirdCause.getClass().getSimpleName()).append(")").append(thirdMsg);
+            }
+        }
+        final String whole = sb.toString();
+        return (whole.contains(ln()) ? ln() : "") + whole;
+    }
+
+    @FunctionalInterface
+    public interface ExceptionExaminer {
+
+        /**
+         * Examine the process, should throw the specified exception.
+         */
+        void examine();
+    }
+
+    public class ExceptionExpectationAfter<CAUSE extends Throwable> {
+
+        protected final CAUSE cause; // not null
+
+        /**
+         * @param cause The expected cause. (NotNull)
+         */
+        public ExceptionExpectationAfter(CAUSE cause) {
+            this.cause = cause;
+        }
+
+        /**
+         * Handle the expected cause to assert.
+         * @param oneArgLambda The callback for handling of expected cause. (NotNull)
+         */
+        public void handle(ExceptionExpectationCall<CAUSE> oneArgLambda) {
+            oneArgLambda.callback(cause);
+        }
+    }
+
+    @FunctionalInterface
+    public interface ExceptionExpectationCall<CAUSE extends Throwable> {
+
+        /**
+         * @param cause The expected cause. (NotNull)
+         */
+        void callback(CAUSE cause);
+    }
+
     // -----------------------------------------------------
     //                                             Mark Here
     //                                             ---------
diff --git a/dbflute-runtime/.classpath b/dbflute-runtime/.classpath
index dadbda265..8ccb02bd2 100644
--- a/dbflute-runtime/.classpath
+++ b/dbflute-runtime/.classpath
@@ -2,8 +2,16 @@
 <classpath>
 	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
 	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
diff --git a/dbflute-runtime/.project b/dbflute-runtime/.project
index d06fc71b1..ba2939672 100644
--- a/dbflute-runtime/.project
+++ b/dbflute-runtime/.project
@@ -15,21 +15,9 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.devzuz.q.maven.jdt.core.mavenIncrementalBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.devzuz.q.maven.jdt.core.mavenNature</nature>
 	</natures>
 </projectDescription>
diff --git a/dbflute-runtime/.settings/org.eclipse.jdt.ui.prefs b/dbflute-runtime/.settings/org.eclipse.jdt.ui.prefs
index 382d5ed45..395a47175 100644
--- a/dbflute-runtime/.settings/org.eclipse.jdt.ui.prefs
+++ b/dbflute-runtime/.settings/org.eclipse.jdt.ui.prefs
@@ -1,3 +1,119 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=false
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false
+cleanup.qualify_static_member_accesses_with_declaring_class=false
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=false
+cleanup.remove_trailing_whitespaces=false
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=false
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=false
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_DBFluteCore CleanUp
+cleanup_settings_version=2
 eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false
 formatter_profile=_DBFlute Style
 formatter_settings_version=12
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/dbflute-runtime/pom.xml b/dbflute-runtime/pom.xml
index d24e3cd7c..894d32d6e 100644
--- a/dbflute-runtime/pom.xml
+++ b/dbflute-runtime/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.dbflute</groupId>
 	<artifactId>dbflute-runtime</artifactId>
-	<version>1.1.8</version>
+	<version>1.1.9</version>
 	<packaging>jar</packaging>
 
 	<name>DBFlute Runtime</name>
diff --git a/dbflute-runtime/src/main/java/org/dbflute/helper/process/ProcessConsoleReader.java b/dbflute-runtime/src/main/java/org/dbflute/helper/process/ProcessConsoleReader.java
index 14e22441f..1c898ca10 100644
--- a/dbflute-runtime/src/main/java/org/dbflute/helper/process/ProcessConsoleReader.java
+++ b/dbflute-runtime/src/main/java/org/dbflute/helper/process/ProcessConsoleReader.java
@@ -20,26 +20,30 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
+import java.util.function.Consumer;
 
 /**
  * @author jflute
  * @since 0.9.8.3 (2011/05/03 Tuesday)
  */
-public class ProcessConsoleReader extends Thread {
+public class ProcessConsoleReader extends Thread { // basically memorable code...
 
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    protected final BufferedReader _reader;
-    protected final StringBuilder _consoleSb = new StringBuilder();
+    protected final BufferedReader _reader; // not null
+    protected final Consumer<String> _liner; // null allowed
+    protected final StringBuilder _consoleSb = new StringBuilder(); // not null
 
     // ===================================================================================
     //                                                                         Constructor
     //                                                                         ===========
-    public ProcessConsoleReader(InputStream ins, String encoding) {
-        encoding = encoding != null ? encoding : "UTF-8";
+    public ProcessConsoleReader(InputStream ins, String encoding, Consumer<String> liner) {
+        assertObjectNotNull("ins", ins);
+        assertStringNotNullAndNotTrimmedEmpty("encoding", encoding);
         try {
             _reader = new BufferedReader(new InputStreamReader(ins, encoding));
+            _liner = liner;
         } catch (UnsupportedEncodingException e) {
             String msg = "Failed to create a reader by the encoding: " + encoding;
             throw new IllegalStateException(msg);
@@ -50,6 +54,12 @@ public ProcessConsoleReader(InputStream ins, String encoding) {
     //                                                                                Read
     //                                                                                ====
     public String read() {
+        try {
+            join(); // needs to use non-thread-safe StringBuilder
+        } catch (InterruptedException e) {
+            String msg = "The join() was interrupted.";
+            throw new IllegalStateException(msg, e);
+        }
         return _consoleSb.toString();
     }
 
@@ -65,10 +75,7 @@ public void run() {
                 if (line == null) {
                     break;
                 }
-                if (sb.length() > 0) {
-                    sb.append("\n");
-                }
-                sb.append(line);
+                handleLine(sb, line);
             }
         } catch (IOException e) {
             String msg = "Failed to read the stream: " + _reader;
@@ -79,4 +86,44 @@ public void run() {
             } catch (IOException ignored) {}
         }
     }
+
+    protected void handleLine(StringBuilder sb, String line) {
+        if (_liner != null) {
+            _liner.accept(line);
+        }
+        if (sb.length() > 0) {
+            sb.append("\n");
+        }
+        sb.append(line);
+    }
+
+    // ===================================================================================
+    //                                                                       Assert Helper
+    //                                                                       =============
+    // -----------------------------------------------------
+    //                                         Assert Object
+    //                                         -------------
+    protected void assertObjectNotNull(String variableName, Object value) {
+        if (variableName == null) {
+            String msg = "The value should not be null: variableName=null value=" + value;
+            throw new IllegalArgumentException(msg);
+        }
+        if (value == null) {
+            String msg = "The value should not be null: variableName=" + variableName;
+            throw new IllegalArgumentException(msg);
+        }
+    }
+
+    // -----------------------------------------------------
+    //                                         Assert String
+    //                                         -------------
+    protected void assertStringNotNullAndNotTrimmedEmpty(String variableName, String value) {
+        assertObjectNotNull("variableName", variableName);
+        assertObjectNotNull(variableName, value);
+        if (value.trim().length() == 0) {
+            String msg = "The value should not be empty: variableName=" + variableName + " value=" + value;
+            throw new IllegalArgumentException(msg);
+        }
+    }
+
 }
diff --git a/dbflute-runtime/src/main/java/org/dbflute/helper/process/ProcessResult.java b/dbflute-runtime/src/main/java/org/dbflute/helper/process/ProcessResult.java
index 0b90bd71f..f06294043 100644
--- a/dbflute-runtime/src/main/java/org/dbflute/helper/process/ProcessResult.java
+++ b/dbflute-runtime/src/main/java/org/dbflute/helper/process/ProcessResult.java
@@ -21,12 +21,14 @@
  */
 public class ProcessResult {
 
-    protected final String _processName;
-    protected String _console;
-    protected int _exitCode;
+    protected final String _processName; // not null
+    protected final String _console; // not null, empty allowed
+    protected final int _exitCode;
 
-    public ProcessResult(String processName) {
+    public ProcessResult(String processName, String console, int exitCode) {
         _processName = processName;
+        _console = console;
+        _exitCode = exitCode;
     }
 
     public String getProcessName() {
@@ -37,15 +39,7 @@ public String getConsole() {
         return _console;
     }
 
-    public void setConsole(String console) {
-        this._console = console;
-    }
-
     public int getExitCode() {
         return _exitCode;
     }
-
-    public void setExitCode(int exitCode) {
-        this._exitCode = exitCode;
-    }
 }
diff --git a/dbflute-runtime/src/main/java/org/dbflute/helper/process/SystemScript.java b/dbflute-runtime/src/main/java/org/dbflute/helper/process/SystemScript.java
index 1e1769dea..d2793e3b9 100644
--- a/dbflute-runtime/src/main/java/org/dbflute/helper/process/SystemScript.java
+++ b/dbflute-runtime/src/main/java/org/dbflute/helper/process/SystemScript.java
@@ -20,8 +20,10 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 import org.dbflute.helper.process.exception.SystemScriptFailureException;
 import org.dbflute.helper.process.exception.SystemScriptUnsupportedScriptException;
@@ -31,7 +33,7 @@
  * @author jflute
  * @since 0.9.8.3 (2011/05/03 Tuesday)
  */
-public class SystemScript {
+public class SystemScript { // basically memorable code...
 
     // ===================================================================================
     //                                                                          Definition
@@ -53,13 +55,40 @@ public static List<String> getSupportedExtList() {
     //                                                                           Attribute
     //                                                                           =========
     protected String _consoleEncoding;
+    protected Consumer<String> _consoleLiner;
     protected Map<String, String> _environmentMap;
 
+    // ===================================================================================
+    //                                                                              Option
+    //                                                                              ======
+    public SystemScript consoleEncoding(String encoding) {
+        assertStringNotNullAndNotTrimmedEmpty("encoding", encoding);
+        _consoleEncoding = encoding;
+        return this;
+    }
+
+    public SystemScript consoleLiner(Consumer<String> liner) {
+        assertObjectNotNull("liner", liner);
+        _consoleLiner = liner;
+        return this;
+    }
+
+    public SystemScript env(String key, String value) {
+        assertStringNotNullAndNotTrimmedEmpty("key", key);
+        assertObjectNotNull("value", value); // empty allowed: possible? e.g. "SEA="
+        if (_environmentMap == null) {
+            _environmentMap = new LinkedHashMap<String, String>();
+        }
+        _environmentMap.put(key, value);
+        return this;
+    }
+
     // ===================================================================================
     //                                                                      Execute Script
     //                                                                      ==============
     public ProcessResult execute(File baseDir, String scriptName, String... args) {
-        final ProcessResult result = new ProcessResult(scriptName);
+        assertObjectNotNull("baseDir", baseDir);
+        assertStringNotNullAndNotTrimmedEmpty("scriptName", scriptName);
         final List<String> cmdList = prepareCommandList(scriptName, args);
         if (cmdList.isEmpty()) {
             String msg = "Unsupported script: " + scriptName;
@@ -67,7 +96,7 @@ public ProcessResult execute(File baseDir, String scriptName, String... args) {
         }
         final ProcessBuilder builder = prepareProcessBuilder(baseDir, cmdList);
         final Process process = startProcess(scriptName, builder);
-        return handleProcessResult(scriptName, result, process);
+        return handleProcessResult(scriptName, process);
     }
 
     protected List<String> prepareCommandList(String scriptName, String... args) {
@@ -124,29 +153,58 @@ protected Process startProcess(String scriptName, final ProcessBuilder builder)
         return process;
     }
 
-    protected ProcessConsoleReader createProcessConsoleReader(InputStream stdin, final String encoding) {
-        return new ProcessConsoleReader(stdin, encoding);
-    }
-
-    protected ProcessResult handleProcessResult(String scriptName, final ProcessResult result, final Process process) {
-        InputStream stdin = null;
+    protected ProcessResult handleProcessResult(String scriptName, final Process process) {
+        InputStream stdin = null; // closed in reader
         try {
             stdin = process.getInputStream();
-            final String encoding = _consoleEncoding != null ? _consoleEncoding : "UTF-8";
-            final ProcessConsoleReader reader = createProcessConsoleReader(stdin, encoding);
+            final ProcessConsoleReader reader = createProcessConsoleReader(stdin);
             reader.start();
             final int exitCode = process.waitFor();
-            reader.join();
             final String console = reader.read();
-            result.setConsole(console);
-            result.setExitCode(exitCode);
-            return result;
+            return new ProcessResult(scriptName, console, exitCode);
         } catch (InterruptedException e) {
             String msg = "The execution was interrupted: " + scriptName;
             throw new SystemScriptFailureException(msg, e);
         }
     }
 
+    protected ProcessConsoleReader createProcessConsoleReader(InputStream stdin) {
+        return newProcessConsoleReader(stdin, _consoleEncoding != null ? _consoleEncoding : "UTF-8", _consoleLiner);
+    }
+
+    protected ProcessConsoleReader newProcessConsoleReader(InputStream stdin, String encoding, Consumer<String> liner) {
+        return new ProcessConsoleReader(stdin, encoding, liner);
+    }
+
+    // ===================================================================================
+    //                                                                       Assert Helper
+    //                                                                       =============
+    // -----------------------------------------------------
+    //                                         Assert Object
+    //                                         -------------
+    protected void assertObjectNotNull(String variableName, Object value) {
+        if (variableName == null) {
+            String msg = "The value should not be null: variableName=null value=" + value;
+            throw new IllegalArgumentException(msg);
+        }
+        if (value == null) {
+            String msg = "The value should not be null: variableName=" + variableName;
+            throw new IllegalArgumentException(msg);
+        }
+    }
+
+    // -----------------------------------------------------
+    //                                         Assert String
+    //                                         -------------
+    protected void assertStringNotNullAndNotTrimmedEmpty(String variableName, String value) {
+        assertObjectNotNull("variableName", variableName);
+        assertObjectNotNull(variableName, value);
+        if (value.trim().length() == 0) {
+            String msg = "The value should not be empty: variableName=" + variableName + " value=" + value;
+            throw new IllegalArgumentException(msg);
+        }
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
@@ -154,7 +212,8 @@ public String getConsoleEncoding() {
         return _consoleEncoding;
     }
 
-    public void setConsoleEncoding(String consoleEncoding) {
+    @Deprecated
+    public void setConsoleEncoding(String consoleEncoding) { // old style
         this._consoleEncoding = consoleEncoding;
     }
 
@@ -162,7 +221,8 @@ public Map<String, String> getEnvironmentMap() {
         return _environmentMap;
     }
 
-    public void setEnvironmentMap(Map<String, String> environmentMap) {
+    @Deprecated
+    public void setEnvironmentMap(Map<String, String> environmentMap) { // old style
         this._environmentMap = environmentMap;
     }
 }