You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2020/03/27 18:55:56 UTC

[incubator-nlpcraft] branch master updated: WIP (javadoc + license file).

This is an automated email from the ASF dual-hosted git repository.

aradzinski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git


The following commit(s) were added to refs/heads/master by this push:
     new 5a81b15  WIP (javadoc + license file).
5a81b15 is described below

commit 5a81b15592dfc4869c23fcbcf1a0dcd23dbf9acf
Author: Aaron Radzinzski <ar...@datalingvo.com>
AuthorDate: Fri Mar 27 11:55:52 2020 -0700

    WIP (javadoc + license file).
---
 LICENSE                                            | 202 ++++++++++
 .../model/tools/sqlgen/NCSqlAggregate.html         | 239 ------------
 .../model/tools/sqlgen/NCSqlExtractor.html}        | 166 ++++++--
 ...qlException.html => NCSqlExtractorBuilder.html} | 135 ++++---
 .../nlpcraft/model/tools/sqlgen/NCSqlFunction.html | 239 ------------
 .../model/tools/sqlgen/NCSqlInCondition.html       | 238 ------------
 .../nlpcraft/model/tools/sqlgen/NCSqlJoinType.html | 384 +++++++++++++++++++
 .../nlpcraft/model/tools/sqlgen/NCSqlQuery.html    | 239 ------------
 .../model/tools/sqlgen/NCSqlSimpleCondition.html   | 251 ------------
 .../nlpcraft/model/tools/sqlgen/NCSqlUtils.html    | 422 ---------------------
 .../tools/sqlgen/class-use/NCSqlCondition.html     | 175 ---------
 .../tools/sqlgen/class-use/NCSqlException.html     | 129 -------
 .../{NCSqlAggregate.html => NCSqlExtractor.html}   |  38 +-
 .../sqlgen/class-use/NCSqlExtractorBuilder.html}   |  24 +-
 .../tools/sqlgen/class-use/NCSqlInCondition.html   | 172 ---------
 .../{NCSqlFunction.html => NCSqlJoinType.html}     |  47 ++-
 .../model/tools/sqlgen/class-use/NCSqlQuery.html   | 129 -------
 .../sqlgen/class-use/NCSqlSimpleCondition.html     | 179 ---------
 .../model/tools/sqlgen/class-use/NCSqlUtils.html   | 129 -------
 .../model/tools/sqlgen/NCSqlAggregate.html         | 239 ------------
 .../model/tools/sqlgen/NCSqlExtractor.html}        | 166 ++++++--
 ...qlException.html => NCSqlExtractorBuilder.html} | 135 ++++---
 .../nlpcraft/model/tools/sqlgen/NCSqlFunction.html | 239 ------------
 .../model/tools/sqlgen/NCSqlInCondition.html       | 238 ------------
 .../nlpcraft/model/tools/sqlgen/NCSqlJoinType.html | 384 +++++++++++++++++++
 .../nlpcraft/model/tools/sqlgen/NCSqlQuery.html    | 239 ------------
 .../model/tools/sqlgen/NCSqlSimpleCondition.html   | 251 ------------
 .../nlpcraft/model/tools/sqlgen/NCSqlUtils.html    | 422 ---------------------
 .../tools/sqlgen/class-use/NCSqlCondition.html     | 175 ---------
 .../{NCSqlAggregate.html => NCSqlExtractor.html}   |  38 +-
 ...qlException.html => NCSqlExtractorBuilder.html} |  24 +-
 .../tools/sqlgen/class-use/NCSqlInCondition.html   | 172 ---------
 .../{NCSqlFunction.html => NCSqlJoinType.html}     |  47 ++-
 .../model/tools/sqlgen/class-use/NCSqlQuery.html   | 129 -------
 .../sqlgen/class-use/NCSqlSimpleCondition.html     | 179 ---------
 35 files changed, 1520 insertions(+), 5094 deletions(-)

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..7a4a3ea
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
\ No newline at end of file
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html
deleted file mode 100644
index bffbc35..0000000
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlAggregate (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlAggregate (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></script>     [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlAggregate.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" target="_top">Frames</a></li>
-<li><a href="NCSqlAggregate.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Interface NCSqlAggregate" class="title">Interface NCSqlAggregate</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">NCSqlAggregate</span></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html#getGroupBy--">getGroupBy</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html#getSelect--">getSelect</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getSelect--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getSelect</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a>&gt;&nbsp;getSelect()</pre>
-</li>
-</ul>
-<a name="getGroupBy--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getGroupBy</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a>&gt;&nbsp;getGroupBy()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlAggregate.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" target="_top">Frames</a></li>
-<li><a href="NCSqlAggregate.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html
similarity index 50%
rename from docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html
rename to docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html
index cd32130..127bdb9 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
+<!-- Generated by javadoc (1.8.0_161) on Fri Mar 27 11:31:46 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlCondition (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<title>NCSqlExtractor (Apache NLPCraft 0.5.0)</title>
+<meta name="date" content="2020-03-27">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlCondition (Apache NLPCraft 0.5.0)";
+            parent.document.title="NCSqlExtractor (Apache NLPCraft 0.5.0)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -42,7 +42,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlCondition.html">Use</a></li>
+<li><a href="class-use/NCSqlExtractor.html">Use</a></li>
 <li><a href="package-tree.html">Tree</a></li>
 <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
 <li><a href="../../../../../../index-all.html">Index</a></li>
@@ -52,12 +52,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlCondition.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractor.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -96,19 +96,28 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Interface NCSqlCondition" class="title">Interface NCSqlCondition</h2>
+<h2 title="Interface NCSqlExtractor" class="title">Interface NCSqlExtractor</h2>
 </div>
 <div class="contentContainer">
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt>All Known Subinterfaces:</dt>
-<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a>, <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a></dd>
-</dl>
 <hr>
 <br>
-<pre>public interface <span class="typeNameLabel">NCSqlCondition</span></pre>
+<pre>public interface <span class="typeNameLabel">NCSqlExtractor</span></pre>
+<div class="block">Utility methods for extracting various SQL components from <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model"><code>NCToken</code></a> tokens. Instances
+ of this interface are created using <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlExtractorBuilder</code></a> builder.
+ <p>
+ Note that <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlExtractorBuilder</code></a> builder requires <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlSchema</code></a> and <a href="../../../../../../org/apache/nlpcraft/model/NCVariant.html" title="interface in org.apach [...]
+ objects when creating an instance of SQL extractor. Methods in this interface will search
+ these parsing variant and schema to find necessary referenced tokens.
+ <p>
+ Note also that wherever necessary the implementation will scan part (constituent) tokens as well
+ (see <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html#findPartTokens-java.lang.String...-"><code>NCToken.findPartTokens(String...)</code></a> for more information).</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlExtractorBuilder</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -129,7 +138,33 @@ var activeTableTab = "activeTableTab";
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html#getColumn--">getColumn</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractColumn-org.apache.nlpcraft.model.NCToken-">extractColumn</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok)</code>
+<div class="block">Extract column object from the token.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlDateRange</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractDateRange-org.apache.nlpcraft.model.NCToken-">extractDateRange</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;dateTok)</code>
+<div class="block">Extract date range object from given <code>nlpcraft:date</code> token.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractLimit-org.apache.nlpcraft.model.NCToken-">extractLimit</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;limitTok)</code>
+<div class="block">Extracts limit object from given <code>nlpcraft:limit</code> token.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractSort-org.apache.nlpcraft.model.NCToken-">extractSort</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;sortTok)</code>
+<div class="block">Extracts sort object from given <code>nlpcraft:sort</code> token.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractTable-org.apache.nlpcraft.model.NCToken-">extractTable</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tblTok)</code>
+<div class="block">Extract table object from the token.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -146,13 +181,94 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getColumn--">
+<a name="extractLimit-org.apache.nlpcraft.model.NCToken-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>extractLimit</h4>
+<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a>&nbsp;extractLimit(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;limitTok)</pre>
+<div class="block">Extracts limit object from given <code>nlpcraft:limit</code> token.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>limitTok</code> - Limit token with ID <code>nlpcraft:limit</code>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>SQL limit object extracted from given token.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown in case of any errors.</dd>
+</dl>
+</li>
+</ul>
+<a name="extractSort-org.apache.nlpcraft.model.NCToken-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>extractSort</h4>
+<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a>&nbsp;extractSort(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;sortTok)</pre>
+<div class="block">Extracts sort object from given <code>nlpcraft:sort</code> token.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>sortTok</code> - Sort token with ID <code>nlpcraft:sort</code>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>SQL sort object extracted from given token.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown in case of any errors.</dd>
+</dl>
+</li>
+</ul>
+<a name="extractTable-org.apache.nlpcraft.model.NCToken-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>extractTable</h4>
+<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a>&nbsp;extractTable(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tblTok)</pre>
+<div class="block">Extract table object from the token.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>tblTok</code> - A token that belongs to a <code>table</code> group.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>SQL table object extracted from the given token.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown in case of any errors.</dd>
+</dl>
+</li>
+</ul>
+<a name="extractColumn-org.apache.nlpcraft.model.NCToken-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>extractColumn</h4>
+<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a>&nbsp;extractColumn(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok)</pre>
+<div class="block">Extract column object from the token.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>colTok</code> - A token that belongs to a <code>column</code> group.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>SQL column object extracted from the given token.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown in case of any errors.</dd>
+</dl>
+</li>
+</ul>
+<a name="extractDateRange-org.apache.nlpcraft.model.NCToken-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>getColumn</h4>
-<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a>&nbsp;getColumn()</pre>
+<h4>extractDateRange</h4>
+<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlDateRange</a>&nbsp;extractDateRange(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;dateTok)</pre>
+<div class="block">Extract date range object from given <code>nlpcraft:date</code> token.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>dateTok</code> - Date token with ID <code>nlpcraft:date</code>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A data range object extracted from given token.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown in case of any errors.</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -174,7 +290,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlCondition.html">Use</a></li>
+<li><a href="class-use/NCSqlExtractor.html">Use</a></li>
 <li><a href="package-tree.html">Tree</a></li>
 <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
 <li><a href="../../../../../../index-all.html">Index</a></li>
@@ -184,12 +300,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlCondition.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractor.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html
similarity index 61%
rename from docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html
rename to docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html
index 10ed191..926f967 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
+<!-- Generated by javadoc (1.8.0_161) on Fri Mar 27 11:31:46 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlException (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<title>NCSqlExtractorBuilder (Apache NLPCraft 0.5.0)</title>
+<meta name="date" content="2020-03-27">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,12 +13,18 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlException (Apache NLPCraft 0.5.0)";
+            parent.document.title="NCSqlExtractorBuilder (Apache NLPCraft 0.5.0)";
         }
     }
     catch(err) {
     }
 //-->
+var methods = {"i0":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -36,7 +42,7 @@
 <li><a href="../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlException.html">Use</a></li>
+<li><a href="class-use/NCSqlExtractorBuilder.html">Use</a></li>
 <li><a href="package-tree.html">Tree</a></li>
 <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
 <li><a href="../../../../../../index-all.html">Index</a></li>
@@ -46,12 +52,12 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" target="_top">Frames</a></li>
-<li><a href="NCSqlException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractorBuilder.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -74,13 +80,13 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+<li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
 <a name="skip.navbar.top">
@@ -90,46 +96,29 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Class NCSqlException" class="title">Class NCSqlException</h2>
+<h2 title="Class NCSqlExtractorBuilder" class="title">Class NCSqlExtractorBuilder</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang">java.lang.RuntimeException</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.nlpcraft.model.tools.sqlgen.NCSqlException</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
+<li>org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractorBuilder</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
-</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">NCSqlException</span>
-extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang">RuntimeException</a></pre>
+<pre>public class <span class="typeNameLabel">NCSqlExtractorBuilder</span>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
+<div class="block">Builder for <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlExtractor</code></a> instances.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../../serialized-form.html#org.apache.nlpcraft.model.tools.sqlgen.NCSqlException">Serialized Form</a></dd>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlModelGenerator</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlExtractor</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -149,11 +138,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html#NCSqlException-java.lang.String-">NCSqlException</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;message)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html#NCSqlException-java.lang.String-java.lang.Throwable-">NCSqlException</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;message,
-              <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html#NCSqlExtractorBuilder--">NCSqlExtractorBuilder</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -164,19 +149,26 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a></h3>
-<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or inter [...]
-</ul>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html#build-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCVariant-">build</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
+     <a href="../../../../../../org/apache/nlpcraft/model/NCVariant.html" title="interface in org.apache.nlpcraft.model">NCVariant</a>&nbsp;variant)</code>
+<div class="block">Builds and returns new SQL extractor for given SQL schema and parsing variant.</div>
+</td>
+</tr>
+</table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href=" [...]
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href=" [...]
 </ul>
 </li>
 </ul>
@@ -192,23 +184,40 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="NCSqlException-java.lang.String-">
+<a name="NCSqlExtractorBuilder--">
 <!--   -->
 </a>
-<ul class="blockList">
+<ul class="blockListLast">
 <li class="blockList">
-<h4>NCSqlException</h4>
-<pre>public&nbsp;NCSqlException(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;message)</pre>
+<h4>NCSqlExtractorBuilder</h4>
+<pre>public&nbsp;NCSqlExtractorBuilder()</pre>
+</li>
+</ul>
 </li>
 </ul>
-<a name="NCSqlException-java.lang.String-java.lang.Throwable-">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="build-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCVariant-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>NCSqlException</h4>
-<pre>public&nbsp;NCSqlException(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;message,
-                      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
+<h4>build</h4>
+<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a>&nbsp;build(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
+                                   <a href="../../../../../../org/apache/nlpcraft/model/NCVariant.html" title="interface in org.apache.nlpcraft.model">NCVariant</a>&nbsp;variant)</pre>
+<div class="block">Builds and returns new SQL extractor for given SQL schema and parsing variant.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>schema</code> - SQL schema object to create an extractor for.</dd>
+<dd><code>variant</code> - Parsing variant (i.e. list of all tokens) to act as a context for
+      the extraction wherever necessary.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Newly created SQL extractor.</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -230,7 +239,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 <li><a href="../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlException.html">Use</a></li>
+<li><a href="class-use/NCSqlExtractorBuilder.html">Use</a></li>
 <li><a href="package-tree.html">Tree</a></li>
 <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
 <li><a href="../../../../../../index-all.html">Index</a></li>
@@ -240,12 +249,12 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" target="_top">Frames</a></li>
-<li><a href="NCSqlException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractorBuilder.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -268,13 +277,13 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+<li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
 <a name="skip.navbar.bottom">
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html
deleted file mode 100644
index 2a5ddcf..0000000
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlFunction (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlFunction (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></script>     [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlFunction.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" target="_top">Frames</a></li>
-<li><a href="NCSqlFunction.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Interface NCSqlFunction" class="title">Interface NCSqlFunction</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">NCSqlFunction</span></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html#getColumn--">getColumn</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html#getFunction--">getFunction</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getColumn--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getColumn</h4>
-<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a>&nbsp;getColumn()</pre>
-</li>
-</ul>
-<a name="getFunction--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getFunction</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getFunction()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlFunction.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" target="_top">Frames</a></li>
-<li><a href="NCSqlFunction.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html
deleted file mode 100644
index f9d05cc..0000000
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html
+++ /dev/null
@@ -1,238 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlInCondition (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlInCondition (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></script>     [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlInCondition.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlInCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Interface NCSqlInCondition" class="title">Interface NCSqlInCondition</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">NCSqlInCondition</span>
-extends <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html#getValues--">getValues</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.nlpcraft.model.tools.sqlgen.NCSqlCondition">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></h3>
-<code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html#getColumn--">getColumn</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getValues--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getValues</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;getValues()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlInCondition.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlInCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html
new file mode 100644
index 0000000..54291ab
--- /dev/null
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html
@@ -0,0 +1,384 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_161) on Fri Mar 27 11:31:46 PDT 2020 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>NCSqlJoinType (Apache NLPCraft 0.5.0)</title>
+<meta name="date" content="2020-03-27">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="NCSqlJoinType (Apache NLPCraft 0.5.0)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></script>     [...]
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/NCSqlJoinType.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" target="_top">Frames</a></li>
+<li><a href="NCSqlJoinType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
+<h2 title="Enum NCSqlJoinType" class="title">Enum NCSqlJoinType</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">java.lang.Enum</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>org.apache.nlpcraft.model.tools.sqlgen.NCSqlJoinType</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>&gt;</dd>
+</dl>
+<hr>
+<br>
+<pre>public enum <span class="typeNameLabel">NCSqlJoinType</span>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>&gt;</pre>
+<div class="block">Type of the SQL join.
+ <p>
+ In JSON/YAML generated model SQL join type is declared with the following data model
+ metadata (example):
+ <pre class="brush: js, highlight: [8]">
+   sql:joins:
+   - fromtable: "orders"
+     fromcolumns:
+     - "customer_id"
+     totable: "customers"
+     tocolumns:
+     - "customer_id"
+     jointype: "left"
+ </pre></div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.summary">
+<!--   -->
+</a>
+<h3>Enum Constant Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Enum Constant and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#INNER">INNER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#LEFT">LEFT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#OUTER">OUTER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#RIGHT">RIGHT</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#valueOf-java.lang.String-">valueOf</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#compareTo-E-" title="class or interface in java.lang">compareTo</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#getDeclaringClass--" title="class or interface in java.lang">getDeclaringClass [...]
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.or [...]
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.detail">
+<!--   -->
+</a>
+<h3>Enum Constant Detail</h3>
+<a name="INNER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>INNER</h4>
+<pre>public static final&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a> INNER</pre>
+</li>
+</ul>
+<a name="LEFT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LEFT</h4>
+<pre>public static final&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a> LEFT</pre>
+</li>
+</ul>
+<a name="RIGHT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RIGHT</h4>
+<pre>public static final&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a> RIGHT</pre>
+</li>
+</ul>
+<a name="OUTER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>OUTER</h4>
+<pre>public static final&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a> OUTER</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="values--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>values</h4>
+<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>[]&nbsp;values()</pre>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.  This method may be used to iterate
+over the constants as follows:
+<pre>
+for (NCSqlJoinType c : NCSqlJoinType.values())
+&nbsp;   System.out.println(c);
+</pre></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>an array containing the constants of this enum type, in the order they are declared</dd>
+</dl>
+</li>
+</ul>
+<a name="valueOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>valueOf</h4>
+<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>&nbsp;valueOf(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<div class="block">Returns the enum constant of this type with the specified name.
+The string must match <i>exactly</i> an identifier used to declare an
+enum constant in this type.  (Extraneous whitespace characters are 
+not permitted.)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the enum constant with the specified name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang">IllegalArgumentException</a></code> - if this enum type has no constant with the specified name</dd>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/NullPointerException.html?is-external=true" title="class or interface in java.lang">NullPointerException</a></code> - if the argument is null</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/NCSqlJoinType.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" target="_top">Frames</a></li>
+<li><a href="NCSqlJoinType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
+</body>
+</html>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html
deleted file mode 100644
index d450d22..0000000
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlQuery (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlQuery (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></script>     [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlQuery.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" target="_top">Frames</a></li>
-<li><a href="NCSqlQuery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Interface NCSqlQuery" class="title">Interface NCSqlQuery</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">NCSqlQuery</span></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html#getParameters--">getParameters</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html#getSql--">getSql</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getSql--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getSql</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getSql()</pre>
-</li>
-</ul>
-<a name="getParameters--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getParameters</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;getParameters()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlQuery.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" target="_top">Frames</a></li>
-<li><a href="NCSqlQuery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html
deleted file mode 100644
index ffcf163..0000000
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlSimpleCondition (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlSimpleCondition (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></script>     [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlSimpleCondition.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlSimpleCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Interface NCSqlSimpleCondition" class="title">Interface NCSqlSimpleCondition</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">NCSqlSimpleCondition</span>
-extends <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html#getOperation--">getOperation</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html#getValue--">getValue</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.nlpcraft.model.tools.sqlgen.NCSqlCondition">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></h3>
-<code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html#getColumn--">getColumn</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getOperation--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getOperation</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getOperation()</pre>
-</li>
-</ul>
-<a name="getValue--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getValue</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;getValue()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlSimpleCondition.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlSimpleCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html
deleted file mode 100644
index 3e06079..0000000
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html
+++ /dev/null
@@ -1,422 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlUtils (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlUtils (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></script>     [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlUtils.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" target="_top">Frames</a></li>
-<li><a href="NCSqlUtils.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Class NCSqlUtils" class="title">Class NCSqlUtils</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.nlpcraft.model.tools.sqlgen.NCSqlUtils</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">NCSqlUtils</span>
-extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
-<div class="block">TODO: add description.</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#NCSqlUtils--">NCSqlUtils</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractAggregate-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-java.util.List-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">extractAggregate</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&gt;&nbsp;variant,
-                <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;aggrFunc,
-                <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;aggrGroupOpt)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractColumn-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-">extractColumn</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-             <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlDateRange</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractDateRange-org.apache.nlpcraft.model.NCToken-">extractDateRange</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractDateRangeConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">extractDateRangeConditions</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                          <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok,
-                          <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;dateTok)</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractLimit-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-java.util.List-org.apache.nlpcraft.model.NCToken-">extractLimit</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-            <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&gt;&nbsp;variant,
-            <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;limitTok)</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractNumConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">extractNumConditions</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                    <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok,
-                    <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;numTok)</code>&nbsp;</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractSorts-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-java.util.List-org.apache.nlpcraft.model.NCToken-">extractSorts</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-            <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&gt;&nbsp;variant,
-            <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;sortTok)</code>&nbsp;</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractTable-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-">extractTable</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-            <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</code>&nbsp;</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractValuesConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken...-">extractValuesConditions</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                       <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>...&nbsp;allValsToks)</code>&nbsp;</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#findAnyColumnToken-org.apache.nlpcraft.model.NCToken-">findAnyColumnToken</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href=" [...]
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="NCSqlUtils--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>NCSqlUtils</h4>
-<pre>public&nbsp;NCSqlUtils()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="extractLimit-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-java.util.List-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractLimit</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a>&nbsp;extractLimit(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                                      <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&gt;&nbsp;variant,
-                                      <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;limitTok)</pre>
-</li>
-</ul>
-<a name="extractDateRangeConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractDateRangeConditions</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a>&gt;&nbsp;extractDateRangeConditions(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache [...]
-                                                                    <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok,
-                                                                    <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;dateTok)</pre>
-</li>
-</ul>
-<a name="extractNumConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractNumConditions</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a>&gt;&nbsp;extractNumConditions(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcr [...]
-                                                              <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok,
-                                                              <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;numTok)</pre>
-</li>
-</ul>
-<a name="extractValuesConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken...-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractValuesConditions</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a>&gt;&nbsp;extractValuesConditions(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.m [...]
-                                                             <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>...&nbsp;allValsToks)</pre>
-</li>
-</ul>
-<a name="extractSorts-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-java.util.List-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractSorts</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a>&nbsp;extractSorts(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                                     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&gt;&nbsp;variant,
-                                     <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;sortTok)</pre>
-</li>
-</ul>
-<a name="extractAggregate-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-java.util.List-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractAggregate</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a>&nbsp;extractAggregate(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                                              <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&gt;&nbsp;variant,
-                                              <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;aggrFunc,
-                                              <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;aggrGroupOpt)</pre>
-</li>
-</ul>
-<a name="extractTable-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractTable</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a>&nbsp;extractTable(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                                      <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</pre>
-</li>
-</ul>
-<a name="extractColumn-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractColumn</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a>&nbsp;extractColumn(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                                        <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</pre>
-</li>
-</ul>
-<a name="extractDateRange-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractDateRange</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlDateRange</a>&nbsp;extractDateRange(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</pre>
-</li>
-</ul>
-<a name="findAnyColumnToken-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>findAnyColumnToken</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;findAnyColumnToken(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlUtils.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" target="_top">Frames</a></li>
-<li><a href="NCSqlUtils.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlCondition.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlCondition.html
deleted file mode 100644
index 600b204..0000000
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlCondition.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlCondition (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlCondition (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></sc [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlCondition" class="title">Uses of Interface<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlCondition</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#org.apache.nlpcraft.model.tools.sqlgen">org.apache.nlpcraft.model.tools.sqlgen</a></td>
-<td class="colLast">
-<div class="block">Contains model stub generator for SQL RDBMS.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="org.apache.nlpcraft.model.tools.sqlgen">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
-<caption><span>Subinterfaces of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Interface and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlException.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlException.html
deleted file mode 100644
index 72ec71b..0000000
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlException.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlException (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlException (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></sc [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlException.html" target="_top">Frames</a></li>
-<li><a href="NCSqlException.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlException" class="title">Uses of Class<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlException</h2>
-</div>
-<div class="classUseContainer">No usage of org.apache.nlpcraft.model.tools.sqlgen.NCSqlException</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlException.html" target="_top">Frames</a></li>
-<li><a href="NCSqlException.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlAggregate.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractor.html
similarity index 79%
rename from docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlAggregate.html
rename to docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractor.html
index 5f1b49b..16133c3 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlAggregate.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractor.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
+<!-- Generated by javadoc (1.8.0_161) on Fri Mar 27 11:31:46 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlAggregate (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<title>Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractor (Apache NLPCraft 0.5.0)</title>
+<meta name="date" content="2020-03-27">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlAggregate (Apache NLPCraft 0.5.0)";
+            parent.document.title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractor (Apache NLPCraft 0.5.0)";
         }
     }
     catch(err) {
@@ -35,7 +35,7 @@
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
+<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
@@ -50,8 +50,8 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlAggregate.html" target="_top">Frames</a></li>
-<li><a href="NCSqlAggregate.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractor.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractor.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,13 +73,13 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlAggregate" class="title">Uses of Interface<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlAggregate</h2>
+<h2 title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractor" class="title">Uses of Interface<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractor</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
 <li class="blockList">
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>Packages that use <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Package</th>
 <th class="colLast" scope="col">Description</th>
@@ -99,20 +99,20 @@
 <li class="blockList"><a name="org.apache.nlpcraft.model.tools.sqlgen">
 <!--   -->
 </a>
-<h3>Uses of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></h3>
+<h3>Uses of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></h3>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a> that return <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>Methods in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a> that return <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a></code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlUtils.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractAggregate-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-java.util.List-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">extractAggregate</a></span>(<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraf [...]
-                <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&gt;&nbsp;variant,
-                <a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;aggrFunc,
-                <a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;aggrGroupOpt)</code>&nbsp;</td>
+<td class="colFirst"><code>static <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></code></td>
+<td class="colLast"><span class="typeNameLabel">NCSqlExtractorBuilder.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html#build-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCVariant-">build</a></span>(<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
+     <a href="../../../../../../../org/apache/nlpcraft/model/NCVariant.html" title="interface in org.apache.nlpcraft.model">NCVariant</a>&nbsp;variant)</code>
+<div class="block">Builds and returns new SQL extractor for given SQL schema and parsing variant.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -132,7 +132,7 @@
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
+<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
@@ -147,8 +147,8 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlAggregate.html" target="_top">Frames</a></li>
-<li><a href="NCSqlAggregate.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractor.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractor.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlUtils.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractorBuilder.html
similarity index 89%
rename from docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlUtils.html
rename to docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractorBuilder.html
index b206588..f0142dd 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlUtils.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractorBuilder.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
+<!-- Generated by javadoc (1.8.0_161) on Fri Mar 27 11:31:46 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlUtils (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<title>Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractorBuilder (Apache NLPCraft 0.5.0)</title>
+<meta name="date" content="2020-03-27">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlUtils (Apache NLPCraft 0.5.0)";
+            parent.document.title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractorBuilder (Apache NLPCraft 0.5.0)";
         }
     }
     catch(err) {
@@ -35,7 +35,7 @@
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
+<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
@@ -50,8 +50,8 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlUtils.html" target="_top">Frames</a></li>
-<li><a href="NCSqlUtils.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractorBuilder.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractorBuilder.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,9 +73,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlUtils" class="title">Uses of Class<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlUtils</h2>
+<h2 title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractorBuilder" class="title">Uses of Class<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractorBuilder</h2>
 </div>
-<div class="classUseContainer">No usage of org.apache.nlpcraft.model.tools.sqlgen.NCSqlUtils</div>
+<div class="classUseContainer">No usage of org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractorBuilder</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -87,7 +87,7 @@
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
+<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
@@ -102,8 +102,8 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlUtils.html" target="_top">Frames</a></li>
-<li><a href="NCSqlUtils.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractorBuilder.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractorBuilder.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlInCondition.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlInCondition.html
deleted file mode 100644
index d2094e5..0000000
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlInCondition.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlInCondition (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlInCondition (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></sc [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlInCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlInCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlInCondition" class="title">Uses of Interface<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlInCondition</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#org.apache.nlpcraft.model.tools.sqlgen">org.apache.nlpcraft.model.tools.sqlgen</a></td>
-<td class="colLast">
-<div class="block">Contains model stub generator for SQL RDBMS.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="org.apache.nlpcraft.model.tools.sqlgen">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a> that return types with arguments of type <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlUtils.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractValuesConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken...-">extractValuesConditions</a></span>(<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchem [...]
-                       <a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>...&nbsp;allValsToks)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlInCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlInCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlFunction.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoinType.html
similarity index 71%
rename from docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlFunction.html
rename to docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoinType.html
index 12ac1b3..9b23a60 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlFunction.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoinType.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
+<!-- Generated by javadoc (1.8.0_161) on Fri Mar 27 11:31:46 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlFunction (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<title>Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlJoinType (Apache NLPCraft 0.5.0)</title>
+<meta name="date" content="2020-03-27">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlFunction (Apache NLPCraft 0.5.0)";
+            parent.document.title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlJoinType (Apache NLPCraft 0.5.0)";
         }
     }
     catch(err) {
@@ -35,7 +35,7 @@
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
+<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
@@ -50,8 +50,8 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlFunction.html" target="_top">Frames</a></li>
-<li><a href="NCSqlFunction.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoinType.html" target="_top">Frames</a></li>
+<li><a href="NCSqlJoinType.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,13 +73,13 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlFunction" class="title">Uses of Interface<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlFunction</h2>
+<h2 title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlJoinType" class="title">Uses of Class<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlJoinType</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
 <li class="blockList">
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>Packages that use <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Package</th>
 <th class="colLast" scope="col">Description</th>
@@ -99,17 +99,32 @@
 <li class="blockList"><a name="org.apache.nlpcraft.model.tools.sqlgen">
 <!--   -->
 </a>
-<h3>Uses of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></h3>
+<h3>Uses of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></h3>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a> that return types with arguments of type <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>Methods in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a> that return <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlAggregate.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html#getSelect--">getSelect</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">NCSqlJoin.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getType--">getType</a></span>()</code>
+<div class="block">Gets type of the join.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">NCSqlJoinType.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#valueOf-java.lang.String-">valueOf</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>[]</code></td>
+<td class="colLast"><span class="typeNameLabel">NCSqlJoinType.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -129,7 +144,7 @@
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
+<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
@@ -144,8 +159,8 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlFunction.html" target="_top">Frames</a></li>
-<li><a href="NCSqlFunction.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoinType.html" target="_top">Frames</a></li>
+<li><a href="NCSqlJoinType.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlQuery.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlQuery.html
deleted file mode 100644
index 8003daa..0000000
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlQuery.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlQuery (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlQuery (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></sc [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlQuery.html" target="_top">Frames</a></li>
-<li><a href="NCSqlQuery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlQuery" class="title">Uses of Interface<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlQuery</h2>
-</div>
-<div class="classUseContainer">No usage of org.apache.nlpcraft.model.tools.sqlgen.NCSqlQuery</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlQuery.html" target="_top">Frames</a></li>
-<li><a href="NCSqlQuery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSimpleCondition.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSimpleCondition.html
deleted file mode 100644
index 33aa6ca..0000000
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSimpleCondition.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlSimpleCondition (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlSimpleCondition (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></sc [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSimpleCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlSimpleCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlSimpleCondition" class="title">Uses of Interface<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlSimpleCondition</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#org.apache.nlpcraft.model.tools.sqlgen">org.apache.nlpcraft.model.tools.sqlgen</a></td>
-<td class="colLast">
-<div class="block">Contains model stub generator for SQL RDBMS.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="org.apache.nlpcraft.model.tools.sqlgen">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a> that return types with arguments of type <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlUtils.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractDateRangeConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">extractDateRangeConditions</a></span>(<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nl [...]
-                          <a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok,
-                          <a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;dateTok)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlUtils.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractNumConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">extractNumConditions</a></span>(<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model [...]
-                    <a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok,
-                    <a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;numTok)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSimpleCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlSimpleCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlUtils.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlUtils.html
deleted file mode 100644
index b206588..0000000
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlUtils.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlUtils (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlUtils (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></sc [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlUtils.html" target="_top">Frames</a></li>
-<li><a href="NCSqlUtils.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlUtils" class="title">Uses of Class<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlUtils</h2>
-</div>
-<div class="classUseContainer">No usage of org.apache.nlpcraft.model.tools.sqlgen.NCSqlUtils</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlUtils.html" target="_top">Frames</a></li>
-<li><a href="NCSqlUtils.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html
deleted file mode 100644
index bffbc35..0000000
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlAggregate (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlAggregate (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></script>     [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlAggregate.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" target="_top">Frames</a></li>
-<li><a href="NCSqlAggregate.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Interface NCSqlAggregate" class="title">Interface NCSqlAggregate</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">NCSqlAggregate</span></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html#getGroupBy--">getGroupBy</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html#getSelect--">getSelect</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getSelect--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getSelect</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a>&gt;&nbsp;getSelect()</pre>
-</li>
-</ul>
-<a name="getGroupBy--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getGroupBy</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a>&gt;&nbsp;getGroupBy()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlAggregate.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" target="_top">Frames</a></li>
-<li><a href="NCSqlAggregate.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html
similarity index 50%
rename from docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html
rename to docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html
index cd32130..127bdb9 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
+<!-- Generated by javadoc (1.8.0_161) on Fri Mar 27 11:31:46 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlCondition (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<title>NCSqlExtractor (Apache NLPCraft 0.5.0)</title>
+<meta name="date" content="2020-03-27">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlCondition (Apache NLPCraft 0.5.0)";
+            parent.document.title="NCSqlExtractor (Apache NLPCraft 0.5.0)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -42,7 +42,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlCondition.html">Use</a></li>
+<li><a href="class-use/NCSqlExtractor.html">Use</a></li>
 <li><a href="package-tree.html">Tree</a></li>
 <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
 <li><a href="../../../../../../index-all.html">Index</a></li>
@@ -52,12 +52,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlCondition.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractor.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -96,19 +96,28 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Interface NCSqlCondition" class="title">Interface NCSqlCondition</h2>
+<h2 title="Interface NCSqlExtractor" class="title">Interface NCSqlExtractor</h2>
 </div>
 <div class="contentContainer">
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt>All Known Subinterfaces:</dt>
-<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a>, <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a></dd>
-</dl>
 <hr>
 <br>
-<pre>public interface <span class="typeNameLabel">NCSqlCondition</span></pre>
+<pre>public interface <span class="typeNameLabel">NCSqlExtractor</span></pre>
+<div class="block">Utility methods for extracting various SQL components from <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model"><code>NCToken</code></a> tokens. Instances
+ of this interface are created using <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlExtractorBuilder</code></a> builder.
+ <p>
+ Note that <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlExtractorBuilder</code></a> builder requires <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlSchema</code></a> and <a href="../../../../../../org/apache/nlpcraft/model/NCVariant.html" title="interface in org.apach [...]
+ objects when creating an instance of SQL extractor. Methods in this interface will search
+ these parsing variant and schema to find necessary referenced tokens.
+ <p>
+ Note also that wherever necessary the implementation will scan part (constituent) tokens as well
+ (see <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html#findPartTokens-java.lang.String...-"><code>NCToken.findPartTokens(String...)</code></a> for more information).</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlExtractorBuilder</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -129,7 +138,33 @@ var activeTableTab = "activeTableTab";
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html#getColumn--">getColumn</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractColumn-org.apache.nlpcraft.model.NCToken-">extractColumn</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok)</code>
+<div class="block">Extract column object from the token.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlDateRange</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractDateRange-org.apache.nlpcraft.model.NCToken-">extractDateRange</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;dateTok)</code>
+<div class="block">Extract date range object from given <code>nlpcraft:date</code> token.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractLimit-org.apache.nlpcraft.model.NCToken-">extractLimit</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;limitTok)</code>
+<div class="block">Extracts limit object from given <code>nlpcraft:limit</code> token.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractSort-org.apache.nlpcraft.model.NCToken-">extractSort</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;sortTok)</code>
+<div class="block">Extracts sort object from given <code>nlpcraft:sort</code> token.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractTable-org.apache.nlpcraft.model.NCToken-">extractTable</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tblTok)</code>
+<div class="block">Extract table object from the token.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -146,13 +181,94 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getColumn--">
+<a name="extractLimit-org.apache.nlpcraft.model.NCToken-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>extractLimit</h4>
+<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a>&nbsp;extractLimit(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;limitTok)</pre>
+<div class="block">Extracts limit object from given <code>nlpcraft:limit</code> token.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>limitTok</code> - Limit token with ID <code>nlpcraft:limit</code>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>SQL limit object extracted from given token.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown in case of any errors.</dd>
+</dl>
+</li>
+</ul>
+<a name="extractSort-org.apache.nlpcraft.model.NCToken-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>extractSort</h4>
+<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a>&nbsp;extractSort(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;sortTok)</pre>
+<div class="block">Extracts sort object from given <code>nlpcraft:sort</code> token.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>sortTok</code> - Sort token with ID <code>nlpcraft:sort</code>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>SQL sort object extracted from given token.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown in case of any errors.</dd>
+</dl>
+</li>
+</ul>
+<a name="extractTable-org.apache.nlpcraft.model.NCToken-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>extractTable</h4>
+<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a>&nbsp;extractTable(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tblTok)</pre>
+<div class="block">Extract table object from the token.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>tblTok</code> - A token that belongs to a <code>table</code> group.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>SQL table object extracted from the given token.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown in case of any errors.</dd>
+</dl>
+</li>
+</ul>
+<a name="extractColumn-org.apache.nlpcraft.model.NCToken-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>extractColumn</h4>
+<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a>&nbsp;extractColumn(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok)</pre>
+<div class="block">Extract column object from the token.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>colTok</code> - A token that belongs to a <code>column</code> group.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>SQL column object extracted from the given token.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown in case of any errors.</dd>
+</dl>
+</li>
+</ul>
+<a name="extractDateRange-org.apache.nlpcraft.model.NCToken-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>getColumn</h4>
-<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a>&nbsp;getColumn()</pre>
+<h4>extractDateRange</h4>
+<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlDateRange</a>&nbsp;extractDateRange(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;dateTok)</pre>
+<div class="block">Extract date range object from given <code>nlpcraft:date</code> token.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>dateTok</code> - Date token with ID <code>nlpcraft:date</code>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A data range object extracted from given token.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown in case of any errors.</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -174,7 +290,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlCondition.html">Use</a></li>
+<li><a href="class-use/NCSqlExtractor.html">Use</a></li>
 <li><a href="package-tree.html">Tree</a></li>
 <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
 <li><a href="../../../../../../index-all.html">Index</a></li>
@@ -184,12 +300,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlCondition.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractor.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html
similarity index 61%
rename from docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html
rename to docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html
index 10ed191..926f967 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
+<!-- Generated by javadoc (1.8.0_161) on Fri Mar 27 11:31:46 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlException (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<title>NCSqlExtractorBuilder (Apache NLPCraft 0.5.0)</title>
+<meta name="date" content="2020-03-27">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -13,12 +13,18 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlException (Apache NLPCraft 0.5.0)";
+            parent.document.title="NCSqlExtractorBuilder (Apache NLPCraft 0.5.0)";
         }
     }
     catch(err) {
     }
 //-->
+var methods = {"i0":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -36,7 +42,7 @@
 <li><a href="../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlException.html">Use</a></li>
+<li><a href="class-use/NCSqlExtractorBuilder.html">Use</a></li>
 <li><a href="package-tree.html">Tree</a></li>
 <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
 <li><a href="../../../../../../index-all.html">Index</a></li>
@@ -46,12 +52,12 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" target="_top">Frames</a></li>
-<li><a href="NCSqlException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractorBuilder.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -74,13 +80,13 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+<li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
 <a name="skip.navbar.top">
@@ -90,46 +96,29 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Class NCSqlException" class="title">Class NCSqlException</h2>
+<h2 title="Class NCSqlExtractorBuilder" class="title">Class NCSqlExtractorBuilder</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang">java.lang.RuntimeException</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.nlpcraft.model.tools.sqlgen.NCSqlException</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
+<li>org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractorBuilder</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
-</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">NCSqlException</span>
-extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang">RuntimeException</a></pre>
+<pre>public class <span class="typeNameLabel">NCSqlExtractorBuilder</span>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
+<div class="block">Builder for <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlExtractor</code></a> instances.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../../serialized-form.html#org.apache.nlpcraft.model.tools.sqlgen.NCSqlException">Serialized Form</a></dd>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlModelGenerator</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlExtractor</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -149,11 +138,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html#NCSqlException-java.lang.String-">NCSqlException</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;message)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html#NCSqlException-java.lang.String-java.lang.Throwable-">NCSqlException</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;message,
-              <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html#NCSqlExtractorBuilder--">NCSqlExtractorBuilder</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -164,19 +149,26 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a></h3>
-<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or inter [...]
-</ul>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html#build-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCVariant-">build</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
+     <a href="../../../../../../org/apache/nlpcraft/model/NCVariant.html" title="interface in org.apache.nlpcraft.model">NCVariant</a>&nbsp;variant)</code>
+<div class="block">Builds and returns new SQL extractor for given SQL schema and parsing variant.</div>
+</td>
+</tr>
+</table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href=" [...]
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href=" [...]
 </ul>
 </li>
 </ul>
@@ -192,23 +184,40 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="NCSqlException-java.lang.String-">
+<a name="NCSqlExtractorBuilder--">
 <!--   -->
 </a>
-<ul class="blockList">
+<ul class="blockListLast">
 <li class="blockList">
-<h4>NCSqlException</h4>
-<pre>public&nbsp;NCSqlException(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;message)</pre>
+<h4>NCSqlExtractorBuilder</h4>
+<pre>public&nbsp;NCSqlExtractorBuilder()</pre>
+</li>
+</ul>
 </li>
 </ul>
-<a name="NCSqlException-java.lang.String-java.lang.Throwable-">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="build-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCVariant-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>NCSqlException</h4>
-<pre>public&nbsp;NCSqlException(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;message,
-                      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
+<h4>build</h4>
+<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a>&nbsp;build(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
+                                   <a href="../../../../../../org/apache/nlpcraft/model/NCVariant.html" title="interface in org.apache.nlpcraft.model">NCVariant</a>&nbsp;variant)</pre>
+<div class="block">Builds and returns new SQL extractor for given SQL schema and parsing variant.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>schema</code> - SQL schema object to create an extractor for.</dd>
+<dd><code>variant</code> - Parsing variant (i.e. list of all tokens) to act as a context for
+      the extraction wherever necessary.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Newly created SQL extractor.</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -230,7 +239,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 <li><a href="../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlException.html">Use</a></li>
+<li><a href="class-use/NCSqlExtractorBuilder.html">Use</a></li>
 <li><a href="package-tree.html">Tree</a></li>
 <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
 <li><a href="../../../../../../index-all.html">Index</a></li>
@@ -240,12 +249,12 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" target="_top">Frames</a></li>
-<li><a href="NCSqlException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractorBuilder.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -268,13 +277,13 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+<li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
 <a name="skip.navbar.bottom">
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html
deleted file mode 100644
index 2a5ddcf..0000000
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlFunction (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlFunction (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></script>     [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlFunction.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" target="_top">Frames</a></li>
-<li><a href="NCSqlFunction.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Interface NCSqlFunction" class="title">Interface NCSqlFunction</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">NCSqlFunction</span></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html#getColumn--">getColumn</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html#getFunction--">getFunction</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getColumn--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getColumn</h4>
-<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a>&nbsp;getColumn()</pre>
-</li>
-</ul>
-<a name="getFunction--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getFunction</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getFunction()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlFunction.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" target="_top">Frames</a></li>
-<li><a href="NCSqlFunction.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html
deleted file mode 100644
index f9d05cc..0000000
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html
+++ /dev/null
@@ -1,238 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlInCondition (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlInCondition (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></script>     [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlInCondition.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlInCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Interface NCSqlInCondition" class="title">Interface NCSqlInCondition</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">NCSqlInCondition</span>
-extends <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html#getValues--">getValues</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.nlpcraft.model.tools.sqlgen.NCSqlCondition">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></h3>
-<code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html#getColumn--">getColumn</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getValues--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getValues</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;getValues()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlInCondition.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlInCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html
new file mode 100644
index 0000000..54291ab
--- /dev/null
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html
@@ -0,0 +1,384 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_161) on Fri Mar 27 11:31:46 PDT 2020 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>NCSqlJoinType (Apache NLPCraft 0.5.0)</title>
+<meta name="date" content="2020-03-27">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="NCSqlJoinType (Apache NLPCraft 0.5.0)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></script>     [...]
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/NCSqlJoinType.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" target="_top">Frames</a></li>
+<li><a href="NCSqlJoinType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
+<h2 title="Enum NCSqlJoinType" class="title">Enum NCSqlJoinType</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">java.lang.Enum</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>org.apache.nlpcraft.model.tools.sqlgen.NCSqlJoinType</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>&gt;</dd>
+</dl>
+<hr>
+<br>
+<pre>public enum <span class="typeNameLabel">NCSqlJoinType</span>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>&gt;</pre>
+<div class="block">Type of the SQL join.
+ <p>
+ In JSON/YAML generated model SQL join type is declared with the following data model
+ metadata (example):
+ <pre class="brush: js, highlight: [8]">
+   sql:joins:
+   - fromtable: "orders"
+     fromcolumns:
+     - "customer_id"
+     totable: "customers"
+     tocolumns:
+     - "customer_id"
+     jointype: "left"
+ </pre></div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.summary">
+<!--   -->
+</a>
+<h3>Enum Constant Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Enum Constant and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#INNER">INNER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#LEFT">LEFT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#OUTER">OUTER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#RIGHT">RIGHT</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#valueOf-java.lang.String-">valueOf</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#compareTo-E-" title="class or interface in java.lang">compareTo</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#getDeclaringClass--" title="class or interface in java.lang">getDeclaringClass [...]
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.or [...]
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.detail">
+<!--   -->
+</a>
+<h3>Enum Constant Detail</h3>
+<a name="INNER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>INNER</h4>
+<pre>public static final&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a> INNER</pre>
+</li>
+</ul>
+<a name="LEFT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LEFT</h4>
+<pre>public static final&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a> LEFT</pre>
+</li>
+</ul>
+<a name="RIGHT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RIGHT</h4>
+<pre>public static final&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a> RIGHT</pre>
+</li>
+</ul>
+<a name="OUTER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>OUTER</h4>
+<pre>public static final&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a> OUTER</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="values--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>values</h4>
+<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>[]&nbsp;values()</pre>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.  This method may be used to iterate
+over the constants as follows:
+<pre>
+for (NCSqlJoinType c : NCSqlJoinType.values())
+&nbsp;   System.out.println(c);
+</pre></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>an array containing the constants of this enum type, in the order they are declared</dd>
+</dl>
+</li>
+</ul>
+<a name="valueOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>valueOf</h4>
+<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>&nbsp;valueOf(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<div class="block">Returns the enum constant of this type with the specified name.
+The string must match <i>exactly</i> an identifier used to declare an
+enum constant in this type.  (Extraneous whitespace characters are 
+not permitted.)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the enum constant with the specified name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang">IllegalArgumentException</a></code> - if this enum type has no constant with the specified name</dd>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/NullPointerException.html?is-external=true" title="class or interface in java.lang">NullPointerException</a></code> - if the argument is null</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/NCSqlJoinType.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" target="_top">Frames</a></li>
+<li><a href="NCSqlJoinType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
+</body>
+</html>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html
deleted file mode 100644
index d450d22..0000000
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlQuery (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlQuery (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></script>     [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlQuery.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" target="_top">Frames</a></li>
-<li><a href="NCSqlQuery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Interface NCSqlQuery" class="title">Interface NCSqlQuery</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">NCSqlQuery</span></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html#getParameters--">getParameters</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html#getSql--">getSql</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getSql--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getSql</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getSql()</pre>
-</li>
-</ul>
-<a name="getParameters--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getParameters</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;getParameters()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlQuery.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" target="_top">Frames</a></li>
-<li><a href="NCSqlQuery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html
deleted file mode 100644
index ffcf163..0000000
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlSimpleCondition (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlSimpleCondition (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></script>     [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlSimpleCondition.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlSimpleCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Interface NCSqlSimpleCondition" class="title">Interface NCSqlSimpleCondition</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">NCSqlSimpleCondition</span>
-extends <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html#getOperation--">getOperation</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html#getValue--">getValue</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.nlpcraft.model.tools.sqlgen.NCSqlCondition">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></h3>
-<code><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html#getColumn--">getColumn</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getOperation--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getOperation</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getOperation()</pre>
-</li>
-</ul>
-<a name="getValue--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getValue</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;getValue()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlSimpleCondition.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlSimpleCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html
deleted file mode 100644
index 3e06079..0000000
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html
+++ /dev/null
@@ -1,422 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NCSqlUtils (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NCSqlUtils (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></script>     [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlUtils.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" target="_top">Frames</a></li>
-<li><a href="NCSqlUtils.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.nlpcraft.model.tools.sqlgen</div>
-<h2 title="Class NCSqlUtils" class="title">Class NCSqlUtils</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.nlpcraft.model.tools.sqlgen.NCSqlUtils</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">NCSqlUtils</span>
-extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
-<div class="block">TODO: add description.</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#NCSqlUtils--">NCSqlUtils</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractAggregate-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-java.util.List-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">extractAggregate</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&gt;&nbsp;variant,
-                <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;aggrFunc,
-                <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;aggrGroupOpt)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractColumn-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-">extractColumn</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-             <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlDateRange</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractDateRange-org.apache.nlpcraft.model.NCToken-">extractDateRange</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractDateRangeConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">extractDateRangeConditions</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                          <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok,
-                          <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;dateTok)</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractLimit-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-java.util.List-org.apache.nlpcraft.model.NCToken-">extractLimit</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-            <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&gt;&nbsp;variant,
-            <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;limitTok)</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractNumConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">extractNumConditions</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                    <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok,
-                    <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;numTok)</code>&nbsp;</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractSorts-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-java.util.List-org.apache.nlpcraft.model.NCToken-">extractSorts</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-            <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&gt;&nbsp;variant,
-            <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;sortTok)</code>&nbsp;</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractTable-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-">extractTable</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-            <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</code>&nbsp;</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractValuesConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken...-">extractValuesConditions</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                       <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>...&nbsp;allValsToks)</code>&nbsp;</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#findAnyColumnToken-org.apache.nlpcraft.model.NCToken-">findAnyColumnToken</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href=" [...]
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="NCSqlUtils--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>NCSqlUtils</h4>
-<pre>public&nbsp;NCSqlUtils()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="extractLimit-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-java.util.List-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractLimit</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a>&nbsp;extractLimit(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                                      <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&gt;&nbsp;variant,
-                                      <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;limitTok)</pre>
-</li>
-</ul>
-<a name="extractDateRangeConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractDateRangeConditions</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a>&gt;&nbsp;extractDateRangeConditions(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache [...]
-                                                                    <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok,
-                                                                    <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;dateTok)</pre>
-</li>
-</ul>
-<a name="extractNumConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractNumConditions</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a>&gt;&nbsp;extractNumConditions(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcr [...]
-                                                              <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok,
-                                                              <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;numTok)</pre>
-</li>
-</ul>
-<a name="extractValuesConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken...-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractValuesConditions</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a>&gt;&nbsp;extractValuesConditions(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.m [...]
-                                                             <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>...&nbsp;allValsToks)</pre>
-</li>
-</ul>
-<a name="extractSorts-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-java.util.List-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractSorts</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a>&nbsp;extractSorts(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                                     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&gt;&nbsp;variant,
-                                     <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;sortTok)</pre>
-</li>
-</ul>
-<a name="extractAggregate-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-java.util.List-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractAggregate</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a>&nbsp;extractAggregate(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                                              <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&gt;&nbsp;variant,
-                                              <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;aggrFunc,
-                                              <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;aggrGroupOpt)</pre>
-</li>
-</ul>
-<a name="extractTable-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractTable</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a>&nbsp;extractTable(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                                      <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</pre>
-</li>
-</ul>
-<a name="extractColumn-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractColumn</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a>&nbsp;extractColumn(<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
-                                        <a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</pre>
-</li>
-</ul>
-<a name="extractDateRange-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>extractDateRange</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlDateRange</a>&nbsp;extractDateRange(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</pre>
-</li>
-</ul>
-<a name="findAnyColumnToken-org.apache.nlpcraft.model.NCToken-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>findAnyColumnToken</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;findAnyColumnToken(<a href="../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;tok)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/NCSqlUtils.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" target="_top">Frames</a></li>
-<li><a href="NCSqlUtils.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlCondition.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlCondition.html
deleted file mode 100644
index 600b204..0000000
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlCondition.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlCondition (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlCondition (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></sc [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlCondition" class="title">Uses of Interface<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlCondition</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#org.apache.nlpcraft.model.tools.sqlgen">org.apache.nlpcraft.model.tools.sqlgen</a></td>
-<td class="colLast">
-<div class="block">Contains model stub generator for SQL RDBMS.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="org.apache.nlpcraft.model.tools.sqlgen">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
-<caption><span>Subinterfaces of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Interface and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlAggregate.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractor.html
similarity index 79%
rename from docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlAggregate.html
rename to docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractor.html
index 5f1b49b..16133c3 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlAggregate.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractor.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
+<!-- Generated by javadoc (1.8.0_161) on Fri Mar 27 11:31:46 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlAggregate (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<title>Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractor (Apache NLPCraft 0.5.0)</title>
+<meta name="date" content="2020-03-27">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlAggregate (Apache NLPCraft 0.5.0)";
+            parent.document.title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractor (Apache NLPCraft 0.5.0)";
         }
     }
     catch(err) {
@@ -35,7 +35,7 @@
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
+<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
@@ -50,8 +50,8 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlAggregate.html" target="_top">Frames</a></li>
-<li><a href="NCSqlAggregate.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractor.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractor.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,13 +73,13 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlAggregate" class="title">Uses of Interface<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlAggregate</h2>
+<h2 title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractor" class="title">Uses of Interface<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractor</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
 <li class="blockList">
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>Packages that use <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Package</th>
 <th class="colLast" scope="col">Description</th>
@@ -99,20 +99,20 @@
 <li class="blockList"><a name="org.apache.nlpcraft.model.tools.sqlgen">
 <!--   -->
 </a>
-<h3>Uses of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></h3>
+<h3>Uses of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></h3>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a> that return <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>Methods in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a> that return <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a></code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlUtils.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractAggregate-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-java.util.List-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">extractAggregate</a></span>(<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraf [...]
-                <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&gt;&nbsp;variant,
-                <a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;aggrFunc,
-                <a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;aggrGroupOpt)</code>&nbsp;</td>
+<td class="colFirst"><code>static <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></code></td>
+<td class="colLast"><span class="typeNameLabel">NCSqlExtractorBuilder.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html#build-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCVariant-">build</a></span>(<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;schema,
+     <a href="../../../../../../../org/apache/nlpcraft/model/NCVariant.html" title="interface in org.apache.nlpcraft.model">NCVariant</a>&nbsp;variant)</code>
+<div class="block">Builds and returns new SQL extractor for given SQL schema and parsing variant.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -132,7 +132,7 @@
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
+<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
@@ -147,8 +147,8 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlAggregate.html" target="_top">Frames</a></li>
-<li><a href="NCSqlAggregate.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractor.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractor.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlException.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractorBuilder.html
similarity index 89%
rename from docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlException.html
rename to docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractorBuilder.html
index 72ec71b..f0142dd 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlException.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractorBuilder.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
+<!-- Generated by javadoc (1.8.0_161) on Fri Mar 27 11:31:46 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlException (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<title>Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractorBuilder (Apache NLPCraft 0.5.0)</title>
+<meta name="date" content="2020-03-27">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlException (Apache NLPCraft 0.5.0)";
+            parent.document.title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractorBuilder (Apache NLPCraft 0.5.0)";
         }
     }
     catch(err) {
@@ -35,7 +35,7 @@
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
+<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
@@ -50,8 +50,8 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlException.html" target="_top">Frames</a></li>
-<li><a href="NCSqlException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractorBuilder.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractorBuilder.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,9 +73,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlException" class="title">Uses of Class<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlException</h2>
+<h2 title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractorBuilder" class="title">Uses of Class<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractorBuilder</h2>
 </div>
-<div class="classUseContainer">No usage of org.apache.nlpcraft.model.tools.sqlgen.NCSqlException</div>
+<div class="classUseContainer">No usage of org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractorBuilder</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -87,7 +87,7 @@
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
+<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
@@ -102,8 +102,8 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlException.html" target="_top">Frames</a></li>
-<li><a href="NCSqlException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractorBuilder.html" target="_top">Frames</a></li>
+<li><a href="NCSqlExtractorBuilder.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlInCondition.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlInCondition.html
deleted file mode 100644
index d2094e5..0000000
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlInCondition.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlInCondition (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlInCondition (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></sc [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlInCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlInCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlInCondition" class="title">Uses of Interface<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlInCondition</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#org.apache.nlpcraft.model.tools.sqlgen">org.apache.nlpcraft.model.tools.sqlgen</a></td>
-<td class="colLast">
-<div class="block">Contains model stub generator for SQL RDBMS.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="org.apache.nlpcraft.model.tools.sqlgen">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a> that return types with arguments of type <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlUtils.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractValuesConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken...-">extractValuesConditions</a></span>(<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchem [...]
-                       <a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>...&nbsp;allValsToks)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlInCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlInCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlFunction.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoinType.html
similarity index 71%
rename from docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlFunction.html
rename to docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoinType.html
index 12ac1b3..9b23a60 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlFunction.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoinType.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
+<!-- Generated by javadoc (1.8.0_161) on Fri Mar 27 11:31:46 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlFunction (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<title>Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlJoinType (Apache NLPCraft 0.5.0)</title>
+<meta name="date" content="2020-03-27">
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlFunction (Apache NLPCraft 0.5.0)";
+            parent.document.title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlJoinType (Apache NLPCraft 0.5.0)";
         }
     }
     catch(err) {
@@ -35,7 +35,7 @@
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
+<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
@@ -50,8 +50,8 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlFunction.html" target="_top">Frames</a></li>
-<li><a href="NCSqlFunction.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoinType.html" target="_top">Frames</a></li>
+<li><a href="NCSqlJoinType.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,13 +73,13 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlFunction" class="title">Uses of Interface<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlFunction</h2>
+<h2 title="Uses of Class org.apache.nlpcraft.model.tools.sqlgen.NCSqlJoinType" class="title">Uses of Class<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlJoinType</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
 <li class="blockList">
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>Packages that use <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Package</th>
 <th class="colLast" scope="col">Description</th>
@@ -99,17 +99,32 @@
 <li class="blockList"><a name="org.apache.nlpcraft.model.tools.sqlgen">
 <!--   -->
 </a>
-<h3>Uses of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></h3>
+<h3>Uses of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></h3>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a> that return types with arguments of type <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>Methods in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a> that return <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlAggregate.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html#getSelect--">getSelect</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">NCSqlJoin.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getType--">getType</a></span>()</code>
+<div class="block">Gets type of the join.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">NCSqlJoinType.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#valueOf-java.lang.String-">valueOf</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>[]</code></td>
+<td class="colLast"><span class="typeNameLabel">NCSqlJoinType.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -129,7 +144,7 @@
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
+<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
@@ -144,8 +159,8 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlFunction.html" target="_top">Frames</a></li>
-<li><a href="NCSqlFunction.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoinType.html" target="_top">Frames</a></li>
+<li><a href="NCSqlJoinType.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlQuery.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlQuery.html
deleted file mode 100644
index 8003daa..0000000
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlQuery.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlQuery (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlQuery (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></sc [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlQuery.html" target="_top">Frames</a></li>
-<li><a href="NCSqlQuery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlQuery" class="title">Uses of Interface<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlQuery</h2>
-</div>
-<div class="classUseContainer">No usage of org.apache.nlpcraft.model.tools.sqlgen.NCSqlQuery</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlQuery.html" target="_top">Frames</a></li>
-<li><a href="NCSqlQuery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSimpleCondition.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSimpleCondition.html
deleted file mode 100644
index 33aa6ca..0000000
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSimpleCondition.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_161) on Sat Mar 14 13:34:59 PDT 2020 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlSimpleCondition (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
-<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlSimpleCondition (Apache NLPCraft 0.5.0)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">                             <script src="../../../../../../../resources/sh/scripts/XRegExp.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shCore.js" type="text/javascript"></script>                             <script src="../../../../../../../resources/sh/scripts/shAutoloader.js" type="text/javascript"></sc [...]
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></div>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSimpleCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlSimpleCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface org.apache.nlpcraft.model.tools.sqlgen.NCSqlSimpleCondition" class="title">Uses of Interface<br>org.apache.nlpcraft.model.tools.sqlgen.NCSqlSimpleCondition</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#org.apache.nlpcraft.model.tools.sqlgen">org.apache.nlpcraft.model.tools.sqlgen</a></td>
-<td class="colLast">
-<div class="block">Contains model stub generator for SQL RDBMS.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="org.apache.nlpcraft.model.tools.sqlgen">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a> in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a> that return types with arguments of type <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlUtils.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractDateRangeConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">extractDateRangeConditions</a></span>(<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nl [...]
-                          <a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok,
-                          <a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;dateTok)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlUtils.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractNumConditions-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCToken-org.apache.nlpcraft.model.NCToken-">extractNumConditions</a></span>(<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model [...]
-                    <a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;colTok,
-                    <a href="../../../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a>&nbsp;numTok)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../../../help-doc.html">Help</a></li>
-</ul>
-<div class="aboutLanguage"><span style="vertical-align: super">Apache NLPCraft <span style="font-size: 80%">0.5.0</span></span>                             <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft" target="github"><i class="fa fa-github github-logo"></i></a>                             <a class="github-button" href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples" data-icon [...]
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSimpleCondition.html" target="_top">Frames</a></li>
-<li><a href="NCSqlSimpleCondition.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><center>                                 <br/>                                 <span style="font-size: larger">Copyright &#169; 2020 Apache Software Foundation</span>                                 <br/>                                 <br/>                                 <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">                             </center></small></p>
-</body>
-</html>