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:47:24 UTC

[incubator-nlpcraft] branch master updated: Javadoc update.

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 cd1e9b5  Javadoc update.
cd1e9b5 is described below

commit cd1e9b537c46148e762ee42a42cb940bf9c18a58
Author: Aaron Radzinzski <ar...@datalingvo.com>
AuthorDate: Fri Mar 27 11:47:19 2020 -0700

    Javadoc update.
---
 docs/apis/javadoc-0.5.0/allclasses-frame.html      |  15 +-
 docs/apis/javadoc-0.5.0/allclasses-noframe.html    |  15 +-
 docs/apis/javadoc-0.5.0/constant-values.html       |   4 +-
 docs/apis/javadoc-0.5.0/deprecated-list.html       |   4 +-
 docs/apis/javadoc-0.5.0/help-doc.html              |   4 +-
 docs/apis/javadoc-0.5.0/index-all.html             | 278 +++++++++++++--------
 docs/apis/javadoc-0.5.0/index.html                 |   2 +-
 .../org/apache/nlpcraft/model/NCCompany.html       |   4 +-
 .../org/apache/nlpcraft/model/NCContext.html       |   4 +-
 .../org/apache/nlpcraft/model/NCConversation.html  |   4 +-
 .../org/apache/nlpcraft/model/NCCustomElement.html |   6 +-
 .../org/apache/nlpcraft/model/NCCustomParser.html  |   4 +-
 .../org/apache/nlpcraft/model/NCCustomWord.html    |   4 +-
 .../org/apache/nlpcraft/model/NCElement.html       |  33 ++-
 .../org/apache/nlpcraft/model/NCIntent.html        |   4 +-
 .../org/apache/nlpcraft/model/NCIntentMatch.html   |   4 +-
 .../org/apache/nlpcraft/model/NCIntentRef.html     |   4 +-
 .../org/apache/nlpcraft/model/NCIntentSkip.html    |  38 +--
 .../org/apache/nlpcraft/model/NCIntentTerm.html    |   4 +-
 .../org/apache/nlpcraft/model/NCLifecycle.html     |   4 +-
 .../org/apache/nlpcraft/model/NCMetadata.html      |  42 +++-
 .../org/apache/nlpcraft/model/NCModel.html         |   6 +-
 .../org/apache/nlpcraft/model/NCModelAdapter.html  |   6 +-
 .../org/apache/nlpcraft/model/NCModelFactory.html  |   4 +-
 .../apache/nlpcraft/model/NCModelFileAdapter.html  |   7 +-
 .../org/apache/nlpcraft/model/NCModelView.html     |   8 +-
 .../org/apache/nlpcraft/model/NCRejection.html     |  39 +--
 .../org/apache/nlpcraft/model/NCRequest.html       |   4 +-
 .../org/apache/nlpcraft/model/NCResult.html        |   4 +-
 .../org/apache/nlpcraft/model/NCToken.html         |  60 ++++-
 .../org/apache/nlpcraft/model/NCUser.html          |   4 +-
 .../org/apache/nlpcraft/model/NCValue.html         |   4 +-
 .../org/apache/nlpcraft/model/NCValueLoader.html   |   4 +-
 .../org/apache/nlpcraft/model/NCVariant.html       |   4 +-
 .../apache/nlpcraft/model/class-use/NCCompany.html |   4 +-
 .../apache/nlpcraft/model/class-use/NCContext.html |   4 +-
 .../nlpcraft/model/class-use/NCConversation.html   |   4 +-
 .../nlpcraft/model/class-use/NCCustomElement.html  |   4 +-
 .../nlpcraft/model/class-use/NCCustomParser.html   |   4 +-
 .../nlpcraft/model/class-use/NCCustomWord.html     |   4 +-
 .../apache/nlpcraft/model/class-use/NCElement.html |   4 +-
 .../apache/nlpcraft/model/class-use/NCIntent.html  |   4 +-
 .../nlpcraft/model/class-use/NCIntentMatch.html    |   4 +-
 .../nlpcraft/model/class-use/NCIntentRef.html      |   4 +-
 .../nlpcraft/model/class-use/NCIntentSkip.html     |   4 +-
 .../nlpcraft/model/class-use/NCIntentTerm.html     |   4 +-
 .../nlpcraft/model/class-use/NCLifecycle.html      |   4 +-
 .../nlpcraft/model/class-use/NCMetadata.html       |   4 +-
 .../apache/nlpcraft/model/class-use/NCModel.html   |   8 +-
 .../nlpcraft/model/class-use/NCModelAdapter.html   |   4 +-
 .../nlpcraft/model/class-use/NCModelFactory.html   |   4 +-
 .../model/class-use/NCModelFileAdapter.html        |   4 +-
 .../nlpcraft/model/class-use/NCModelView.html      |   4 +-
 .../nlpcraft/model/class-use/NCRejection.html      |   4 +-
 .../apache/nlpcraft/model/class-use/NCRequest.html |   4 +-
 .../apache/nlpcraft/model/class-use/NCResult.html  |   4 +-
 .../apache/nlpcraft/model/class-use/NCToken.html   | 109 ++------
 .../apache/nlpcraft/model/class-use/NCUser.html    |   4 +-
 .../apache/nlpcraft/model/class-use/NCValue.html   |   4 +-
 .../nlpcraft/model/class-use/NCValueLoader.html    |   4 +-
 .../apache/nlpcraft/model/class-use/NCVariant.html |  31 ++-
 .../model/factories/basic/NCBasicModelFactory.html |   4 +-
 .../basic/class-use/NCBasicModelFactory.html       |   4 +-
 .../model/factories/basic/package-frame.html       |   4 +-
 .../model/factories/basic/package-summary.html     |   4 +-
 .../model/factories/basic/package-tree.html        |   4 +-
 .../model/factories/basic/package-use.html         |   4 +-
 .../factories/spring/NCSpringModelFactory.html     |   4 +-
 .../spring/class-use/NCSpringModelFactory.html     |   4 +-
 .../model/factories/spring/package-frame.html      |   4 +-
 .../model/factories/spring/package-summary.html    |   4 +-
 .../model/factories/spring/package-tree.html       |   4 +-
 .../model/factories/spring/package-use.html        |   4 +-
 .../model/opencensus/NCBaseTraceExporter.html      |   4 +-
 .../model/opencensus/NCJaegerExporter.html         |   4 +-
 .../model/opencensus/NCPrometheusExporter.html     |   4 +-
 .../opencensus/NCStackdriverStatsExporter.html     |   4 +-
 .../opencensus/NCStackdriverTraceExporter.html     |   4 +-
 .../model/opencensus/NCZipkinExporter.html         |   4 +-
 .../opencensus/class-use/NCBaseTraceExporter.html  |   4 +-
 .../opencensus/class-use/NCJaegerExporter.html     |   4 +-
 .../opencensus/class-use/NCPrometheusExporter.html |   4 +-
 .../class-use/NCStackdriverStatsExporter.html      |   4 +-
 .../class-use/NCStackdriverTraceExporter.html      |   4 +-
 .../opencensus/class-use/NCZipkinExporter.html     |   4 +-
 .../nlpcraft/model/opencensus/package-frame.html   |   4 +-
 .../nlpcraft/model/opencensus/package-summary.html |   4 +-
 .../nlpcraft/model/opencensus/package-tree.html    |   4 +-
 .../nlpcraft/model/opencensus/package-use.html     |   4 +-
 .../org/apache/nlpcraft/model/package-frame.html   |  11 +-
 .../org/apache/nlpcraft/model/package-summary.html |  39 ++-
 .../org/apache/nlpcraft/model/package-tree.html    |  22 +-
 .../org/apache/nlpcraft/model/package-use.html     |   9 +-
 .../nlpcraft/model/tools/sqlgen/NCSqlColumn.html   | 120 ++++++++-
 .../model/tools/sqlgen/NCSqlDateRange.html         |  38 ++-
 .../nlpcraft/model/tools/sqlgen/NCSqlJoin.html     |  80 +++++-
 .../nlpcraft/model/tools/sqlgen/NCSqlLimit.html    |  41 ++-
 .../model/tools/sqlgen/NCSqlModelGenerator.html    |  48 +++-
 .../nlpcraft/model/tools/sqlgen/NCSqlSchema.html   |  61 ++++-
 .../model/tools/sqlgen/NCSqlSchemaBuilder.html     |  33 ++-
 .../nlpcraft/model/tools/sqlgen/NCSqlSort.html     |  27 +-
 .../nlpcraft/model/tools/sqlgen/NCSqlTable.html    | 134 +++++++++-
 .../model/tools/sqlgen/class-use/NCSqlColumn.html  |  43 ++--
 .../tools/sqlgen/class-use/NCSqlDateRange.html     |  10 +-
 .../model/tools/sqlgen/class-use/NCSqlJoin.html    |   8 +-
 .../model/tools/sqlgen/class-use/NCSqlLimit.html   |  12 +-
 .../sqlgen/class-use/NCSqlModelGenerator.html      |   4 +-
 .../model/tools/sqlgen/class-use/NCSqlSchema.html  |  57 +----
 .../tools/sqlgen/class-use/NCSqlSchemaBuilder.html |   4 +-
 .../model/tools/sqlgen/class-use/NCSqlSort.html    |  16 +-
 .../model/tools/sqlgen/class-use/NCSqlTable.html   |  15 +-
 .../nlpcraft/model/tools/sqlgen/package-frame.html |  19 +-
 .../model/tools/sqlgen/package-summary.html        |  81 +++---
 .../nlpcraft/model/tools/sqlgen/package-tree.html  |  41 ++-
 .../nlpcraft/model/tools/sqlgen/package-use.html   |  39 ++-
 .../nlpcraft/model/tools/test/NCTestClient.html    |  23 +-
 .../model/tools/test/NCTestClientBuilder.html      |   4 +-
 .../model/tools/test/NCTestClientException.html    |   4 +-
 .../nlpcraft/model/tools/test/NCTestResult.html    |   4 +-
 .../model/tools/test/class-use/NCTestClient.html   |   4 +-
 .../tools/test/class-use/NCTestClientBuilder.html  |   4 +-
 .../test/class-use/NCTestClientException.html      |   4 +-
 .../model/tools/test/class-use/NCTestResult.html   |   4 +-
 .../nlpcraft/model/tools/test/package-frame.html   |   4 +-
 .../nlpcraft/model/tools/test/package-summary.html |  27 +-
 .../nlpcraft/model/tools/test/package-tree.html    |   4 +-
 .../nlpcraft/model/tools/test/package-use.html     |   4 +-
 .../nlpcraft/probe/embedded/NCEmbeddedProbe.html   |   4 +-
 .../nlpcraft/probe/embedded/NCEmbeddedResult.html  |   4 +-
 .../probe/embedded/class-use/NCEmbeddedProbe.html  |   4 +-
 .../probe/embedded/class-use/NCEmbeddedResult.html |   4 +-
 .../nlpcraft/probe/embedded/package-frame.html     |   4 +-
 .../nlpcraft/probe/embedded/package-summary.html   |   4 +-
 .../nlpcraft/probe/embedded/package-tree.html      |   4 +-
 .../nlpcraft/probe/embedded/package-use.html       |   4 +-
 docs/apis/javadoc-0.5.0/overview-frame.html        |   4 +-
 docs/apis/javadoc-0.5.0/overview-summary.html      |   6 +-
 docs/apis/javadoc-0.5.0/overview-tree.html         |  41 +--
 docs/apis/javadoc-0.5.0/serialized-form.html       |  24 +-
 docs/apis/latest/allclasses-frame.html             |  15 +-
 docs/apis/latest/allclasses-noframe.html           |  15 +-
 docs/apis/latest/constant-values.html              |   4 +-
 docs/apis/latest/deprecated-list.html              |   4 +-
 docs/apis/latest/help-doc.html                     |   4 +-
 docs/apis/latest/index-all.html                    | 278 +++++++++++++--------
 docs/apis/latest/index.html                        |   2 +-
 .../org/apache/nlpcraft/model/NCCompany.html       |   4 +-
 .../org/apache/nlpcraft/model/NCContext.html       |   4 +-
 .../org/apache/nlpcraft/model/NCConversation.html  |   4 +-
 .../org/apache/nlpcraft/model/NCCustomElement.html |   6 +-
 .../org/apache/nlpcraft/model/NCCustomParser.html  |   4 +-
 .../org/apache/nlpcraft/model/NCCustomWord.html    |   4 +-
 .../org/apache/nlpcraft/model/NCElement.html       |  33 ++-
 .../latest/org/apache/nlpcraft/model/NCIntent.html |   4 +-
 .../org/apache/nlpcraft/model/NCIntentMatch.html   |   4 +-
 .../org/apache/nlpcraft/model/NCIntentRef.html     |   4 +-
 .../org/apache/nlpcraft/model/NCIntentSkip.html    |  38 +--
 .../org/apache/nlpcraft/model/NCIntentTerm.html    |   4 +-
 .../org/apache/nlpcraft/model/NCLifecycle.html     |   4 +-
 .../org/apache/nlpcraft/model/NCMetadata.html      |  42 +++-
 .../latest/org/apache/nlpcraft/model/NCModel.html  |   6 +-
 .../org/apache/nlpcraft/model/NCModelAdapter.html  |   6 +-
 .../org/apache/nlpcraft/model/NCModelFactory.html  |   4 +-
 .../apache/nlpcraft/model/NCModelFileAdapter.html  |   7 +-
 .../org/apache/nlpcraft/model/NCModelView.html     |   8 +-
 .../org/apache/nlpcraft/model/NCRejection.html     |  39 +--
 .../org/apache/nlpcraft/model/NCRequest.html       |   4 +-
 .../latest/org/apache/nlpcraft/model/NCResult.html |   4 +-
 .../latest/org/apache/nlpcraft/model/NCToken.html  |  60 ++++-
 .../latest/org/apache/nlpcraft/model/NCUser.html   |   4 +-
 .../latest/org/apache/nlpcraft/model/NCValue.html  |   4 +-
 .../org/apache/nlpcraft/model/NCValueLoader.html   |   4 +-
 .../org/apache/nlpcraft/model/NCVariant.html       |   4 +-
 .../apache/nlpcraft/model/class-use/NCCompany.html |   4 +-
 .../apache/nlpcraft/model/class-use/NCContext.html |   4 +-
 .../nlpcraft/model/class-use/NCConversation.html   |   4 +-
 .../nlpcraft/model/class-use/NCCustomElement.html  |   4 +-
 .../nlpcraft/model/class-use/NCCustomParser.html   |   4 +-
 .../nlpcraft/model/class-use/NCCustomWord.html     |   4 +-
 .../apache/nlpcraft/model/class-use/NCElement.html |   4 +-
 .../apache/nlpcraft/model/class-use/NCIntent.html  |   4 +-
 .../nlpcraft/model/class-use/NCIntentMatch.html    |   4 +-
 .../nlpcraft/model/class-use/NCIntentRef.html      |   4 +-
 .../nlpcraft/model/class-use/NCIntentSkip.html     |   4 +-
 .../nlpcraft/model/class-use/NCIntentTerm.html     |   4 +-
 .../nlpcraft/model/class-use/NCLifecycle.html      |   4 +-
 .../nlpcraft/model/class-use/NCMetadata.html       |   4 +-
 .../apache/nlpcraft/model/class-use/NCModel.html   |   8 +-
 .../nlpcraft/model/class-use/NCModelAdapter.html   |   4 +-
 .../nlpcraft/model/class-use/NCModelFactory.html   |   4 +-
 .../model/class-use/NCModelFileAdapter.html        |   4 +-
 .../nlpcraft/model/class-use/NCModelView.html      |   4 +-
 .../nlpcraft/model/class-use/NCRejection.html      |   4 +-
 .../apache/nlpcraft/model/class-use/NCRequest.html |   4 +-
 .../apache/nlpcraft/model/class-use/NCResult.html  |   4 +-
 .../apache/nlpcraft/model/class-use/NCToken.html   | 109 ++------
 .../apache/nlpcraft/model/class-use/NCUser.html    |   4 +-
 .../apache/nlpcraft/model/class-use/NCValue.html   |   4 +-
 .../nlpcraft/model/class-use/NCValueLoader.html    |   4 +-
 .../apache/nlpcraft/model/class-use/NCVariant.html |  31 ++-
 .../model/factories/basic/NCBasicModelFactory.html |   4 +-
 .../basic/class-use/NCBasicModelFactory.html       |   4 +-
 .../model/factories/basic/package-frame.html       |   4 +-
 .../model/factories/basic/package-summary.html     |   4 +-
 .../model/factories/basic/package-tree.html        |   4 +-
 .../model/factories/basic/package-use.html         |   4 +-
 .../factories/spring/NCSpringModelFactory.html     |   4 +-
 .../spring/class-use/NCSpringModelFactory.html     |   4 +-
 .../model/factories/spring/package-frame.html      |   4 +-
 .../model/factories/spring/package-summary.html    |   4 +-
 .../model/factories/spring/package-tree.html       |   4 +-
 .../model/factories/spring/package-use.html        |   4 +-
 .../model/opencensus/NCBaseTraceExporter.html      |   4 +-
 .../model/opencensus/NCJaegerExporter.html         |   4 +-
 .../model/opencensus/NCPrometheusExporter.html     |   4 +-
 .../opencensus/NCStackdriverStatsExporter.html     |   4 +-
 .../opencensus/NCStackdriverTraceExporter.html     |   4 +-
 .../model/opencensus/NCZipkinExporter.html         |   4 +-
 .../opencensus/class-use/NCBaseTraceExporter.html  |   4 +-
 .../opencensus/class-use/NCJaegerExporter.html     |   4 +-
 .../opencensus/class-use/NCPrometheusExporter.html |   4 +-
 .../class-use/NCStackdriverStatsExporter.html      |   4 +-
 .../class-use/NCStackdriverTraceExporter.html      |   4 +-
 .../opencensus/class-use/NCZipkinExporter.html     |   4 +-
 .../nlpcraft/model/opencensus/package-frame.html   |   4 +-
 .../nlpcraft/model/opencensus/package-summary.html |   4 +-
 .../nlpcraft/model/opencensus/package-tree.html    |   4 +-
 .../nlpcraft/model/opencensus/package-use.html     |   4 +-
 .../org/apache/nlpcraft/model/package-frame.html   |  11 +-
 .../org/apache/nlpcraft/model/package-summary.html |  39 ++-
 .../org/apache/nlpcraft/model/package-tree.html    |  22 +-
 .../org/apache/nlpcraft/model/package-use.html     |   9 +-
 .../nlpcraft/model/tools/sqlgen/NCSqlColumn.html   | 120 ++++++++-
 .../model/tools/sqlgen/NCSqlDateRange.html         |  38 ++-
 .../nlpcraft/model/tools/sqlgen/NCSqlJoin.html     |  80 +++++-
 .../nlpcraft/model/tools/sqlgen/NCSqlLimit.html    |  41 ++-
 .../model/tools/sqlgen/NCSqlModelGenerator.html    |  48 +++-
 .../nlpcraft/model/tools/sqlgen/NCSqlSchema.html   |  61 ++++-
 .../model/tools/sqlgen/NCSqlSchemaBuilder.html     |  33 ++-
 .../nlpcraft/model/tools/sqlgen/NCSqlSort.html     |  27 +-
 .../nlpcraft/model/tools/sqlgen/NCSqlTable.html    | 134 +++++++++-
 .../model/tools/sqlgen/class-use/NCSqlColumn.html  |  43 ++--
 .../tools/sqlgen/class-use/NCSqlDateRange.html     |  10 +-
 .../model/tools/sqlgen/class-use/NCSqlJoin.html    |   8 +-
 .../model/tools/sqlgen/class-use/NCSqlLimit.html   |  12 +-
 .../sqlgen/class-use/NCSqlModelGenerator.html      |   4 +-
 .../model/tools/sqlgen/class-use/NCSqlSchema.html  |  57 +----
 .../tools/sqlgen/class-use/NCSqlSchemaBuilder.html |   4 +-
 .../model/tools/sqlgen/class-use/NCSqlSort.html    |  16 +-
 .../model/tools/sqlgen/class-use/NCSqlTable.html   |  15 +-
 .../nlpcraft/model/tools/sqlgen/package-frame.html |  19 +-
 .../model/tools/sqlgen/package-summary.html        |  81 +++---
 .../nlpcraft/model/tools/sqlgen/package-tree.html  |  41 ++-
 .../nlpcraft/model/tools/sqlgen/package-use.html   |  39 ++-
 .../nlpcraft/model/tools/test/NCTestClient.html    |  23 +-
 .../model/tools/test/NCTestClientBuilder.html      |   4 +-
 .../model/tools/test/NCTestClientException.html    |   4 +-
 .../nlpcraft/model/tools/test/NCTestResult.html    |   4 +-
 .../model/tools/test/class-use/NCTestClient.html   |   4 +-
 .../tools/test/class-use/NCTestClientBuilder.html  |   4 +-
 .../test/class-use/NCTestClientException.html      |   4 +-
 .../model/tools/test/class-use/NCTestResult.html   |   4 +-
 .../nlpcraft/model/tools/test/package-frame.html   |   4 +-
 .../nlpcraft/model/tools/test/package-summary.html |  27 +-
 .../nlpcraft/model/tools/test/package-tree.html    |   4 +-
 .../nlpcraft/model/tools/test/package-use.html     |   4 +-
 .../nlpcraft/probe/embedded/NCEmbeddedProbe.html   |   4 +-
 .../nlpcraft/probe/embedded/NCEmbeddedResult.html  |   4 +-
 .../probe/embedded/class-use/NCEmbeddedProbe.html  |   4 +-
 .../probe/embedded/class-use/NCEmbeddedResult.html |   4 +-
 .../nlpcraft/probe/embedded/package-frame.html     |   4 +-
 .../nlpcraft/probe/embedded/package-summary.html   |   4 +-
 .../nlpcraft/probe/embedded/package-tree.html      |   4 +-
 .../nlpcraft/probe/embedded/package-use.html       |   4 +-
 docs/apis/latest/overview-frame.html               |   4 +-
 docs/apis/latest/overview-summary.html             |   6 +-
 docs/apis/latest/overview-tree.html                |  41 +--
 docs/apis/latest/serialized-form.html              |  24 +-
 278 files changed, 2612 insertions(+), 1788 deletions(-)

diff --git a/docs/apis/javadoc-0.5.0/allclasses-frame.html b/docs/apis/javadoc-0.5.0/allclasses-frame.html
index d4683c8..4f88ed1 100644
--- a/docs/apis/javadoc-0.5.0/allclasses-frame.html
+++ b/docs/apis/javadoc-0.5.0/allclasses-frame.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>All Classes (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -42,23 +42,18 @@
 <li><a href="org/apache/nlpcraft/model/NCRequest.html" title="interface in org.apache.nlpcraft.model" target="classFrame"><span class="interfaceName">NCRequest</span></a></li>
 <li><a href="org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCResult</a></li>
 <li><a href="org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html" title="class in org.apache.nlpcraft.model.factories.spring" target="classFrame">NCSpringModelFactory</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlAggregate</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlColumn</span></a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlCondition</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlDateRange</span></a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlException</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlFunction</span></a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlInCondition</span></a></li>
+<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlExtractor</span></a></li>
+<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlExtractorBuilder</a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlJoin</span></a></li>
+<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlJoinType</a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlLimit</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlModelGenerator</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlQuery</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlSchema</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlSchemaBuilder</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlSimpleCondition</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlSort</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlTable</span></a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlUtils</a></li>
 <li><a href="org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.html" title="class in org.apache.nlpcraft.model.opencensus" target="classFrame">NCStackdriverStatsExporter</a></li>
 <li><a href="org/apache/nlpcraft/model/opencensus/NCStackdriverTraceExporter.html" title="class in org.apache.nlpcraft.model.opencensus" target="classFrame">NCStackdriverTraceExporter</a></li>
 <li><a href="org/apache/nlpcraft/model/tools/test/NCTestClient.html" title="interface in org.apache.nlpcraft.model.tools.test" target="classFrame"><span class="interfaceName">NCTestClient</span></a></li>
diff --git a/docs/apis/javadoc-0.5.0/allclasses-noframe.html b/docs/apis/javadoc-0.5.0/allclasses-noframe.html
index 6e3ae92..d61f38c 100644
--- a/docs/apis/javadoc-0.5.0/allclasses-noframe.html
+++ b/docs/apis/javadoc-0.5.0/allclasses-noframe.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>All Classes (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -42,23 +42,18 @@
 <li><a href="org/apache/nlpcraft/model/NCRequest.html" title="interface in org.apache.nlpcraft.model"><span class="interfaceName">NCRequest</span></a></li>
 <li><a href="org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model">NCResult</a></li>
 <li><a href="org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html" title="class in org.apache.nlpcraft.model.factories.spring">NCSpringModelFactory</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlAggregate</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlColumn</span></a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlCondition</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="interfaceName">NCSqlDateRange</span></a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlException</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlFunction</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="interfaceName">NCSqlInCondition</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="interfaceName">NCSqlExtractor</span></a></li>
+<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractorBuilder</a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlJoin</span></a></li>
+<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlLimit</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlModelGenerator</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlQuery</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="interfaceName">NCSqlSchema</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchemaBuilder</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlSimpleCondition</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="interfaceName">NCSqlSort</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlTable</span></a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></li>
 <li><a href="org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.html" title="class in org.apache.nlpcraft.model.opencensus">NCStackdriverStatsExporter</a></li>
 <li><a href="org/apache/nlpcraft/model/opencensus/NCStackdriverTraceExporter.html" title="class in org.apache.nlpcraft.model.opencensus">NCStackdriverTraceExporter</a></li>
 <li><a href="org/apache/nlpcraft/model/tools/test/NCTestClient.html" title="interface in org.apache.nlpcraft.model.tools.test"><span class="interfaceName">NCTestClient</span></a></li>
diff --git a/docs/apis/javadoc-0.5.0/constant-values.html b/docs/apis/javadoc-0.5.0/constant-values.html
index 92bea72..4d669a1 100644
--- a/docs/apis/javadoc-0.5.0/constant-values.html
+++ b/docs/apis/javadoc-0.5.0/constant-values.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>Constant Field Values (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/deprecated-list.html b/docs/apis/javadoc-0.5.0/deprecated-list.html
index 61a0e23..3c9cd36 100644
--- a/docs/apis/javadoc-0.5.0/deprecated-list.html
+++ b/docs/apis/javadoc-0.5.0/deprecated-list.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Deprecated List (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/help-doc.html b/docs/apis/javadoc-0.5.0/help-doc.html
index edbafbd..1623926 100644
--- a/docs/apis/javadoc-0.5.0/help-doc.html
+++ b/docs/apis/javadoc-0.5.0/help-doc.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>API Help (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/index-all.html b/docs/apis/javadoc-0.5.0/index-all.html
index 580e529..194e59e 100644
--- a/docs/apis/javadoc-0.5.0/index-all.html
+++ b/docs/apis/javadoc-0.5.0/index-all.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Index (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -72,7 +72,7 @@
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a> [...]
+<div class="contentContainer"><a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a> [...]
 <!--   -->
 </a>
 <h2 class="title">A</h2>
@@ -87,6 +87,10 @@
 </a>
 <h2 class="title">B</h2>
 <dl>
+<dt><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(NCSqlSchema, NCVariant)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractorBuilder</a></dt>
+<dd>
+<div class="block">Builds and returns new SQL extractor for given SQL schema and parsing variant.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/test/NCTestClientBuilder.html#build--">build()</a></span> - Method in class org.apache.nlpcraft.model.tools.test.<a href="org/apache/nlpcraft/model/tools/test/NCTestClientBuilder.html" title="class in org.apache.nlpcraft.model.tools.test">NCTestClientBuilder</a></dt>
 <dd>
 <div class="block">Build new configured test client instance.</div>
@@ -229,32 +233,32 @@
 </a>
 <h2 class="title">E</h2>
 <dl>
-<dt><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(NCSqlSchema, List&lt;NCToken&gt;, NCToken, NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcra [...]
-<dd>&nbsp;</dd>
-<dt><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(NCSqlSchema, NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractDateRange-org.apache.nlpcraft.model.NCToken-">extractDateRange(NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
-<dt><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(NCSqlSchema, NCToken, NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.s [...]
-<dd>&nbsp;</dd>
-<dt><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(NCSqlSchema, List&lt;NCToken&gt;, NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
-<dt><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(NCSqlSchema, NCToken, NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSql [...]
-<dd>&nbsp;</dd>
-<dt><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(NCSqlSchema, List&lt;NCToken&gt;, NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
-<dt><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(NCSqlSchema, NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
-<dt><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(NCSqlSchema, NCToken...)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractColumn-org.apache.nlpcraft.model.NCToken-">extractColumn(NCToken)</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></dt>
+<dd>
+<div class="block">Extract column object from the token.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractDateRange-org.apache.nlpcraft.model.NCToken-">extractDateRange(NCToken)</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></dt>
+<dd>
+<div class="block">Extract date range object from given <code>nlpcraft:date</code> token.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractLimit-org.apache.nlpcraft.model.NCToken-">extractLimit(NCToken)</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></dt>
+<dd>
+<div class="block">Extracts limit object from given <code>nlpcraft:limit</code> token.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractSort-org.apache.nlpcraft.model.NCToken-">extractSort(NCToken)</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></dt>
+<dd>
+<div class="block">Extracts sort object from given <code>nlpcraft:sort</code> token.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractTable-org.apache.nlpcraft.model.NCToken-">extractTable(NCToken)</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></dt>
+<dd>
+<div class="block">Extract table object from the token.</div>
+</dd>
 </dl>
 <a name="I:F">
 <!--   -->
 </a>
 <h2 class="title">F</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#findAnyColumnToken-org.apache.nlpcraft.model.NCToken-">findAnyColumnToken(NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCToken.html#findPartTokens-java.lang.String...-">findPartTokens(String...)</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a></dt>
 <dd>
 <div class="block">Gets the list of all part tokens with given IDs or aliases traversing entire part token graph.</div>
@@ -279,6 +283,10 @@
 <dd>
 <div class="block">Gets optional list of aliases this token is known by.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getAllColumns--">getAllColumns()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a></dt>
+<dd>
+<div class="block">Creates and returns collection of all SQL columns across all tables in given schema.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCToken.html#getAncestors--">getAncestors()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a></dt>
 <dd>
 <div class="block">Gets the list of all parent IDs from this token up to the root.</div>
@@ -305,17 +313,21 @@
  this request.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#getColumn--">getColumn()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html#getColumn--">getColumn()</a></span> - Method in interface 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></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html#getColumn--">getColumn()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets native name of this column.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#getColumn--">getColumn()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets SQL column this limit is applied.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html#getColumn--">getColumn()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets SQL column by which to sort.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getColumns--">getColumns()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets collections of this table columns.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCRequest.html#getCompany--">getCompany()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCRequest.html" title="interface in org.apache.nlpcraft.model">NCRequest</a></dt>
 <dd>
 <div class="block">Gets descriptor of the user's company on behalf of which this request was submitted.</div>
@@ -337,15 +349,22 @@
 <div class="block">Gets optional JSON data passed in with user request.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#getDataType--">getDataType()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets JDBC <a target="./org/apache/nlpcraft/model/tools/sqlgen/new" href="https://docs.oracle.com/javase/8/docs/api/java/sql/Types.html">data type</a>
+ for this column.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultDate--">getDefaultDate()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></dt>
 <dd>
-<div class="block">Note that this columns can contains to another table.</div>
+<div class="block">Gets a column that defines a default date for this table.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSelect--">getDefaultSelect()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets the list of the column names for the default select set.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSort--">getDefaultSort()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets default sort descriptor.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCElement.html#getDescription--">getDescription()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCElement.html" title="interface in org.apache.nlpcraft.model">NCElement</a></dt>
 <dd>
 <div class="block">Gets optional element description.</div>
@@ -405,21 +424,25 @@
 <div class="block">Gets an optional list of stopwords to exclude from the built-in list of stopwords.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getExtraTables--">getExtraTables()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets the list of extra tables this table is referencing.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCUser.html#getFirstName--">getFirstName()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCUser.html" title="interface in org.apache.nlpcraft.model">NCUser</a></dt>
 <dd>
 <div class="block">Gets first name of the user.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html#getFrom--">getFrom()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlDateRange</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets 'from' timestamp.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getFromColumns--">getFromColumns()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets the list of columns in originating table.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getFromTable--">getFromTable()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html#getFunction--">getFunction()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html#getGroupBy--">getGroupBy()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets the name of the originating table.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCElement.html#getGroups--">getGroups()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCElement.html" title="interface in org.apache.nlpcraft.model">NCElement</a></dt>
 <dd>
 <div class="block">Gets the list of groups this elements belongs to.</div>
@@ -477,7 +500,9 @@
  match the multi-word synonyms.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getJoins--">getJoins()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets collection of joins for this SQL schema.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCUser.html#getLastName--">getLastName()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCUser.html" title="interface in org.apache.nlpcraft.model">NCUser</a></dt>
 <dd>
 <div class="block">Gets last name of the user.</div>
@@ -487,7 +512,9 @@
 <div class="block">Gets the lemma of this word, a canonical form of this word.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#getLimit--">getLimit()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets the numeric value of the limit.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.html#getLogHolder--">getLogHolder()</a></span> - Method in interface org.apache.nlpcraft.probe.embedded.<a href="org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.html" title="interface in org.apache.nlpcraft.probe.embedded">NCEmbeddedResult</a></dt>
 <dd>
 <div class="block">Gets request processing log holder as JSON string.</div>
@@ -620,8 +647,6 @@
 <dd>
 <div class="block">Gets normalized text of the user input.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html#getOperation--">getOperation()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCModelFileAdapter.html#getOrigin--">getOrigin()</a></span> - Method in class org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model">NCModelFileAdapter</a></dt>
 <dd>
 <div class="block">Gets this file model adapter origin (file path or URI).</div>
@@ -638,8 +663,6 @@
 <dd>
 <div class="block">Gets original text of the request that produced this result.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html#getParameters--">getParameters()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlQuery</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCElement.html#getParentId--">getParentId()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCElement.html" title="interface in org.apache.nlpcraft.model">NCElement</a></dt>
 <dd>
 <div class="block">Gets optional ID of the immediate parent element.</div>
@@ -710,8 +733,6 @@
 <dd>
 <div class="block">Gets optional execution result type.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html#getSelect--">getSelect()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCContext.html#getServerRequestId--">getServerRequestId()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCContext.html" title="interface in org.apache.nlpcraft.model">NCContext</a></dt>
 <dd>
 <div class="block">Gets globally unique ID of the current request.</div>
@@ -732,8 +753,6 @@
 <dd>
 <div class="block">Gets signup timestamp of the user.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html#getSql--">getSql()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlQuery</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCCustomWord.html#getStartCharIndex--">getStartCharIndex()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCCustomWord.html" title="interface in org.apache.nlpcraft.model">NCCustomWord</a></dt>
 <dd>
 <div class="block">Gets start character index of this word in the original text.</div>
@@ -761,11 +780,17 @@
 <div class="block">Gets optional list of value's synonyms.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#getTable--">getTable()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets name of the table this column belongs to.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getTable--">getTable()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets table name.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getTables--">getTables()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets collection of tables for this SQL schema.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCIntentMatch.html#getTermTokens-int-">getTermTokens(int)</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentMatch.html" title="interface in org.apache.nlpcraft.model">NCIntentMatch</a></dt>
 <dd>
 <div class="block">Gets tokens for given term.</div>
@@ -779,9 +804,13 @@
 <div class="block">Gets test sentence text.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html#getTo--">getTo()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlDateRange</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets 'to' timestamp.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getToColumns--">getToColumns()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets the list of columns in target table.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCConversation.html#getTokens--">getTokens()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCConversation.html" title="interface in org.apache.nlpcraft.model">NCConversation</a></dt>
 <dd>
 <div class="block">Gets an ordered list of tokens stored in the conversation STM for the current
@@ -792,11 +821,17 @@
 <div class="block">Gets tokens that were used to produce this query result.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getToTable--">getToTable()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets the name of the target table.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCResult.html#getType--">getType()</a></span> - Method in class org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model">NCResult</a></dt>
 <dd>
 <div class="block">Gets result type.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getType--">getType()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a></dt>
+<dd>
+<div class="block">Gets type of the join.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.html#getType--">getType()</a></span> - Method in interface org.apache.nlpcraft.probe.embedded.<a href="org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.html" title="interface in org.apache.nlpcraft.probe.embedded">NCEmbeddedResult</a></dt>
 <dd>
 <div class="block">Gets optional result type.</div>
@@ -817,8 +852,6 @@
 <dd>
 <div class="block">Gets the value if this token was detected via element's value (or its synonyms).</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html#getValue--">getValue()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCElement.html#getValueLoader--">getValueLoader()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCElement.html" title="interface in org.apache.nlpcraft.model">NCElement</a></dt>
 <dd>
 <div class="block">Gets optional dynamic value loader.</div>
@@ -827,8 +860,6 @@
 <dd>
 <div class="block">Gets optional map of <a href="org/apache/nlpcraft/model/NCValue.html" title="interface in org.apache.nlpcraft.model"><code>values</code></a> for this element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html#getValues--">getValues()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCIntentMatch.html#getVariant--">getVariant()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentMatch.html" title="interface in org.apache.nlpcraft.model">NCIntentMatch</a></dt>
 <dd>
 <div class="block">Gets sentence parsing variant that produced the matching for this intent.</div>
@@ -886,9 +917,13 @@
 <div class="block">Indicates whether or not the intent match was ambiguous (not exact).</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#isAscending--">isAscending()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets whether limit ascending or descending.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html#isAscending--">isAscending()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets sorting direction.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCCustomWord.html#isBracketed--">isBracketed()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCCustomWord.html" title="interface in org.apache.nlpcraft.model">NCCustomWord</a></dt>
 <dd>
 <div class="block">Gets whether or not this word is surrounded by any of <code>'[', ']', '{', '}', '(', ')'</code> brackets.</div>
@@ -919,6 +954,14 @@
 <dd>
 <div class="block">Tests whether or not this token is found in Princeton WordNet database.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCElement.html#isMemberOf-java.lang.String-">isMemberOf(String)</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCElement.html" title="interface in org.apache.nlpcraft.model">NCElement</a></dt>
+<dd>
+<div class="block">Shortcut method to test if this element is a member of given group.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCToken.html#isMemberOf-java.lang.String-">isMemberOf(String)</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a></dt>
+<dd>
+<div class="block">Tests whether or not this token belongs to the given group.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCModelFileAdapter.html#isNonEnglishAllowed--">isNonEnglishAllowed()</a></span> - Method in class org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model">NCModelFileAdapter</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCModelView.html#isNonEnglishAllowed--">isNonEnglishAllowed()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCModelView.html" title="interface in org.apache.nlpcraft.model">NCModelView</a></dt>
@@ -944,7 +987,13 @@
 <div class="block">Whether or not to allow the user input with no user token detected.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#isNullable--">isNullable()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Tests whether or not this column is nullable.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCToken.html#isOfAlias-java.lang.String-">isOfAlias(String)</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a></dt>
+<dd>
+<div class="block">Tests whether or not this token has given alias.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/test/NCTestResult.html#isOk--">isOk()</a></span> - Method in interface org.apache.nlpcraft.model.tools.test.<a href="org/apache/nlpcraft/model/tools/test/NCTestResult.html" title="interface in org.apache.nlpcraft.model.tools.test">NCTestResult</a></dt>
 <dd>
 <div class="block">Tests whether or not this result corresponds to a successful execution.</div>
@@ -960,7 +1009,9 @@
 <div class="block">Whether or not to permutate multi-word synonyms.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#isPk--">isPk()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Tests whether or not this column is a primary key column.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCCustomWord.html#isQuoted--">isQuoted()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCCustomWord.html" title="interface in org.apache.nlpcraft.model">NCCustomWord</a></dt>
 <dd>
 <div class="block">Gets whether or not this word is surrounded by single or double quotes.</div>
@@ -1022,7 +1073,9 @@
 <div class="block">Runs SQL model generator with given command line parameters.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-">makeSchema(NCModel)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchemaBuilder</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Builds object presentation for SQL schema from given data model.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta(String)</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></dt>
 <dd>
 <div class="block">Shortcut method to get given metadata property.</div>
@@ -1035,6 +1088,10 @@
 <dd>
 <div class="block">Shortcut method to get given optional metadata property.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax(String)</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></dt>
+<dd>
+<div class="block">Shortcut method to get given mandatory metadata property.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/factories/basic/NCBasicModelFactory.html#mkModel-java.lang.Class-">mkModel(Class&lt;? extends NCModel&gt;)</a></span> - Method in class org.apache.nlpcraft.model.factories.basic.<a href="org/apache/nlpcraft/model/factories/basic/NCBasicModelFactory.html" title="class in org.apache.nlpcraft.model.factories.basic">NCBasicModelFactory</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html#mkModel-java.lang.Class-">mkModel(Class&lt;? extends NCModel&gt;)</a></span> - Method in class org.apache.nlpcraft.model.factories.spring.<a href="org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html" title="class in org.apache.nlpcraft.model.factories.spring">NCSpringModelFactory</a></dt>
@@ -1113,15 +1170,15 @@
 <dd>
 <div class="block">Annotations referencing an intent defined externally in JSON or YAML model declaration.</div>
 </dd>
-<dt><a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCIntentSkip</span></a> - Exception in <a href="org/apache/nlpcraft/model/package-summary.html">org.apache.nlpcraft.model</a></dt>
+<dt><a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCIntentSkip</span></a> - Class in <a href="org/apache/nlpcraft/model/package-summary.html">org.apache.nlpcraft.model</a></dt>
 <dd>
 <div class="block">Control flow exception to skip current intent.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCIntentSkip.html#NCIntentSkip--">NCIntentSkip()</a></span> - Constructor for exception org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model">NCIntentSkip</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCIntentSkip.html#NCIntentSkip--">NCIntentSkip()</a></span> - Constructor for class org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model">NCIntentSkip</a></dt>
 <dd>
 <div class="block">Creates new intent skip exception.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCIntentSkip.html#NCIntentSkip-java.lang.String-">NCIntentSkip(String)</a></span> - Constructor for exception org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model">NCIntentSkip</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCIntentSkip.html#NCIntentSkip-java.lang.String-">NCIntentSkip(String)</a></span> - Constructor for class org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model">NCIntentSkip</a></dt>
 <dd>
 <div class="block">Creates new intent skip exception with given debug message.</div>
 </dd>
@@ -1183,15 +1240,15 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/opencensus/NCPrometheusExporter.html#NCPrometheusExporter--">NCPrometheusExporter()</a></span> - Constructor for class org.apache.nlpcraft.model.opencensus.<a href="org/apache/nlpcraft/model/opencensus/NCPrometheusExporter.html" title="class in org.apache.nlpcraft.model.opencensus">NCPrometheusExporter</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCRejection</span></a> - Exception in <a href="org/apache/nlpcraft/model/package-summary.html">org.apache.nlpcraft.model</a></dt>
+<dt><a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCRejection</span></a> - Class in <a href="org/apache/nlpcraft/model/package-summary.html">org.apache.nlpcraft.model</a></dt>
 <dd>
 <div class="block">Exception to indicate that user input cannot be processed as is.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCRejection.html#NCRejection-java.lang.String-">NCRejection(String)</a></span> - Constructor for exception org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model">NCRejection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCRejection.html#NCRejection-java.lang.String-">NCRejection(String)</a></span> - Constructor for class org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model">NCRejection</a></dt>
 <dd>
 <div class="block">Creates new rejection exception with given message.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCRejection.html#NCRejection-java.lang.String-java.lang.Throwable-">NCRejection(String, Throwable)</a></span> - Constructor for exception org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model">NCRejection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCRejection.html#NCRejection-java.lang.String-java.lang.Throwable-">NCRejection(String, Throwable)</a></span> - Constructor for class org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model">NCRejection</a></dt>
 <dd>
 <div class="block">Creates new rejection exception with given message and cause.</div>
 </dd>
@@ -1217,68 +1274,60 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html#NCSpringModelFactory--">NCSpringModelFactory()</a></span> - Constructor for class org.apache.nlpcraft.model.factories.spring.<a href="org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html" title="class in org.apache.nlpcraft.model.factories.spring">NCSpringModelFactory</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlAggregate</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlColumn</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL column.</div>
 </dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlCondition</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlDateRange</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL date range.</div>
 </dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlException</span></a> - Exception in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html#NCSqlException-java.lang.String-">NCSqlException(String)</a></span> - Constructor for exception org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html#NCSqlException-java.lang.String-java.lang.Throwable-">NCSqlException(String, Throwable)</a></span> - Constructor for exception org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlException</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlFunction</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlInCondition</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
+<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlExtractor</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
+<dd>
+<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.</div>
+</dd>
+<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlExtractorBuilder</span></a> - Class in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
+<dd>
+<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>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html#NCSqlExtractorBuilder--">NCSqlExtractorBuilder()</a></span> - Constructor for class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractorBuilder</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlJoin</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL join (foreign key).</div>
+</dd>
+<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlJoinType</span></a> - Enum in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
+<dd>
+<div class="block">Type of the SQL join.</div>
 </dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlLimit</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL limit.</div>
 </dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlModelGenerator</span></a> - Class in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">Command line utility to generate NLPCraft model stub from given SQL RDBMS.</div>
+<div class="block">Command line utility to generate YAML/JSON NLPCraft model stub from given SQL RDBMS.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html#NCSqlModelGenerator--">NCSqlModelGenerator()</a></span> - Constructor for class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlModelGenerator</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlQuery</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSchema</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL schema.</div>
 </dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSchemaBuilder</span></a> - Class in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Builder for <a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlSchema</code></a> instances.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#NCSqlSchemaBuilder--">NCSqlSchemaBuilder()</a></span> - Constructor for class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchemaBuilder</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSimpleCondition</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSort</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL sorting.</div>
 </dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlTable</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">TODO: add description.</div>
-</dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlUtils</span></a> - Class in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL table.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#NCSqlUtils--">NCSqlUtils()</a></span> - Constructor for class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.html" title="class in org.apache.nlpcraft.model.opencensus"><span class="typeNameLink">NCStackdriverStatsExporter</span></a> - Class in <a href="org/apache/nlpcraft/model/opencensus/package-summary.html">org.apache.nlpcraft.model.opencensus</a></dt>
 <dd>
 <div class="block">Probe lifecycle component that manages OpenCensus <a target=_ href="https://cloud.google.com/stackdriver/">Stackdriver</a> stats exporter.</div>
@@ -1532,6 +1581,21 @@
 <div class="block">Unregisters previously registered callback.</div>
 </dd>
 </dl>
+<a name="I:V">
+<!--   -->
+</a>
+<h2 class="title">V</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></dt>
+<dd>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#values--">values()</a></span> - Static method in enum org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></dt>
+<dd>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</dd>
+</dl>
 <a name="I:X">
 <!--   -->
 </a>
@@ -1552,7 +1616,7 @@
 <div class="block">Creates <code>yaml</code> result.</div>
 </dd>
 </dl>
-<a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbs [...]
+<a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbs [...]
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/docs/apis/javadoc-0.5.0/index.html b/docs/apis/javadoc-0.5.0/index.html
index 9b10d67..bea8516 100644
--- a/docs/apis/javadoc-0.5.0/index.html
+++ b/docs/apis/javadoc-0.5.0/index.html
@@ -2,7 +2,7 @@
 <!-- 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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Apache NLPCraft 0.5.0</title>
 <script type="text/javascript">
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCompany.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCompany.html
index cb3e867..ed84cb0 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCompany.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCompany.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>NCCompany (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCContext.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCContext.html
index 9ec5700..2231ef6 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCContext.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCContext.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>NCContext (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCConversation.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCConversation.html
index b96d84a..d352d91 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCConversation.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCConversation.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>NCConversation (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCustomElement.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCustomElement.html
index 85fd3e6..1666b57 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCustomElement.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCustomElement.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>NCCustomElement (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -160,7 +160,7 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></h3>
-<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a></code></li>
+<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax</a></code></li>
 </ul>
 </li>
 </ul>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCustomParser.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCustomParser.html
index d2f692d..ff85679 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCustomParser.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCustomParser.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>NCCustomParser (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCustomWord.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCustomWord.html
index e6c54d3..7074c70 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCustomWord.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCCustomWord.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>NCCustomWord (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCElement.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCElement.html
index ce3dc90..b856b48 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCElement.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCElement.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>NCElement (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -19,7 +19,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":18,"i1":18,"i2":6,"i3":18,"i4":18,"i5":18,"i6":18,"i7":18};
+var methods = {"i0":18,"i1":18,"i2":6,"i3":18,"i4":18,"i5":18,"i6":18,"i7":18,"i8":18};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -189,13 +189,19 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 <div class="block">Gets optional map of <a href="../../../../org/apache/nlpcraft/model/NCValue.html" title="interface in org.apache.nlpcraft.model"><code>values</code></a> for this element.</div>
 </td>
 </tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>default boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/nlpcraft/model/NCElement.html#isMemberOf-java.lang.String-">isMemberOf</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;grp)</code>
+<div class="block">Shortcut method to test if this element is a member of given group.</div>
+</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.nlpcraft.model.NCMetadata">
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></h3>
-<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a></code></li>
+<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax</a></code></li>
 </ul>
 </li>
 </ul>
@@ -303,6 +309,25 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 </dl>
 </li>
 </ul>
+<a name="isMemberOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isMemberOf</h4>
+<pre>default&nbsp;boolean&nbsp;isMemberOf(<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;grp)</pre>
+<div class="block">Shortcut method to test if this element is a member of given group. It is equivalent to:
+ <pre class="brush: java">
+     return getGroups().contains(grp);
+ </pre></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>grp</code> - Token group to test.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><code>True</code> if this element belongs to the given group, <code>false</code> otherwise.</dd>
+</dl>
+</li>
+</ul>
 <a name="getMetadata--">
 <!--   -->
 </a>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntent.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntent.html
index f156267..23a86aa 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntent.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntent.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>NCIntent (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentMatch.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentMatch.html
index 16071f6..a7f6f4c 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentMatch.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentMatch.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>NCIntentMatch (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentRef.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentRef.html
index f577d32..ad29d18 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentRef.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentRef.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>NCIntentRef (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentSkip.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentSkip.html
index df66d51..b590ddb 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentSkip.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentSkip.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>NCIntentSkip (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -74,7 +74,7 @@
 <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="#methods.inherited.from.class.java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
@@ -97,13 +97,7 @@
 <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>NCException</li>
 <li>
 <ul class="inheritance">
 <li>org.apache.nlpcraft.model.NCIntentSkip</li>
@@ -112,21 +106,13 @@
 </ul>
 </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></dd>
-</dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">NCIntentSkip</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>
+extends NCException</pre>
 <div class="block">Control flow exception to skip current intent. This exception can be thrown by the intent
  callback to indicate that current intent should be skipped (even though
  it was matched and its callback was called). If there's more than one intent matched the next best matching intent
@@ -145,8 +131,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 <a href="../../../../org/apache/nlpcraft/model/NCIntentTerm.html" title="annotation in org.apache.nlpcraft.model"><code>NCIntentTerm</code></a>, 
 <a href="../../../../org/apache/nlpcraft/model/NCIntentRef.html" title="annotation in org.apache.nlpcraft.model"><code>NCIntentRef</code></a>, 
 <a href="../../../../org/apache/nlpcraft/model/NCIntentMatch.html" title="interface in org.apache.nlpcraft.model"><code>NCIntentMatch</code></a>, 
-<a href="../../../../org/apache/nlpcraft/model/NCModel.html#onMatchedIntent-org.apache.nlpcraft.model.NCIntentMatch-"><code>NCModel.onMatchedIntent(NCIntentMatch)</code></a>, 
-<a href="../../../../serialized-form.html#org.apache.nlpcraft.model.NCIntentSkip">Serialized Form</a></dd>
+<a href="../../../../org/apache/nlpcraft/model/NCModel.html#onMatchedIntent-org.apache.nlpcraft.model.NCIntentMatch-"><code>NCModel.onMatchedIntent(NCIntentMatch)</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -185,18 +170,11 @@ 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>
-<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>
@@ -293,7 +271,7 @@ 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="#methods.inherited.from.class.java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentTerm.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentTerm.html
index 50d6da1..535a4fd 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentTerm.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCIntentTerm.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>NCIntentTerm (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCLifecycle.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCLifecycle.html
index b1abe42..274b9d3 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCLifecycle.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCLifecycle.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>NCLifecycle (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCMetadata.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCMetadata.html
index 762cf1d..e169350 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCMetadata.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCMetadata.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>NCMetadata (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -19,7 +19,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":18,"i2":18,"i3":18};
+var methods = {"i0":6,"i1":18,"i2":18,"i3":18,"i4":18};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -160,6 +160,12 @@ var activeTableTab = "activeTableTab";
 <div class="block">Shortcut method to get given optional metadata property.</div>
 </td>
 </tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>default &lt;T&gt;&nbsp;T</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax</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;prop)</code>
+<div class="block">Shortcut method to get given mandatory metadata property.</div>
+</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -231,7 +237,35 @@ var activeTableTab = "activeTableTab";
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>prop</code> - Metadata property name.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>Metadata property value.</dd>
+<dd>Metadata property value or <code>null</code> if given metadata property not found.</dd>
+</dl>
+</li>
+</ul>
+<a name="metax-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>metax</h4>
+<pre>default&nbsp;&lt;T&gt;&nbsp;T&nbsp;metax(<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;prop)
+             throws NCException</pre>
+<div class="block">Shortcut method to get given mandatory metadata property. Equivalent to:
+ <pre class="brush: java">
+     T t = (T)getMetadata().get(prop);
+     if (t == null)
+         throw new NCException("Mandatory metadata property not found: " + prop);
+     else
+         return t;
+ </pre></div>
+<dl>
+<dt><span class="paramLabel">Type Parameters:</span></dt>
+<dd><code>T</code> - Type of the metadata property.</dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>prop</code> - Metadata property name.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Metadata property value or throws an exception if given metadata property not found.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown if given metadata property not found.</dd>
 </dl>
 </li>
 </ul>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModel.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModel.html
index 4d81215..cefaab0 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModel.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModel.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>NCModel (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -226,7 +226,7 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCModelView.html" title="
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></h3>
-<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a></code></li>
+<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.nlpcraft.model.NCLifecycle">
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelAdapter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelAdapter.html
index 3c3ae48..4c2b656 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelAdapter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelAdapter.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>NCModelAdapter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -231,7 +231,7 @@ implements <a href="../../../../org/apache/nlpcraft/model/NCModel.html" title="i
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></h3>
-<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a></code></li>
+<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.nlpcraft.model.NCLifecycle">
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelFactory.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelFactory.html
index 095387e..9de4088 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelFactory.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelFactory.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>NCModelFactory (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelFileAdapter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelFileAdapter.html
index 6c79588..3e3116e 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelFileAdapter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelFileAdapter.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>NCModelFileAdapter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -412,7 +412,7 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCModelAdapter.html" titl
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></h3>
-<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a></code></li>
+<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.nlpcraft.model.NCLifecycle">
@@ -1392,7 +1392,6 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCModelAdapter.html" titl
  <li><code>nlpcraft:city</code></li>
  <li><code>nlpcraft:num</code></li>
  <li><code>nlpcraft:coordinate</code></li>
- <li><code>nlpcraft:aggregation</code></li>
  <li><code>nlpcraft:relation</code></li>
  <li><code>nlpcraft:sort</code></li>
  <li><code>nlpcraft:limit</code></li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelView.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelView.html
index 9f66054..22f2d26 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelView.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCModelView.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>NCModelView (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -469,7 +469,7 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></h3>
-<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a></code></li>
+<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax</a></code></li>
 </ul>
 </li>
 </ul>
@@ -751,7 +751,6 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
  <li><code>nlpcraft:city</code></li>
  <li><code>nlpcraft:num</code></li>
  <li><code>nlpcraft:coordinate</code></li>
- <li><code>nlpcraft:aggregation</code></li>
  <li><code>nlpcraft:relation</code></li>
  <li><code>nlpcraft:sort</code></li>
  <li><code>nlpcraft:limit</code></li>
@@ -1662,7 +1661,6 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
  <li><code>nlpcraft:city</code></li>
  <li><code>nlpcraft:num</code></li>
  <li><code>nlpcraft:coordinate</code></li>
- <li><code>nlpcraft:aggregation</code></li>
  <li><code>nlpcraft:relation</code></li>
  <li><code>nlpcraft:sort</code></li>
  <li><code>nlpcraft:limit</code></li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCRejection.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCRejection.html
index 8d14bab..4395ada 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCRejection.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCRejection.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>NCRejection (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -74,7 +74,7 @@
 <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="#methods.inherited.from.class.java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
@@ -97,13 +97,7 @@
 <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>NCException</li>
 <li>
 <ul class="inheritance">
 <li>org.apache.nlpcraft.model.NCRejection</li>
@@ -112,31 +106,19 @@
 </ul>
 </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></dd>
-</dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">NCRejection</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>
+extends NCException</pre>
 <div class="block">Exception to indicate that user input cannot be processed as is. This exception can be thrown from
  intent callbacks.
  <p>
  This exception typically indicates that user has not provided enough information in the input string
  to have it processed automatically. In most cases this means that the user's input is either too short
  or too simple, too long or too complex, missing required context, or unrelated to requested data model.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../serialized-form.html#org.apache.nlpcraft.model.NCRejection">Serialized Form</a></dd>
-</dl>
 </li>
 </ul>
 </div>
@@ -175,18 +157,11 @@ 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>
-<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>
@@ -289,7 +264,7 @@ 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="#methods.inherited.from.class.java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCRequest.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCRequest.html
index 45c1d36..e958087 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCRequest.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCRequest.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>NCRequest (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCResult.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCResult.html
index e2b2a3a..08a04b9 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCResult.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCResult.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>NCResult (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCToken.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCToken.html
index d823267..6933e21 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCToken.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCToken.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>NCToken (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -19,7 +19,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":18,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":18,"i7":6,"i8":18,"i9":6,"i10":6,"i11":6,"i12":6,"i13":18,"i14":6,"i15":18,"i16":18,"i17":18,"i18":18};
+var methods = {"i0":18,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":18,"i7":6,"i8":18,"i9":6,"i10":6,"i11":6,"i12":6,"i13":18,"i14":6,"i15":18,"i16":18,"i17":18,"i18":18,"i19":18,"i20":18};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -252,11 +252,23 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 </tr>
 <tr id="i17" class="rowColor">
 <td class="colFirst"><code>default boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/nlpcraft/model/NCToken.html#isMemberOf-java.lang.String-">isMemberOf</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;grp)</code>
+<div class="block">Tests whether or not this token belongs to the given group.</div>
+</td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>default boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/nlpcraft/model/NCToken.html#isOfAlias-java.lang.String-">isOfAlias</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;alias)</code>
+<div class="block">Tests whether or not this token has given alias.</div>
+</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>default boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/nlpcraft/model/NCToken.html#isStopWord--">isStopWord</a></span>()</code>
 <div class="block">A shortcut method checking whether or not this token is a stopword.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>default boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/nlpcraft/model/NCToken.html#isUserDefined--">isUserDefined</a></span>()</code>
 <div class="block">Tests whether or not this token is a user-defined token.</div>
@@ -268,7 +280,7 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></h3>
-<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#getMetadata--">getMetadata</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a></code></li>
+<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#getMetadata--">getMetadata</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">meta [...]
 </ul>
 </li>
 </ul>
@@ -435,6 +447,25 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 </dl>
 </li>
 </ul>
+<a name="isOfAlias-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isOfAlias</h4>
+<pre>default&nbsp;boolean&nbsp;isOfAlias(<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;alias)</pre>
+<div class="block">Tests whether or not this token has given alias. It is equivalent to:
+ <pre class="brush: java">
+      return getAliases().contains(alias);
+ </pre></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>alias</code> - Alias to test.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><code>True</code> if this token has alias <code>alias</code>, <code>false</code> otherwise.</dd>
+</dl>
+</li>
+</ul>
 <a name="getValue--">
 <!--   -->
 </a>
@@ -470,6 +501,25 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 </dl>
 </li>
 </ul>
+<a name="isMemberOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isMemberOf</h4>
+<pre>default&nbsp;boolean&nbsp;isMemberOf(<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;grp)</pre>
+<div class="block">Tests whether or not this token belongs to the given group. It is equivalent to:
+ <pre class="brush: java">
+      return getGroups().contains(grp);
+ </pre></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>grp</code> - Group to test.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><code>True</code> if this token belongs to the group <code>grp</code>, <code>false</code> otherwise.</dd>
+</dl>
+</li>
+</ul>
 <a name="getStartCharIndex--">
 <!--   -->
 </a>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCUser.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCUser.html
index 6e6e796..0d06935 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCUser.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCUser.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>NCUser (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCValue.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCValue.html
index 6d637f6..c3c1b7f 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCValue.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCValue.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>NCValue (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCValueLoader.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCValueLoader.html
index a800a42..77a105d 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCValueLoader.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCValueLoader.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>NCValueLoader (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCVariant.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCVariant.html
index c9ec83c..6df0874 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCVariant.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/NCVariant.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>NCVariant (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCompany.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCompany.html
index 2feb68e..13f523a 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCompany.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCompany.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCCompany (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCContext.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCContext.html
index 53d50d5..4afb518 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCContext.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCContext.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.NCContext (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCConversation.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCConversation.html
index e6769eb..580d6ac 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCConversation.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCConversation.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.NCConversation (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCustomElement.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCustomElement.html
index 5ee4a79..d25277c 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCustomElement.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCustomElement.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.NCCustomElement (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCustomParser.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCustomParser.html
index ebcf23e..88f6e49 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCustomParser.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCustomParser.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCCustomParser (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCustomWord.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCustomWord.html
index 4303647..6734507 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCustomWord.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCCustomWord.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.NCCustomWord (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCElement.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCElement.html
index 71445f4..7696f6e 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCElement.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCElement.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.NCElement (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntent.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntent.html
index e0e5301..d531b05 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntent.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntent.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.NCIntent (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentMatch.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentMatch.html
index f35e63a..7008c45 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentMatch.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentMatch.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.NCIntentMatch (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentRef.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentRef.html
index e5d8ad2..a389b32 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentRef.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentRef.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.NCIntentRef (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentSkip.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentSkip.html
index 87630b7..1963b0e 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentSkip.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentSkip.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.apache.nlpcraft.model.NCIntentSkip (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentTerm.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentTerm.html
index 85a79cb..9ee6e92 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentTerm.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCIntentTerm.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.apache.nlpcraft.model.NCIntentTerm (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCLifecycle.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCLifecycle.html
index deeff8e..5abc500 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCLifecycle.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCLifecycle.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCLifecycle (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCMetadata.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCMetadata.html
index 1b76831..3ca40b2 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCMetadata.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCMetadata.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCMetadata (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModel.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModel.html
index 3970c99..086ffc2 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModel.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModel.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.NCModel (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -245,7 +245,9 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a></code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlSchemaBuilder.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-">makeSchema</a></span>(<a href="../../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>&nbsp;model)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">NCSqlSchemaBuilder.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-">makeSchema</a></span>(<a href="../../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>&nbsp;model)</code>
+<div class="block">Builds object presentation for SQL schema from given data model.</div>
+</td>
 </tr>
 </tbody>
 </table>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelAdapter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelAdapter.html
index df9fc43..e14a5e4 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelAdapter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelAdapter.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.apache.nlpcraft.model.NCModelAdapter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelFactory.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelFactory.html
index 3031122..cb1ff41 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelFactory.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelFactory.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.NCModelFactory (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelFileAdapter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelFileAdapter.html
index 7d90b18..2b88db3 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelFileAdapter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelFileAdapter.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.NCModelFileAdapter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelView.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelView.html
index 34b082f..5e5d17a 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelView.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCModelView.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.NCModelView (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCRejection.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCRejection.html
index a5a84c2..b86daa2 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCRejection.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCRejection.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.apache.nlpcraft.model.NCRejection (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCRequest.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCRequest.html
index aeb40fb..3c8b90d 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCRequest.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCRequest.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCRequest (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCResult.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCResult.html
index 9a6adc8..99f2e0c 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCResult.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCResult.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.NCResult (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCToken.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCToken.html
index 8c6def6..b9bc53f 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCToken.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCToken.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.NCToken (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -206,19 +206,6 @@
 </a>
 <h3>Uses of <a href="../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</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/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</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/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</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#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>
-</tbody>
-</table>
-<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> with parameters of type <a href="../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -226,86 +213,34 @@
 </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.nlpcraft.model.tool [...]
-                <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 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"><span class="typeNameLabel">NCSqlUtils.</span><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 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"><span class="typeNameLabel">NCSqlUtils.</span><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 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#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 [...]
-                          <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="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"><span class="typeNameLabel">NCSqlUtils.</span><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 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.tools.sqlge [...]
-                    <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 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"><span class="typeNameLabel">NCSqlUtils.</span><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 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"><span class="typeNameLabel">NCSqlUtils.</span><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 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">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>
+<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"><span class="typeNameLabel">NCSqlExtractor.</span><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 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"><span class="typeNameLabel">NCSqlUtils.</span><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>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Method parameters in <a href="../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a> with type arguments of type <a href="../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</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>
+<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"><span class="typeNameLabel">NCSqlExtractor.</span><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>
-<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.nlpcraft.model.tool [...]
-                <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><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"><span class="typeNameLabel">NCSqlExtractor.</span><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 class="rowColor">
-<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"><span class="typeNameLabel">NCSqlUtils.</span><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>
+<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"><span class="typeNameLabel">NCSqlExtractor.</span><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 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"><span class="typeNameLabel">NCSqlUtils.</span><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>
+<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"><span class="typeNameLabel">NCSqlExtractor.</span><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>
 </tbody>
 </table>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCUser.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCUser.html
index 42fefbd..cddaec6 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCUser.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCUser.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCUser (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCValue.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCValue.html
index 601594b..cbb4b4f 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCValue.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCValue.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCValue (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCValueLoader.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCValueLoader.html
index 9706d2f..384334d 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCValueLoader.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCValueLoader.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCValueLoader (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCVariant.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCVariant.html
index 90a9baa..961fea2 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCVariant.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/class-use/NCVariant.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.NCVariant (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -91,6 +91,12 @@
 <div class="block">Contains <b>main API</b> for defining data models.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<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>
@@ -146,6 +152,27 @@
 </tbody>
 </table>
 </li>
+<li class="blockList"><a name="org.apache.nlpcraft.model.tools.sqlgen">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../org/apache/nlpcraft/model/NCVariant.html" title="interface in org.apache.nlpcraft.model">NCVariant</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> with parameters of type <a href="../../../../../org/apache/nlpcraft/model/NCVariant.html" title="interface in org.apache.nlpcraft.model">NCVariant</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/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>
+</li>
 </ul>
 </li>
 </ul>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/NCBasicModelFactory.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/NCBasicModelFactory.html
index 03342c7..7835327 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/NCBasicModelFactory.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/NCBasicModelFactory.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>NCBasicModelFactory (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/class-use/NCBasicModelFactory.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/class-use/NCBasicModelFactory.html
index 5b16424..1fc7204 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/class-use/NCBasicModelFactory.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/class-use/NCBasicModelFactory.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.apache.nlpcraft.model.factories.basic.NCBasicModelFactory (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-frame.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-frame.html
index c4025ee..0202975 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-frame.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-frame.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>org.apache.nlpcraft.model.factories.basic (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-summary.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-summary.html
index f69ab90..3a978e7 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-summary.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-summary.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>org.apache.nlpcraft.model.factories.basic (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-tree.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-tree.html
index 83d8d90..5575ae4 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-tree.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-tree.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>org.apache.nlpcraft.model.factories.basic Class Hierarchy (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-use.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-use.html
index 734cbde..9310a90 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-use.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/basic/package-use.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Package org.apache.nlpcraft.model.factories.basic (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html
index fdb2fed..ff04f2c 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.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>NCSpringModelFactory (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/class-use/NCSpringModelFactory.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/class-use/NCSpringModelFactory.html
index f0da898..92ccb7f 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/class-use/NCSpringModelFactory.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/class-use/NCSpringModelFactory.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.apache.nlpcraft.model.factories.spring.NCSpringModelFactory (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-frame.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-frame.html
index 003ba0c..75a2c6e 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-frame.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-frame.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>org.apache.nlpcraft.model.factories.spring (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-summary.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-summary.html
index f9a5ba3..6359574 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-summary.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-summary.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>org.apache.nlpcraft.model.factories.spring (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-tree.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-tree.html
index 71b8bad..238f87b 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-tree.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-tree.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>org.apache.nlpcraft.model.factories.spring Class Hierarchy (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-use.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-use.html
index 79979f7..c52c7d5 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-use.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/factories/spring/package-use.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Package org.apache.nlpcraft.model.factories.spring (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCBaseTraceExporter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCBaseTraceExporter.html
index f70868d..45dc10c 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCBaseTraceExporter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCBaseTraceExporter.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>NCBaseTraceExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCJaegerExporter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCJaegerExporter.html
index a2f8d3e..40e5e7c 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCJaegerExporter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCJaegerExporter.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>NCJaegerExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCPrometheusExporter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCPrometheusExporter.html
index 8708f11..d7846fb 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCPrometheusExporter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCPrometheusExporter.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>NCPrometheusExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.html
index e4f7ef2..959bc87 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.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>NCStackdriverStatsExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCStackdriverTraceExporter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCStackdriverTraceExporter.html
index 9070590..bf36566 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCStackdriverTraceExporter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCStackdriverTraceExporter.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>NCStackdriverTraceExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCZipkinExporter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCZipkinExporter.html
index 321db75..9fc7bc4 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCZipkinExporter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/NCZipkinExporter.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>NCZipkinExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCBaseTraceExporter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCBaseTraceExporter.html
index 8ebf37d..3eff521 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCBaseTraceExporter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCBaseTraceExporter.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.opencensus.NCBaseTraceExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCJaegerExporter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCJaegerExporter.html
index 60900ae..05afee7 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCJaegerExporter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCJaegerExporter.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.opencensus.NCJaegerExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCPrometheusExporter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCPrometheusExporter.html
index 007bb0f..1459775 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCPrometheusExporter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCPrometheusExporter.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.opencensus.NCPrometheusExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverStatsExporter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverStatsExporter.html
index 622654f..4354879 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverStatsExporter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverStatsExporter.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.opencensus.NCStackdriverStatsExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverTraceExporter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverTraceExporter.html
index 6041e12..c070fe5 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverTraceExporter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverTraceExporter.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.opencensus.NCStackdriverTraceExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCZipkinExporter.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCZipkinExporter.html
index d5ef37f..c901341 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCZipkinExporter.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/class-use/NCZipkinExporter.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.opencensus.NCZipkinExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-frame.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-frame.html
index 8bf64da..ada4f84 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-frame.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-frame.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>org.apache.nlpcraft.model.opencensus (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-summary.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-summary.html
index 7dcc589..4ac4f03 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-summary.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-summary.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>org.apache.nlpcraft.model.opencensus (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-tree.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-tree.html
index b4b7668..9e050e4 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-tree.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-tree.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>org.apache.nlpcraft.model.opencensus Class Hierarchy (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-use.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-use.html
index 9c36918..56d621e 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-use.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/opencensus/package-use.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Package org.apache.nlpcraft.model.opencensus (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-frame.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-frame.html
index 6dbeab0..85fed0e 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-frame.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-frame.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>org.apache.nlpcraft.model (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -36,14 +36,11 @@
 </ul>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
+<li><a href="NCIntentSkip.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCIntentSkip</a></li>
 <li><a href="NCModelAdapter.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCModelAdapter</a></li>
 <li><a href="NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCModelFileAdapter</a></li>
-<li><a href="NCResult.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCResult</a></li>
-</ul>
-<h2 title="Exceptions">Exceptions</h2>
-<ul title="Exceptions">
-<li><a href="NCIntentSkip.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCIntentSkip</a></li>
 <li><a href="NCRejection.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCRejection</a></li>
+<li><a href="NCResult.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCResult</a></li>
 </ul>
 <h2 title="Annotation Types">Annotation Types</h2>
 <ul title="Annotation Types">
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-summary.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-summary.html
index 523fd8f..57ffbf9 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-summary.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-summary.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>org.apache.nlpcraft.model (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -215,38 +215,21 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCModelAdapter.html" title="class in org.apache.nlpcraft.model">NCModelAdapter</a></td>
+<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model">NCIntentSkip</a></td>
 <td class="colLast">
-<div class="block">Adapter for data models.</div>
+<div class="block">Control flow exception to skip current intent.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model">NCModelFileAdapter</a></td>
-<td class="colLast">
-<div class="block">Adapter for data models that can load model configuration from external JSON/YAML file.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model">NCResult</a></td>
+<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCModelAdapter.html" title="class in org.apache.nlpcraft.model">NCModelAdapter</a></td>
 <td class="colLast">
-<div class="block">Data model result returned from model intent callbacks.</div>
+<div class="block">Adapter for data models.</div>
 </td>
 </tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Exception Summary table, listing exceptions, and an explanation">
-<caption><span>Exception Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Exception</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model">NCIntentSkip</a></td>
+<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model">NCModelFileAdapter</a></td>
 <td class="colLast">
-<div class="block">Control flow exception to skip current intent.</div>
+<div class="block">Adapter for data models that can load model configuration from external JSON/YAML file.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -255,6 +238,12 @@
 <div class="block">Exception to indicate that user input cannot be processed as is.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model">NCResult</a></td>
+<td class="colLast">
+<div class="block">Data model result returned from model intent callbacks.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-tree.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-tree.html
index d7b72b4..60a039c 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-tree.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-tree.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>org.apache.nlpcraft.model Class Hierarchy (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -84,26 +84,22 @@
 <ul>
 <li type="circle">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"><span class="typeNameLink">Object</span></a>
 <ul>
-<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCModelAdapter.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCModelAdapter</span></a> (implements org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>)
+<li type="circle">NCException
 <ul>
-<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCModelFileAdapter</span></a></li>
+<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCRejection</span></a></li>
 </ul>
 </li>
-<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCResult</span></a> (implements java.io.<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>)</li>
-<li type="circle">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"><span class="typeNameLink">Throwable</span></a> (implements java.io.<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>)
-<ul>
-<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Exception</span></a>
-<ul>
-<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">RuntimeException</span></a>
+<li type="circle">NCException
 <ul>
 <li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCIntentSkip</span></a></li>
-<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCRejection</span></a></li>
-</ul>
-</li>
 </ul>
 </li>
+<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCModelAdapter.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCModelAdapter</span></a> (implements org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>)
+<ul>
+<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCModelFileAdapter</span></a></li>
 </ul>
 </li>
+<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCResult</span></a> (implements java.io.<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>)</li>
 </ul>
 </li>
 </ul>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-use.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-use.html
index 5c0a442..aff8ae3 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-use.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/package-use.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Package org.apache.nlpcraft.model (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -315,6 +315,11 @@
 <div class="block">Detected model element.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../org/apache/nlpcraft/model/class-use/NCVariant.html#org.apache.nlpcraft.model.tools.sqlgen">NCVariant</a>
+<div class="block">A list of tokens representing one possible parsing variant of the user input.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html
index af14dc5..9e1b4cf 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.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>NCSqlColumn (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -52,8 +52,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.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/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</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>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" target="_top">Frames</a></li>
@@ -105,7 +105,50 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">NCSqlColumn</span></pre>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL column.
+ <p>
+ In JSON/YAML generated model SQL column is represented by the model element (example):
+ <pre class="brush: js">
+   elements:
+     - id: "col:orders_customer_id"
+       groups:
+       - "column"
+       synonyms:
+       - "{customer_id|customer &lt;ID&gt;}"
+       - "orders {customer_id|customer &lt;ID&gt;}"
+       - "{customer_id|customer &lt;ID&gt;} &lt;OF&gt; orders"
+       metadata:
+         sql:name: "customer_id"
+         sql:tablename: "orders"
+         sql:datatype: 12
+         sql:isnullable: true
+         sql:ispk: false
+       description: "Auto-generated from 'orders.customer_id' column."
+       valueLoader: "org.apache.nlpcraft.examples.sql.db.SqlValueLoader"
+ </pre>
+ Few notes:
+ <ul>
+     <li>
+         All model elements representing SQL column have ID in a form of <code>col:sql_table_name</code>.
+     </li>
+     <li>
+         All model elements representing SQL column belong to <code>column</code> group.
+     </li>
+     <li>
+         These model elements have auto-generated synonyms and set of mandatory metadata.
+     </li>
+     <li>
+         User can freely add group membership, change synonyms, add new metadata, add or change value loader.
+     </li>
+ </ul></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-"><code>NCSqlSchemaBuilder.makeSchema(NCModel)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html#build-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCVariant-"><code>NCSqlExtractorBuilder.build(NCSqlSchema, NCVariant)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractColumn-org.apache.nlpcraft.model.NCToken-"><code>NCSqlExtractor.extractColumn(NCToken)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getColumns--"><code>NCSqlTable.getColumns()</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getAllColumns--"><code>NCSqlSchema.getAllColumns()</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -126,23 +169,34 @@ var activeTableTab = "activeTableTab";
 </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/NCSqlColumn.html#getColumn--">getColumn</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#getColumn--">getColumn</a></span>()</code>
+<div class="block">Gets native name of this column.</div>
+</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#getDataType--">getDataType</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#getDataType--">getDataType</a></span>()</code>
+<div class="block">Gets JDBC <a target="new" href="https://docs.oracle.com/javase/8/docs/api/java/sql/Types.html">data type</a>
+ for this column.</div>
+</td>
 </tr>
 <tr id="i2" 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/NCSqlColumn.html#getTable--">getTable</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#getTable--">getTable</a></span>()</code>
+<div class="block">Gets name of the table this column belongs to.</div>
+</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#isNullable--">isNullable</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#isNullable--">isNullable</a></span>()</code>
+<div class="block">Tests whether or not this column is nullable.</div>
+</td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#isPk--">isPk</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#isPk--">isPk</a></span>()</code>
+<div class="block">Tests whether or not this column is a primary key column.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -166,8 +220,16 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getTable</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;getTable()</pre>
+<div class="block">Gets name of the table this column belongs to.
+ <p>
+ In JSON/YAML generated model the table name is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:tablename: "customer_id"
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Name of the table this column belongs to.</dd>
 </dl>
 </li>
 </ul>
@@ -178,8 +240,16 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getColumn</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;getColumn()</pre>
+<div class="block">Gets native name of this column.
+ <p>
+ In JSON/YAML generated model the native column name is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:name: "customer_id"
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Name of this column.</dd>
 </dl>
 </li>
 </ul>
@@ -190,8 +260,18 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getDataType</h4>
 <pre>int&nbsp;getDataType()</pre>
+<div class="block">Gets JDBC <a target="new" href="https://docs.oracle.com/javase/8/docs/api/java/sql/Types.html">data type</a>
+ for this column.
+ <p>
+ In JSON/YAML generated model the data type is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:datatype: 12
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>JDBC <a target="new" href="https://docs.oracle.com/javase/8/docs/api/java/sql/Types.html">data type</a>
+      for this column.</dd>
 </dl>
 </li>
 </ul>
@@ -202,8 +282,16 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>isPk</h4>
 <pre>boolean&nbsp;isPk()</pre>
+<div class="block">Tests whether or not this column is a primary key column.
+ <p>
+ In JSON/YAML generated model the primary key flag is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:ispk: false
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Whether or not this column is a primary key column.</dd>
 </dl>
 </li>
 </ul>
@@ -214,8 +302,16 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>isNullable</h4>
 <pre>boolean&nbsp;isNullable()</pre>
+<div class="block">Tests whether or not this column is nullable.
+ <p>
+ In JSON/YAML generated model the nullable flag is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:isnullable: false
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Whether or not this column is nullable.</dd>
 </dl>
 </li>
 </ul>
@@ -248,8 +344,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.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/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</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>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" target="_top">Frames</a></li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html
index a087442..ad71e1f 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.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>NCSqlDateRange (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -52,8 +52,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.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/NCSqlException.html" title="class 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/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/NCSqlExtractor.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/NCSqlDateRange.html" target="_top">Frames</a></li>
@@ -105,7 +105,13 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">NCSqlDateRange</span></pre>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL date range.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-"><code>NCSqlSchemaBuilder.makeSchema(NCModel)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html#build-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCVariant-"><code>NCSqlExtractorBuilder.build(NCSqlSchema, NCVariant)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractDateRange-org.apache.nlpcraft.model.NCToken-"><code>NCSqlExtractor.extractDateRange(NCToken)</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -126,11 +132,15 @@ var activeTableTab = "activeTableTab";
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Timestamp.html?is-external=true" title="class or interface in java.sql">Timestamp</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html#getFrom--">getFrom</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html#getFrom--">getFrom</a></span>()</code>
+<div class="block">Gets 'from' timestamp.</div>
+</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Timestamp.html?is-external=true" title="class or interface in java.sql">Timestamp</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html#getTo--">getTo</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html#getTo--">getTo</a></span>()</code>
+<div class="block">Gets 'to' timestamp.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -154,6 +164,11 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getFrom</h4>
 <pre><a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Timestamp.html?is-external=true" title="class or interface in java.sql">Timestamp</a>&nbsp;getFrom()</pre>
+<div class="block">Gets 'from' timestamp.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The 'from' timestamp.</dd>
+</dl>
 </li>
 </ul>
 <a name="getTo--">
@@ -163,6 +178,11 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getTo</h4>
 <pre><a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Timestamp.html?is-external=true" title="class or interface in java.sql">Timestamp</a>&nbsp;getTo()</pre>
+<div class="block">Gets 'to' timestamp.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The 'to' timestamp.</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -194,8 +214,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.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/NCSqlException.html" title="class 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/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/NCSqlExtractor.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/NCSqlDateRange.html" target="_top">Frames</a></li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html
index eb5b672..8c50c23 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.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>NCSqlJoin (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -19,7 +19,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":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";
@@ -52,8 +52,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.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>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.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/NCSqlJoinType.html" title="enum 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/NCSqlJoin.html" target="_top">Frames</a></li>
@@ -105,7 +105,25 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">NCSqlJoin</span></pre>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL join (foreign key).
+ <p>
+ In JSON/YAML generated model SQL joins are declared with the following data model
+ metadata (example):
+ <pre class="brush: js">
+   sql:joins:
+   - fromtable: "orders"
+     fromcolumns:
+     - "customer_id"
+     totable: "customers"
+     tocolumns:
+     - "customer_id"
+     jointype: "left"
+ </pre></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-"><code>NCSqlSchemaBuilder.makeSchema(NCModel)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getJoins--"><code>NCSqlSchema.getJoins()</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -126,19 +144,33 @@ var activeTableTab = "activeTableTab";
 </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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getFromColumns--">getFromColumns</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getFromColumns--">getFromColumns</a></span>()</code>
+<div class="block">Gets the list of columns in originating table.</div>
+</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/NCSqlJoin.html#getFromTable--">getFromTable</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getFromTable--">getFromTable</a></span>()</code>
+<div class="block">Gets the name of the originating table.</div>
+</td>
 </tr>
 <tr id="i2" 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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getToColumns--">getToColumns</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getToColumns--">getToColumns</a></span>()</code>
+<div class="block">Gets the list of columns in target table.</div>
+</td>
 </tr>
 <tr id="i3" 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/NCSqlJoin.html#getToTable--">getToTable</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getToTable--">getToTable</a></span>()</code>
+<div class="block">Gets the name of the target table.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<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"><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>
 </table>
 </li>
@@ -162,8 +194,10 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getFromTable</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;getFromTable()</pre>
+<div class="block">Gets the name of the originating table.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Name of the originating table.</dd>
 </dl>
 </li>
 </ul>
@@ -174,8 +208,10 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getToTable</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;getToTable()</pre>
+<div class="block">Gets the name of the target table.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Name of the target table.</dd>
 </dl>
 </li>
 </ul>
@@ -186,20 +222,38 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getFromColumns</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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;getFromColumns()</pre>
+<div class="block">Gets the list of columns in originating table.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>List of columns in originating table.</dd>
 </dl>
 </li>
 </ul>
 <a name="getToColumns--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>getToColumns</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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;getToColumns()</pre>
+<div class="block">Gets the list of columns in target table.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>List of columns in target table.</dd>
+</dl>
+</li>
+</ul>
+<a name="getType--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getType</h4>
+<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>&nbsp;getType()</pre>
+<div class="block">Gets type of the join.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Type of join.</dd>
 </dl>
 </li>
 </ul>
@@ -232,8 +286,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.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>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.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/NCSqlJoinType.html" title="enum 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/NCSqlJoin.html" target="_top">Frames</a></li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html
index ac7f9b7..0533635 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.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>NCSqlLimit (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -52,7 +52,7 @@ var activeTableTab = "activeTableTab";
 </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/NCSqlJoinType.html" title="enum 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/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -105,7 +105,11 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">NCSqlLimit</span></pre>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL limit.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-"><code>NCSqlSchemaBuilder.makeSchema(NCModel)</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -126,15 +130,21 @@ 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/NCSqlLimit.html#getColumn--">getColumn</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#getColumn--">getColumn</a></span>()</code>
+<div class="block">Gets SQL column this limit is applied.</div>
+</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#getLimit--">getLimit</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#getLimit--">getLimit</a></span>()</code>
+<div class="block">Gets the numeric value of the limit.</div>
+</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#isAscending--">isAscending</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#isAscending--">isAscending</a></span>()</code>
+<div class="block">Gets whether limit ascending or descending.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -158,6 +168,11 @@ var activeTableTab = "activeTableTab";
 <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>
+<div class="block">Gets SQL column this limit is applied.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>SQL column this limit is applied.</dd>
+</dl>
 </li>
 </ul>
 <a name="getLimit--">
@@ -167,6 +182,11 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getLimit</h4>
 <pre>int&nbsp;getLimit()</pre>
+<div class="block">Gets the numeric value of the limit.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Numeric value of the limit.</dd>
+</dl>
 </li>
 </ul>
 <a name="isAscending--">
@@ -176,6 +196,11 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>isAscending</h4>
 <pre>boolean&nbsp;isAscending()</pre>
+<div class="block">Gets whether limit ascending or descending.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Whether limit ascending or descending.</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -207,7 +232,7 @@ var activeTableTab = "activeTableTab";
 </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/NCSqlJoinType.html" title="enum 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/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html
index ab1e246..54e312c 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.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>NCSqlModelGenerator (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -53,7 +53,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.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/NCSqlQuery.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/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/NCSqlModelGenerator.html" target="_top">Frames</a></li>
@@ -114,16 +114,38 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>public class <span class="typeNameLabel">NCSqlModelGenerator</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">Command line utility to generate NLPCraft model stub from given SQL RDBMS.
+<div class="block">Command line utility to generate YAML/JSON NLPCraft model stub from given SQL RDBMS.
  <p>
- You need to provide JDBC URL and driver, database schema, as well as set of tables and columns for which you
- want to generate NLPCraft model stub. After the model stub is generated you need to further configure and customize
- it for your specific needs.
- <p>
- Run this class with <code>--help</code> parameter to get a full up-to-date documentation:
+ This command line utility take several parameters like JDBC URL and driver, database schema, and
+ optional set of tables and columns for which it will generate YAML/JSON NLPCraft model stub. Run
+ this class with <code>--help</code> parameter to get a full up-to-date documentation:
  <pre class="brush:plain">
- java -cp nlpcraft-x.x.x-all-deps.jar org.apache.nlpcraft.model.tools.sqlgen.NCSqlModelGenerator --help
- </pre></div>
+ java -cp apache-nlpcraft-x.x.x-all-deps.jar org.apache.nlpcraft.model.tools.sqlgen.NCSqlModelGenerator --help
+ </pre>
+ <p>
+ After the model stub is generated:
+ <ul>
+     <li>
+         Modify and extend generated model stub to your own needs. In most cases, you'll need
+         to add, remove or modify auto-generated synonyms, add intents, etc. Note, however, that generated model
+         is fully complete and can be used as is.
+     </li>
+     <li>
+         Use generated YAML/JSON-based model together with <a href="../../../../../../org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model"><code>NCModelFileAdapter</code></a>
+         class to instantiate model from this file.
+     </li>
+     <li>
+         Use <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-"><code>NCSqlSchemaBuilder.makeSchema(NCModel)</code></a> method to get an object representation of the
+         SQL data schema for the model. You can use this object representation along with many utility
+         methods in <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlExtractor</code></a> class to efficiently auto-generate SQL queries against the source RDBMS.
+     </li>
+ </ul></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model"><code>NCModelFileAdapter</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlSchemaBuilder</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>
 </div>
@@ -216,6 +238,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>args</code> - Command line parameters. Execute with <code>--help</code> parameter to get a full
       documentation.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown in case of any errors.</dd>
 </dl>
 </li>
 </ul>
@@ -249,7 +273,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.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/NCSqlQuery.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/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/NCSqlModelGenerator.html" target="_top">Frames</a></li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html
index 3b58c22..1fab903 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.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>NCSqlSchema (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -19,8 +19,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var methods = {"i0":18,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -52,7 +52,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.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/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/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -105,7 +105,12 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">NCSqlSchema</span></pre>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL schema. This representation gives object model for the SQL metadata
+ that was extracted from RDBMS and added to the data model stub by <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlModelGenerator</code></a> utility.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-"><code>NCSqlSchemaBuilder.makeSchema(NCModel)</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -119,18 +124,28 @@ var activeTableTab = "activeTableTab";
 </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>
+<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><span id="t5" class="tableTab"><span><a href="javascript:show(16);">Default Methods</a></span><span class="tabE [...]
 <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/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getJoins--">getJoins</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>default <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</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/NCSqlSchema.html#getAllColumns--">getAllColumns</a></span>()</code>
+<div class="block">Creates and returns collection of all SQL columns across all tables in given schema.</div>
+</td>
 </tr>
 <tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getJoins--">getJoins</a></span>()</code>
+<div class="block">Gets collection of joins for this SQL schema.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getTables--">getTables</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getTables--">getTables</a></span>()</code>
+<div class="block">Gets collection of tables for this SQL schema.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -154,20 +169,42 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getTables</h4>
 <pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a>&gt;&nbsp;getTables()</pre>
+<div class="block">Gets collection of tables for this SQL schema.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Collection of tables for this SQL schema.</dd>
 </dl>
 </li>
 </ul>
 <a name="getJoins--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>getJoins</h4>
 <pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a>&gt;&nbsp;getJoins()</pre>
+<div class="block">Gets collection of joins for this SQL schema.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Collection of joins for this SQL schema.</dd>
+</dl>
+</li>
+</ul>
+<a name="getAllColumns--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getAllColumns</h4>
+<pre>default&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</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;getAllColumns()</pre>
+<div class="block">Creates and returns collection of all SQL columns across all tables in given schema. It is
+ equivalent to:
+ <pre class="brush: java">
+     return getTables().stream().flatMap(t -> t.getColumns().stream()).collect(Collectors.toList());
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Collection of all SQL columns across all tables in given schema.</dd>
 </dl>
 </li>
 </ul>
@@ -200,7 +237,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.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/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/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html
index ada0a9f..181f978 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.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>NCSqlSchemaBuilder (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -53,7 +53,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.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/NCSqlSimpleCondition.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/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/NCSqlSchemaBuilder.html" target="_top">Frames</a></li>
@@ -114,6 +114,13 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>public class <span class="typeNameLabel">NCSqlSchemaBuilder</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/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlSchema</code></a> instances. Once you have <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlSchema</code></a>
+ you can also use utility methods from <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlExtractor</code></a>.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<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>
 </div>
@@ -151,7 +158,9 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-">makeSchema</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>&nbsp;model)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-">makeSchema</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>&nbsp;model)</code>
+<div class="block">Builds object presentation for SQL schema from given data model.</div>
+</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -199,6 +208,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <li class="blockList">
 <h4>makeSchema</h4>
 <pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;makeSchema(<a href="../../../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>&nbsp;model)</pre>
+<div class="block">Builds object presentation for SQL schema from given data model. Note that the model must be
+ generated by <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlModelGenerator</code></a> class.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>model</code> - Data model to generate object SQL schema presentation. Data model must be
+      generated by <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlModelGenerator</code></a> class.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Object presentation of the SQL schema for a given data model.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown in case of any errors.</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<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>
 </li>
@@ -231,7 +254,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.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/NCSqlSimpleCondition.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/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/NCSqlSchemaBuilder.html" target="_top">Frames</a></li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html
index 3cad799..2cbee24 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.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>NCSqlSort (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -52,7 +52,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.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/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/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -105,7 +105,12 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">NCSqlSort</span></pre>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL sorting.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSort--"><code>NCSqlTable.getDefaultSort()</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractSort-org.apache.nlpcraft.model.NCToken-"><code>NCSqlExtractor.extractSort(NCToken)</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -126,11 +131,15 @@ 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/NCSqlSort.html#getColumn--">getColumn</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html#getColumn--">getColumn</a></span>()</code>
+<div class="block">Gets SQL column by which to sort.</div>
+</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html#isAscending--">isAscending</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html#isAscending--">isAscending</a></span>()</code>
+<div class="block">Gets sorting direction.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -154,8 +163,10 @@ var activeTableTab = "activeTableTab";
 <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>
+<div class="block">Gets SQL column by which to sort.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>SQL column by which to sort.</dd>
 </dl>
 </li>
 </ul>
@@ -166,8 +177,10 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>isAscending</h4>
 <pre>boolean&nbsp;isAscending()</pre>
+<div class="block">Gets sorting direction.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd><code>True</code> for ascending sorting, <code>false</code> for descending.</dd>
 </dl>
 </li>
 </ul>
@@ -200,7 +213,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.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/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/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html
index d862bd9..0227f30 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.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>NCSqlTable (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -53,7 +53,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.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/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&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/NCSqlTable.html" target="_top">Frames</a></li>
@@ -105,7 +105,53 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">NCSqlTable</span></pre>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL table.
+ <p>
+ In JSON/YAML generated model the table is the model element (example):
+ <pre class="brush: js">
+   elements:
+     - id: "tbl:orders"
+       groups:
+       - "table"
+       synonyms:
+       - "orders"
+       metadata:
+         sql:name: "orders"
+         sql:defaultselect:
+         - "order_id"
+         - "order_date"
+         - "required_date"
+         sql:defaultsort:
+         - "orders.order_id#desc"
+         sql:extratables:
+         - "customers"
+         - "shippers"
+         - "employees"
+         sql:defaultdate: "orders.order_date"
+       description: "Auto-generated from 'orders' table."
+ </pre>
+ Few notes:
+ <ul>
+     <li>
+         All model elements representing SQL column have ID in a form of <code>tbl:sql_table_name</code>.
+     </li>
+     <li>
+         All model elements representing SQL column belong to <code>table</code> group.
+     </li>
+     <li>
+         These model elements have auto-generated synonyms and set of mandatory metadata.
+     </li>
+     <li>
+         User can freely add group membership, change synonyms, or add new metadata.
+     </li>
+ </ul></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-"><code>NCSqlSchemaBuilder.makeSchema(NCModel)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html#build-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCVariant-"><code>NCSqlExtractorBuilder.build(NCSqlSchema, NCVariant)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractTable-org.apache.nlpcraft.model.NCToken-"><code>NCSqlExtractor.extractTable(NCToken)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getTables--"><code>NCSqlSchema.getTables()</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -126,29 +172,39 @@ var activeTableTab = "activeTableTab";
 </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/NCSqlTable.html#getColumns--">getColumns</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getColumns--">getColumns</a></span>()</code>
+<div class="block">Gets collections of this table columns.</div>
+</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Optional.html?is-external=true" title="class or interface in java.util">Optional</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/NCSqlTable.html#getDefaultDate--">getDefaultDate</a></span>()</code>
-<div class="block">Note that this columns can contains to another table.</div>
+<div class="block">Gets a column that defines a default date for this table.</div>
 </td>
 </tr>
 <tr id="i2" 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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSelect--">getDefaultSelect</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSelect--">getDefaultSelect</a></span>()</code>
+<div class="block">Gets the list of the column names for the default select set.</div>
+</td>
 </tr>
 <tr id="i3" 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/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSort--">getDefaultSort</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSort--">getDefaultSort</a></span>()</code>
+<div class="block">Gets default sort descriptor.</div>
+</td>
 </tr>
 <tr id="i4" 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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getExtraTables--">getExtraTables</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getExtraTables--">getExtraTables</a></span>()</code>
+<div class="block">Gets the list of extra tables this table is referencing.</div>
+</td>
 </tr>
 <tr id="i5" 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/NCSqlTable.html#getTable--">getTable</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getTable--">getTable</a></span>()</code>
+<div class="block">Gets table name.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -172,8 +228,17 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getTable</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;getTable()</pre>
+<div class="block">Gets table name.
+ <p>
+ In JSON/YAML generated model the table name is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+      sql:name: "orders"
+ </pre>
+ Note also that all elements declaring SQL tables belong to <code>table</code> group.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>table name.</dd>
 </dl>
 </li>
 </ul>
@@ -184,8 +249,10 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getColumns</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;getColumns()</pre>
+<div class="block">Gets collections of this table columns.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Collections of this table columns.</dd>
 </dl>
 </li>
 </ul>
@@ -196,8 +263,19 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getDefaultSort</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/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a>&gt;&nbsp;getDefaultSort()</pre>
+<div class="block">Gets default sort descriptor.
+ <p>
+ In JSON/YAML generated model the default sort list is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:defaultsort:
+     - "orders.order_id#desc"
+ </pre>
+ Note the <code>table.column#{asc|desc}</code> notation for identifying table name,
+ column name and the sort order.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Default sort descriptor.</dd>
 </dl>
 </li>
 </ul>
@@ -208,8 +286,19 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getDefaultSelect</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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;getDefaultSelect()</pre>
+<div class="block">Gets the list of the column names for the default select set.
+ <p>
+ In JSON/YAML generated model the default select list is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:defaultselect:
+     - "order_id"
+     - "order_date"
+     - "required_date"
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>List of the column names for the default select set.</dd>
 </dl>
 </li>
 </ul>
@@ -220,8 +309,20 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getExtraTables</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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;getExtraTables()</pre>
+<div class="block">Gets the list of extra tables this table is referencing. Extra tables are joined together with this table
+ for default selection. Often, a single domain dataset if spread over multiple tables and this
+ allows to have a meaningful default selection.
+ <p>
+ In JSON/YAML generated model the extra tables list is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:extratables:
+     - "other_part_table"
+     - "another_part_table"
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>List of extra tables this table's default selection.</dd>
 </dl>
 </li>
 </ul>
@@ -232,9 +333,18 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getDefaultDate</h4>
 <pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Optional.html?is-external=true" title="class or interface in java.util">Optional</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;getDefaultDate()</pre>
-<div class="block">Note that this columns can contains to another table.</div>
+<div class="block">Gets a column that defines a default date for this table. Note that this column
+ can belong to another table.
+ <p>
+ In JSON/YAML generated model the default date column is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:defaultdate: "orders.order_date"
+ </pre>
+ Note <code>table.column</code> notation for the table and column names.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Column that defines a default date for this table.</dd>
 </dl>
 </li>
 </ul>
@@ -268,7 +378,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.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/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&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/NCSqlTable.html" target="_top">Frames</a></li>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlColumn.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlColumn.html
index ac411bc..c484e94 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlColumn.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlColumn.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.NCSqlColumn (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -108,25 +108,22 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<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"><span class="typeNameLabel">NCSqlUtils.</span><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 class="rowColor">
-<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"><span class="typeNameLabel">NCSqlSort.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html#getColumn--">getColumn</a></span>()</code>&nbsp;</td>
-</tr>
-<tr 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"><span class="typeNameLabel">NCSqlCondition.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html#getColumn--">getColumn</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">NCSqlExtractor.</span><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 class="rowColor">
 <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"><span class="typeNameLabel">NCSqlLimit.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#getColumn--">getColumn</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">NCSqlSort.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html#getColumn--">getColumn</a></span>()</code>
+<div class="block">Gets SQL column by which to sort.</div>
+</td>
 </tr>
 <tr 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"><span class="typeNameLabel">NCSqlFunction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html#getColumn--">getColumn</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">NCSqlLimit.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#getColumn--">getColumn</a></span>()</code>
+<div class="block">Gets SQL column this limit is applied.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -138,18 +135,22 @@
 </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/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlTable.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getColumns--">getColumns</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>default <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</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"><span class="typeNameLabel">NCSqlSchema.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getAllColumns--">getAllColumns</a></span>()</code>
+<div class="block">Creates and returns collection of all SQL columns across all tables in given schema.</div>
+</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Optional.html?is-external=true" title="class or interface in java.util">Optional</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"><span class="typeNameLabel">NCSqlTable.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultDate--">getDefaultDate</a></span>()</code>
-<div class="block">Note that this columns can contains to another table.</div>
+<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"><span class="typeNameLabel">NCSqlTable.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getColumns--">getColumns</a></span>()</code>
+<div class="block">Gets collections of this table columns.</div>
 </td>
 </tr>
 <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/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</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#getGroupBy--">getGroupBy</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Optional.html?is-external=true" title="class or interface in java.util">Optional</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"><span class="typeNameLabel">NCSqlTable.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultDate--">getDefaultDate</a></span>()</code>
+<div class="block">Gets a column that defines a default date for this table.</div>
+</td>
 </tr>
 </tbody>
 </table>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlDateRange.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlDateRange.html
index a10eb4f..ad4f182 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlDateRange.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlDateRange.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.NCSqlDateRange (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -108,8 +108,10 @@
 </tr>
 <tbody>
 <tr 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"><span class="typeNameLabel">NCSqlUtils.</span><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>
+<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"><span class="typeNameLabel">NCSqlExtractor.</span><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>
 </tbody>
 </table>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoin.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoin.html
index f2c2658..8f3aec9 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoin.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoin.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.NCSqlJoin (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -109,7 +109,9 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlSchema.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getJoins--">getJoins</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">NCSqlSchema.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getJoins--">getJoins</a></span>()</code>
+<div class="block">Gets collection of joins for this SQL schema.</div>
+</td>
 </tr>
 </tbody>
 </table>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlLimit.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlLimit.html
index 03e6811..5485fb7 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlLimit.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlLimit.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.NCSqlLimit (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -108,10 +108,10 @@
 </tr>
 <tbody>
 <tr 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"><span class="typeNameLabel">NCSqlUtils.</span><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 [...]
-            <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>
+<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"><span class="typeNameLabel">NCSqlExtractor.</span><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>
 </tbody>
 </table>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlModelGenerator.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlModelGenerator.html
index fe7c5c3..bc22766 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlModelGenerator.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlModelGenerator.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.NCSqlModelGenerator (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSchema.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSchema.html
index 73884d8..75f4cb0 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSchema.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSchema.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.NCSqlSchema (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -109,7 +109,9 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a></code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlSchemaBuilder.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-">makeSchema</a></span>(<a href="../../../../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>&nbsp;model)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">NCSqlSchemaBuilder.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-">makeSchema</a></span>(<a href="../../../../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>&nbsp;model)</code>
+<div class="block">Builds object presentation for SQL schema from given data model.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -121,50 +123,11 @@
 </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>
-</tr>
-<tr 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"><span class="typeNameLabel">NCSqlUtils.</span><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 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="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</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#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 [...]
-            <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 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#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>
-<tr class="rowColor">
-<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"><span class="typeNameLabel">NCSqlUtils.</span><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 [...]
-            <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 class="altColor">
-<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"><span class="typeNameLabel">NCSqlUtils.</span><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 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/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>
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSchemaBuilder.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSchemaBuilder.html
index f3e1628..840135f 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSchemaBuilder.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSchemaBuilder.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.NCSqlSchemaBuilder (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSort.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSort.html
index 3ba0b10..12324e3 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSort.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSort.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.NCSqlSort (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -108,10 +108,10 @@
 </tr>
 <tbody>
 <tr 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"><span class="typeNameLabel">NCSqlUtils.</span><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 [...]
-            <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>
+<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"><span class="typeNameLabel">NCSqlExtractor.</span><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>
 </tbody>
 </table>
@@ -124,7 +124,9 @@
 <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/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlTable.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSort--">getDefaultSort</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">NCSqlTable.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSort--">getDefaultSort</a></span>()</code>
+<div class="block">Gets default sort descriptor.</div>
+</td>
 </tr>
 </tbody>
 </table>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlTable.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlTable.html
index fcb7565..58de1fd 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlTable.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlTable.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.NCSqlTable (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -108,9 +108,10 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<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"><span class="typeNameLabel">NCSqlUtils.</span><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>
+<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"><span class="typeNameLabel">NCSqlExtractor.</span><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>
 </tbody>
 </table>
@@ -123,7 +124,9 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlSchema.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getTables--">getTables</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">NCSqlSchema.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getTables--">getTables</a></span>()</code>
+<div class="block">Gets collection of tables for this SQL schema.</div>
+</td>
 </tr>
 </tbody>
 </table>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-frame.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-frame.html
index 2ef2646..0965721 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-frame.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-frame.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>org.apache.nlpcraft.model.tools.sqlgen (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -14,29 +14,24 @@
 <div class="indexContainer">
 <h2 title="Interfaces">Interfaces</h2>
 <ul title="Interfaces">
-<li><a href="NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlAggregate</span></a></li>
 <li><a href="NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlColumn</span></a></li>
-<li><a href="NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlCondition</span></a></li>
 <li><a href="NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlDateRange</span></a></li>
-<li><a href="NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlFunction</span></a></li>
-<li><a href="NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlInCondition</span></a></li>
+<li><a href="NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlExtractor</span></a></li>
 <li><a href="NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlJoin</span></a></li>
 <li><a href="NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlLimit</span></a></li>
-<li><a href="NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlQuery</span></a></li>
 <li><a href="NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlSchema</span></a></li>
-<li><a href="NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlSimpleCondition</span></a></li>
 <li><a href="NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlSort</span></a></li>
 <li><a href="NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlTable</span></a></li>
 </ul>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
+<li><a href="NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlExtractorBuilder</a></li>
 <li><a href="NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlModelGenerator</a></li>
 <li><a href="NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlSchemaBuilder</a></li>
-<li><a href="NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlUtils</a></li>
 </ul>
-<h2 title="Exceptions">Exceptions</h2>
-<ul title="Exceptions">
-<li><a href="NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlException</a></li>
+<h2 title="Enums">Enums</h2>
+<ul title="Enums">
+<li><a href="NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlJoinType</a></li>
 </ul>
 </div>
 </body>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-summary.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-summary.html
index 8725da7..f830615 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-summary.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-summary.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>org.apache.nlpcraft.model.tools.sqlgen (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -90,69 +90,51 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></td>
 <td class="colLast">
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL column.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlDateRange</a></td>
 <td class="colLast">
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL date range.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a></td>
-<td class="colLast">&nbsp;</td>
+<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></td>
+<td class="colLast">
+<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.</div>
+</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a></td>
 <td class="colLast">
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL join (foreign key).</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a></td>
 <td class="colLast">
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL limit.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlQuery</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a></td>
 <td class="colLast">
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL schema.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a></td>
 <td class="colLast">
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL sorting.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></td>
 <td class="colLast">
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL table.</div>
 </td>
 </tr>
 </tbody>
@@ -167,35 +149,39 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlModelGenerator</a></td>
+<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractorBuilder</a></td>
 <td class="colLast">
-<div class="block">Command line utility to generate NLPCraft model stub from given SQL RDBMS.</div>
+<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>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchemaBuilder</a></td>
-<td class="colLast">&nbsp;</td>
+<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlModelGenerator</a></td>
+<td class="colLast">
+<div class="block">Command line utility to generate YAML/JSON NLPCraft model stub from given SQL RDBMS.</div>
+</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></td>
+<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchemaBuilder</a></td>
 <td class="colLast">
-<div class="block">TODO: add description.</div>
+<div class="block">Builder for <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlSchema</code></a> instances.</div>
 </td>
 </tr>
 </tbody>
 </table>
 </li>
 <li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Exception Summary table, listing exceptions, and an explanation">
-<caption><span>Exception Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Summary table, listing enums, and an explanation">
+<caption><span>Enum Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colFirst" scope="col">Exception</th>
+<th class="colFirst" scope="col">Enum</th>
 <th class="colLast" scope="col">Description</th>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlException</a></td>
-<td class="colLast">&nbsp;</td>
+<td class="colFirst"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></td>
+<td class="colLast">
+<div class="block">Type of the SQL join.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -205,7 +191,12 @@
 <!--   -->
 </a>
 <h2 title="Package org.apache.nlpcraft.model.tools.sqlgen Description">Package org.apache.nlpcraft.model.tools.sqlgen Description</h2>
-<div class="block">Contains model stub generator for SQL RDBMS.</div>
+<div class="block">Contains model stub generator for SQL RDBMS.
+ <p>
+ Run the following from the command line to get a full documentation on how to run model stub generator:
+ <pre class="brush:plain">
+ java -cp apache-nlpcraft-x.x.x-all-deps.jar org.apache.nlpcraft.model.tools.sqlgen.NCSqlModelGenerator --help
+ </pre></div>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-tree.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-tree.html
index 843f308..0509678 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-tree.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-tree.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>org.apache.nlpcraft.model.tools.sqlgen Class Hierarchy (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -84,44 +84,35 @@
 <ul>
 <li type="circle">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"><span class="typeNameLink">Object</span></a>
 <ul>
+<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlExtractorBuilder</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlModelGenerator</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSchemaBuilder</span></a></li>
-<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlUtils</span></a></li>
-<li type="circle">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"><span class="typeNameLink">Throwable</span></a> (implements java.io.<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>)
-<ul>
-<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Exception</span></a>
-<ul>
-<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">RuntimeException</span></a>
-<ul>
-<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlException</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
 </ul>
 </li>
 </ul>
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
-<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlAggregate</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlColumn</span></a></li>
-<li type="circle">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"><span class="typeNameLink">NCSqlCondition</span></a>
-<ul>
-<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlInCondition</span></a></li>
-<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSimpleCondition</span></a></li>
-</ul>
-</li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlDateRange</span></a></li>
-<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlFunction</span></a></li>
+<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlExtractor</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlJoin</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlLimit</span></a></li>
-<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlQuery</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSchema</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSort</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlTable</span></a></li>
 </ul>
+<h2 title="Enum Hierarchy">Enum Hierarchy</h2>
+<ul>
+<li type="circle">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"><span class="typeNameLink">Object</span></a>
+<ul>
+<li type="circle">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"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<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;T&gt;, java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" t [...]
+<ul>
+<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlJoinType</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-use.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-use.html
index c099953..32af221 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-use.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/sqlgen/package-use.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Package org.apache.nlpcraft.model.tools.sqlgen (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -104,53 +104,48 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlAggregate.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlColumn.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL column.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlCondition.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlCondition</a>&nbsp;</td>
-</tr>
 <tr class="rowColor">
 <td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlDateRange.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlDateRange</a>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL date range.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlFunction.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a>&nbsp;</td>
+<td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlExtractor.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a>
+<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.</div>
+</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlInCondition.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a>&nbsp;</td>
+<td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoin.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a>
+<div class="block">Object presentation of SQL join (foreign key).</div>
+</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoin.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a>
-<div class="block">TODO: add description.</div>
+<td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlJoinType.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>
+<div class="block">Type of the SQL join.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlLimit.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL limit.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSchema.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL schema.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSimpleCondition.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a>&nbsp;</td>
-</tr>
-<tr class="altColor">
 <td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlSort.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL sorting.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/class-use/NCSqlTable.html#org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL table.</div>
 </td>
 </tr>
 </tbody>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestClient.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestClient.html
index 8c418ad..49d2b7b 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestClient.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestClient.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>NCTestClient (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -114,26 +114,31 @@ var activeTableTab = "activeTableTab";
  the usage of test framework together with JUnit 5:
  <pre class="brush: java, highlight: [6, 8, 13, 19, 22, 25, 26, 27]">
  public class AlarmTest {
-     private NCTestClient client;
+     private NCTestClient cli;
 
      &#64;BeforeEach
      void setUp() throws NCException, IOException {
-         client = new NCTestClientBuilder().newBuilder().build();
+         NCEmbeddedProbe.start(AlarmModel.class);
 
-         client.open("nlpcraft.alarm.ex");
+         cli = new NCTestClientBuilder().newBuilder().build();
+
+         cli.open("nlpcraft.alarm.ex");
      }
 
      &#64;AfterEach
      void tearDown() throws NCException, IOException {
-         client.close();
+         if (cli != null)
+             cli.close();
+
+         NCEmbeddedProbe.stop();
      }
 
      &#64;Test
      public void test() throws NCException, IOException {
          // Should be passed.
-         assertTrue(client.ask("Ping me in 3 minutes").isOk());
-         assertTrue(client.ask("Buzz me in an hour and 15mins").isOk());
-         assertTrue(client.ask("Set my alarm for 30s").isOk());
+         assertTrue(cli.ask("Ping me in 3 minutes").isOk());
+         assertTrue(cli.ask("Buzz me in an hour and 15mins").isOk());
+         assertTrue(cli.ask("Set my alarm for 30s").isOk());
      }
  }
  </pre></div>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestClientBuilder.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestClientBuilder.html
index 99b4f04..fd3e922 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestClientBuilder.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestClientBuilder.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>NCTestClientBuilder (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestClientException.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestClientException.html
index 015875d..45c8af4 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestClientException.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestClientException.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>NCTestClientException (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestResult.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestResult.html
index ae469f4..ac86d8f 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestResult.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/NCTestResult.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>NCTestResult (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestClient.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestClient.html
index a1fbf97..ee1b019 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestClient.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestClient.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.test.NCTestClient (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestClientBuilder.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestClientBuilder.html
index 13c9ca7..a46d6c4 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestClientBuilder.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestClientBuilder.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.test.NCTestClientBuilder (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestClientException.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestClientException.html
index 57ed2f2..6c131dc 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestClientException.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestClientException.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.test.NCTestClientException (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestResult.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestResult.html
index 2ab2b29..f6ccbfc 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestResult.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/class-use/NCTestResult.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.test.NCTestResult (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-frame.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-frame.html
index 79e596d..9de5f07 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-frame.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-frame.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>org.apache.nlpcraft.model.tools.test (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-summary.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-summary.html
index 5ef049e..b165911 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-summary.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-summary.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>org.apache.nlpcraft.model.tools.test (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -149,32 +149,37 @@
  the usage of test framework together with JUnit 5:
  <pre class="brush: java">
  public class AlarmTest {
-     private NCTestClient client;
+     private NCTestClient cli;
 
      &#64;BeforeEach
      void setUp() throws NCException, IOException {
-         client = new NCTestClientBuilder().newBuilder().build();
+         NCEmbeddedProbe.start(AlarmModel.class);
 
-         client.open("nlpcraft.alarm.ex");
+         cli = new NCTestClientBuilder().newBuilder().build();
+
+         cli.open("nlpcraft.alarm.ex");
      }
 
      &#64;AfterEach
      void tearDown() throws NCException, IOException {
-         client.close();
+         if (cli != null)
+             cli.close();
+
+         NCEmbeddedProbe.stop();
      }
 
      &#64;Test
      public void test() throws NCException, IOException {
          // Empty parameter.
-         assertTrue(client.ask("").isFailed());
+         assertTrue(cli.ask("").isFailed());
 
          // Only latin charset is supported.
-         assertTrue(client.ask("El tiempo en España").isFailed());
+         assertTrue(cli.ask("El tiempo en España").isFailed());
 
          // Should be passed.
-         assertTrue(client.ask("Ping me in 3 minutes").isOk());
-         assertTrue(client.ask("Buzz me in an hour and 15mins").isOk());
-         assertTrue(client.ask("Set my alarm for 30s").isOk());
+         assertTrue(cli.ask("Ping me in 3 minutes").isOk());
+         assertTrue(cli.ask("Buzz me in an hour and 15mins").isOk());
+         assertTrue(cli.ask("Set my alarm for 30s").isOk());
      }
  }
  </pre></div>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-tree.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-tree.html
index 74666d7..a6a3d5d 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-tree.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-tree.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>org.apache.nlpcraft.model.tools.test Class Hierarchy (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-use.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-use.html
index fe3cdb0..a758cc6 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-use.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/model/tools/test/package-use.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Package org.apache.nlpcraft.model.tools.test (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/NCEmbeddedProbe.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/NCEmbeddedProbe.html
index 5dabcc5..d86df56 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/NCEmbeddedProbe.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/NCEmbeddedProbe.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>NCEmbeddedProbe (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.html
index 739e771..e3c21c4 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.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>NCEmbeddedResult (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/class-use/NCEmbeddedProbe.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/class-use/NCEmbeddedProbe.html
index a9dfc7c..234f458 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/class-use/NCEmbeddedProbe.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/class-use/NCEmbeddedProbe.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.apache.nlpcraft.probe.embedded.NCEmbeddedProbe (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/class-use/NCEmbeddedResult.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/class-use/NCEmbeddedResult.html
index 5847e5e..0b2dd2b 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/class-use/NCEmbeddedResult.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/class-use/NCEmbeddedResult.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.probe.embedded.NCEmbeddedResult (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-frame.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-frame.html
index 66d7fea..d18381d 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-frame.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-frame.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>org.apache.nlpcraft.probe.embedded (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-summary.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-summary.html
index ad3b62c..8b903e2 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-summary.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-summary.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>org.apache.nlpcraft.probe.embedded (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-tree.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-tree.html
index 9c0dee5..680ab8d 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-tree.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-tree.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>org.apache.nlpcraft.probe.embedded Class Hierarchy (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-use.html b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-use.html
index a85ded2..0cf6cd3 100644
--- a/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-use.html
+++ b/docs/apis/javadoc-0.5.0/org/apache/nlpcraft/probe/embedded/package-use.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Package org.apache.nlpcraft.probe.embedded (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/overview-frame.html b/docs/apis/javadoc-0.5.0/overview-frame.html
index e4870d4..1a43118 100644
--- a/docs/apis/javadoc-0.5.0/overview-frame.html
+++ b/docs/apis/javadoc-0.5.0/overview-frame.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>Overview List (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/javadoc-0.5.0/overview-summary.html b/docs/apis/javadoc-0.5.0/overview-summary.html
index 77fb239..7d1f8b6 100644
--- a/docs/apis/javadoc-0.5.0/overview-summary.html
+++ b/docs/apis/javadoc-0.5.0/overview-summary.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Overview (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -73,7 +73,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title"><img style="margin-bottom: 10px" src="https://nlpcraft.org/images/nlpcraft_logo_darkblue.png" height="54px"></h1>
+<h1 class="title"><img style="margin-top: 15px" src="https://nlpcraft.org/images/nlpcraft_logo_darkblue.png" height="54px"></h1>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Data Model APIs table, listing packages, and an explanation">
diff --git a/docs/apis/javadoc-0.5.0/overview-tree.html b/docs/apis/javadoc-0.5.0/overview-tree.html
index 396281d..6cace17 100644
--- a/docs/apis/javadoc-0.5.0/overview-tree.html
+++ b/docs/apis/javadoc-0.5.0/overview-tree.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Class Hierarchy (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -99,6 +99,16 @@
 </li>
 <li type="circle">org.apache.nlpcraft.model.factories.basic.<a href="org/apache/nlpcraft/model/factories/basic/NCBasicModelFactory.html" title="class in org.apache.nlpcraft.model.factories.basic"><span class="typeNameLink">NCBasicModelFactory</span></a> (implements org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCModelFactory.html" title="interface in org.apache.nlpcraft.model">NCModelFactory</a>)</li>
 <li type="circle">org.apache.nlpcraft.probe.embedded.<a href="org/apache/nlpcraft/probe/embedded/NCEmbeddedProbe.html" title="class in org.apache.nlpcraft.probe.embedded"><span class="typeNameLink">NCEmbeddedProbe</span></a></li>
+<li type="circle">NCException
+<ul>
+<li type="circle">org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCRejection</span></a></li>
+</ul>
+</li>
+<li type="circle">NCException
+<ul>
+<li type="circle">org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCIntentSkip</span></a></li>
+</ul>
+</li>
 <li type="circle">org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCModelAdapter.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCModelAdapter</span></a> (implements org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>)
 <ul>
 <li type="circle">org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCModelFileAdapter</span></a></li>
@@ -107,9 +117,9 @@
 <li type="circle">org.apache.nlpcraft.model.opencensus.<a href="org/apache/nlpcraft/model/opencensus/NCPrometheusExporter.html" title="class in org.apache.nlpcraft.model.opencensus"><span class="typeNameLink">NCPrometheusExporter</span></a> (implements org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCLifecycle.html" title="interface in org.apache.nlpcraft.model">NCLifecycle</a>)</li>
 <li type="circle">org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCResult</span></a> (implements java.io.<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>)</li>
 <li type="circle">org.apache.nlpcraft.model.factories.spring.<a href="org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html" title="class in org.apache.nlpcraft.model.factories.spring"><span class="typeNameLink">NCSpringModelFactory</span></a> (implements org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCModelFactory.html" title="interface in org.apache.nlpcraft.model">NCModelFactory</a>)</li>
+<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlExtractorBuilder</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlModelGenerator</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSchemaBuilder</span></a></li>
-<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlUtils</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.opencensus.<a href="org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.html" title="class in org.apache.nlpcraft.model.opencensus"><span class="typeNameLink">NCStackdriverStatsExporter</span></a> (implements org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCLifecycle.html" title="interface in org.apache.nlpcraft.model">NCLifecycle</a>)</li>
 <li type="circle">org.apache.nlpcraft.model.tools.test.<a href="org/apache/nlpcraft/model/tools/test/NCTestClientBuilder.html" title="class in org.apache.nlpcraft.model.tools.test"><span class="typeNameLink">NCTestClientBuilder</span></a></li>
 <li type="circle">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"><span class="typeNameLink">Throwable</span></a> (implements java.io.<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>)
@@ -118,9 +128,6 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">RuntimeException</span></a>
 <ul>
-<li type="circle">org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCIntentSkip</span></a></li>
-<li type="circle">org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCRejection</span></a></li>
-<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlException</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.test.<a href="org/apache/nlpcraft/model/tools/test/NCTestClientException.html" title="class in org.apache.nlpcraft.model.tools.test"><span class="typeNameLink">NCTestClientException</span></a></li>
 </ul>
 </li>
@@ -179,19 +186,11 @@
 </li>
 <li type="circle">org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCModelFactory.html" title="interface in org.apache.nlpcraft.model"><span class="typeNameLink">NCModelFactory</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCRequest.html" title="interface in org.apache.nlpcraft.model"><span class="typeNameLink">NCRequest</span></a></li>
-<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlAggregate</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlColumn</span></a></li>
-<li type="circle">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"><span class="typeNameLink">NCSqlCondition</span></a>
-<ul>
-<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlInCondition</span></a></li>
-<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSimpleCondition</span></a></li>
-</ul>
-</li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlDateRange</span></a></li>
-<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlFunction</span></a></li>
+<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlExtractor</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlJoin</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlLimit</span></a></li>
-<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlQuery</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSchema</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSort</span></a></li>
 <li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlTable</span></a></li>
@@ -213,6 +212,18 @@
 <li type="circle">org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntent.html" title="annotation in org.apache.nlpcraft.model"><span class="typeNameLink">NCIntent</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentTerm.html" title="annotation in org.apache.nlpcraft.model"><span class="typeNameLink">NCIntentTerm</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 </ul>
+<h2 title="Enum Hierarchy">Enum Hierarchy</h2>
+<ul>
+<li type="circle">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"><span class="typeNameLink">Object</span></a>
+<ul>
+<li type="circle">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"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<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;T&gt;, java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" t [...]
+<ul>
+<li type="circle">org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlJoinType</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
diff --git a/docs/apis/javadoc-0.5.0/serialized-form.html b/docs/apis/javadoc-0.5.0/serialized-form.html
index 5092787..4c2c205 100644
--- a/docs/apis/javadoc-0.5.0/serialized-form.html
+++ b/docs/apis/javadoc-0.5.0/serialized-form.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>Serialized Form (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -80,16 +80,6 @@
 <li class="blockList">
 <h2 title="Package">Package&nbsp;org.apache.nlpcraft.model</h2>
 <ul class="blockList">
-<li class="blockList"><a name="org.apache.nlpcraft.model.NCIntentSkip">
-<!--   -->
-</a>
-<h3>Class <a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model">org.apache.nlpcraft.model.NCIntentSkip</a> 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> implements Serializable</h3>
-</li>
-<li class="blockList"><a name="org.apache.nlpcraft.model.NCRejection">
-<!--   -->
-</a>
-<h3>Class <a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model">org.apache.nlpcraft.model.NCRejection</a> 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> implements Serializable</h3>
-</li>
 <li class="blockList"><a name="org.apache.nlpcraft.model.NCResult">
 <!--   -->
 </a>
@@ -117,16 +107,6 @@
 </ul>
 </li>
 <li class="blockList">
-<h2 title="Package">Package&nbsp;org.apache.nlpcraft.model.tools.sqlgen</h2>
-<ul class="blockList">
-<li class="blockList"><a name="org.apache.nlpcraft.model.tools.sqlgen.NCSqlException">
-<!--   -->
-</a>
-<h3>Class <a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">org.apache.nlpcraft.model.tools.sqlgen.NCSqlException</a> 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> implements Serializable</h3>
-</li>
-</ul>
-</li>
-<li class="blockList">
 <h2 title="Package">Package&nbsp;org.apache.nlpcraft.model.tools.test</h2>
 <ul class="blockList">
 <li class="blockList"><a name="org.apache.nlpcraft.model.tools.test.NCTestClientException">
diff --git a/docs/apis/latest/allclasses-frame.html b/docs/apis/latest/allclasses-frame.html
index d4683c8..4f88ed1 100644
--- a/docs/apis/latest/allclasses-frame.html
+++ b/docs/apis/latest/allclasses-frame.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>All Classes (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -42,23 +42,18 @@
 <li><a href="org/apache/nlpcraft/model/NCRequest.html" title="interface in org.apache.nlpcraft.model" target="classFrame"><span class="interfaceName">NCRequest</span></a></li>
 <li><a href="org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCResult</a></li>
 <li><a href="org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html" title="class in org.apache.nlpcraft.model.factories.spring" target="classFrame">NCSpringModelFactory</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlAggregate</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlColumn</span></a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlCondition</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlDateRange</span></a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlException</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlFunction</span></a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlInCondition</span></a></li>
+<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlExtractor</span></a></li>
+<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlExtractorBuilder</a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlJoin</span></a></li>
+<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlJoinType</a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlLimit</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlModelGenerator</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlQuery</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlSchema</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlSchemaBuilder</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlSimpleCondition</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlSort</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame"><span class="interfaceName">NCSqlTable</span></a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen" target="classFrame">NCSqlUtils</a></li>
 <li><a href="org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.html" title="class in org.apache.nlpcraft.model.opencensus" target="classFrame">NCStackdriverStatsExporter</a></li>
 <li><a href="org/apache/nlpcraft/model/opencensus/NCStackdriverTraceExporter.html" title="class in org.apache.nlpcraft.model.opencensus" target="classFrame">NCStackdriverTraceExporter</a></li>
 <li><a href="org/apache/nlpcraft/model/tools/test/NCTestClient.html" title="interface in org.apache.nlpcraft.model.tools.test" target="classFrame"><span class="interfaceName">NCTestClient</span></a></li>
diff --git a/docs/apis/latest/allclasses-noframe.html b/docs/apis/latest/allclasses-noframe.html
index 6e3ae92..d61f38c 100644
--- a/docs/apis/latest/allclasses-noframe.html
+++ b/docs/apis/latest/allclasses-noframe.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>All Classes (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -42,23 +42,18 @@
 <li><a href="org/apache/nlpcraft/model/NCRequest.html" title="interface in org.apache.nlpcraft.model"><span class="interfaceName">NCRequest</span></a></li>
 <li><a href="org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model">NCResult</a></li>
 <li><a href="org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html" title="class in org.apache.nlpcraft.model.factories.spring">NCSpringModelFactory</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlAggregate</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlColumn</span></a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlCondition</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="interfaceName">NCSqlDateRange</span></a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlException</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlFunction</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="interfaceName">NCSqlInCondition</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="interfaceName">NCSqlExtractor</span></a></li>
+<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractorBuilder</a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlJoin</span></a></li>
+<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlLimit</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlModelGenerator</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlQuery</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="interfaceName">NCSqlSchema</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchemaBuilder</a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlSimpleCondition</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="interfaceName">NCSqlSort</span></a></li>
 <li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="interfaceName">NCSqlTable</span></a></li>
-<li><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></li>
 <li><a href="org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.html" title="class in org.apache.nlpcraft.model.opencensus">NCStackdriverStatsExporter</a></li>
 <li><a href="org/apache/nlpcraft/model/opencensus/NCStackdriverTraceExporter.html" title="class in org.apache.nlpcraft.model.opencensus">NCStackdriverTraceExporter</a></li>
 <li><a href="org/apache/nlpcraft/model/tools/test/NCTestClient.html" title="interface in org.apache.nlpcraft.model.tools.test"><span class="interfaceName">NCTestClient</span></a></li>
diff --git a/docs/apis/latest/constant-values.html b/docs/apis/latest/constant-values.html
index 92bea72..4d669a1 100644
--- a/docs/apis/latest/constant-values.html
+++ b/docs/apis/latest/constant-values.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>Constant Field Values (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/deprecated-list.html b/docs/apis/latest/deprecated-list.html
index 61a0e23..3c9cd36 100644
--- a/docs/apis/latest/deprecated-list.html
+++ b/docs/apis/latest/deprecated-list.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Deprecated List (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/help-doc.html b/docs/apis/latest/help-doc.html
index edbafbd..1623926 100644
--- a/docs/apis/latest/help-doc.html
+++ b/docs/apis/latest/help-doc.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>API Help (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/index-all.html b/docs/apis/latest/index-all.html
index 580e529..194e59e 100644
--- a/docs/apis/latest/index-all.html
+++ b/docs/apis/latest/index-all.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Index (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -72,7 +72,7 @@
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a> [...]
+<div class="contentContainer"><a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a> [...]
 <!--   -->
 </a>
 <h2 class="title">A</h2>
@@ -87,6 +87,10 @@
 </a>
 <h2 class="title">B</h2>
 <dl>
+<dt><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(NCSqlSchema, NCVariant)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractorBuilder</a></dt>
+<dd>
+<div class="block">Builds and returns new SQL extractor for given SQL schema and parsing variant.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/test/NCTestClientBuilder.html#build--">build()</a></span> - Method in class org.apache.nlpcraft.model.tools.test.<a href="org/apache/nlpcraft/model/tools/test/NCTestClientBuilder.html" title="class in org.apache.nlpcraft.model.tools.test">NCTestClientBuilder</a></dt>
 <dd>
 <div class="block">Build new configured test client instance.</div>
@@ -229,32 +233,32 @@
 </a>
 <h2 class="title">E</h2>
 <dl>
-<dt><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(NCSqlSchema, List&lt;NCToken&gt;, NCToken, NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcra [...]
-<dd>&nbsp;</dd>
-<dt><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(NCSqlSchema, NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#extractDateRange-org.apache.nlpcraft.model.NCToken-">extractDateRange(NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
-<dt><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(NCSqlSchema, NCToken, NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.s [...]
-<dd>&nbsp;</dd>
-<dt><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(NCSqlSchema, List&lt;NCToken&gt;, NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
-<dt><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(NCSqlSchema, NCToken, NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSql [...]
-<dd>&nbsp;</dd>
-<dt><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(NCSqlSchema, List&lt;NCToken&gt;, NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
-<dt><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(NCSqlSchema, NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
-<dt><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(NCSqlSchema, NCToken...)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractColumn-org.apache.nlpcraft.model.NCToken-">extractColumn(NCToken)</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></dt>
+<dd>
+<div class="block">Extract column object from the token.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractDateRange-org.apache.nlpcraft.model.NCToken-">extractDateRange(NCToken)</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></dt>
+<dd>
+<div class="block">Extract date range object from given <code>nlpcraft:date</code> token.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractLimit-org.apache.nlpcraft.model.NCToken-">extractLimit(NCToken)</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></dt>
+<dd>
+<div class="block">Extracts limit object from given <code>nlpcraft:limit</code> token.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractSort-org.apache.nlpcraft.model.NCToken-">extractSort(NCToken)</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></dt>
+<dd>
+<div class="block">Extracts sort object from given <code>nlpcraft:sort</code> token.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractTable-org.apache.nlpcraft.model.NCToken-">extractTable(NCToken)</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractor</a></dt>
+<dd>
+<div class="block">Extract table object from the token.</div>
+</dd>
 </dl>
 <a name="I:F">
 <!--   -->
 </a>
 <h2 class="title">F</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#findAnyColumnToken-org.apache.nlpcraft.model.NCToken-">findAnyColumnToken(NCToken)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCToken.html#findPartTokens-java.lang.String...-">findPartTokens(String...)</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a></dt>
 <dd>
 <div class="block">Gets the list of all part tokens with given IDs or aliases traversing entire part token graph.</div>
@@ -279,6 +283,10 @@
 <dd>
 <div class="block">Gets optional list of aliases this token is known by.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getAllColumns--">getAllColumns()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a></dt>
+<dd>
+<div class="block">Creates and returns collection of all SQL columns across all tables in given schema.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCToken.html#getAncestors--">getAncestors()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a></dt>
 <dd>
 <div class="block">Gets the list of all parent IDs from this token up to the root.</div>
@@ -305,17 +313,21 @@
  this request.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#getColumn--">getColumn()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html#getColumn--">getColumn()</a></span> - Method in interface 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></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html#getColumn--">getColumn()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets native name of this column.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#getColumn--">getColumn()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets SQL column this limit is applied.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html#getColumn--">getColumn()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets SQL column by which to sort.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getColumns--">getColumns()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets collections of this table columns.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCRequest.html#getCompany--">getCompany()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCRequest.html" title="interface in org.apache.nlpcraft.model">NCRequest</a></dt>
 <dd>
 <div class="block">Gets descriptor of the user's company on behalf of which this request was submitted.</div>
@@ -337,15 +349,22 @@
 <div class="block">Gets optional JSON data passed in with user request.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#getDataType--">getDataType()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets JDBC <a target="./org/apache/nlpcraft/model/tools/sqlgen/new" href="https://docs.oracle.com/javase/8/docs/api/java/sql/Types.html">data type</a>
+ for this column.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultDate--">getDefaultDate()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></dt>
 <dd>
-<div class="block">Note that this columns can contains to another table.</div>
+<div class="block">Gets a column that defines a default date for this table.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSelect--">getDefaultSelect()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets the list of the column names for the default select set.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSort--">getDefaultSort()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets default sort descriptor.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCElement.html#getDescription--">getDescription()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCElement.html" title="interface in org.apache.nlpcraft.model">NCElement</a></dt>
 <dd>
 <div class="block">Gets optional element description.</div>
@@ -405,21 +424,25 @@
 <div class="block">Gets an optional list of stopwords to exclude from the built-in list of stopwords.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getExtraTables--">getExtraTables()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets the list of extra tables this table is referencing.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCUser.html#getFirstName--">getFirstName()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCUser.html" title="interface in org.apache.nlpcraft.model">NCUser</a></dt>
 <dd>
 <div class="block">Gets first name of the user.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html#getFrom--">getFrom()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlDateRange</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets 'from' timestamp.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getFromColumns--">getFromColumns()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets the list of columns in originating table.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getFromTable--">getFromTable()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html#getFunction--">getFunction()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlFunction</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html#getGroupBy--">getGroupBy()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets the name of the originating table.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCElement.html#getGroups--">getGroups()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCElement.html" title="interface in org.apache.nlpcraft.model">NCElement</a></dt>
 <dd>
 <div class="block">Gets the list of groups this elements belongs to.</div>
@@ -477,7 +500,9 @@
  match the multi-word synonyms.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getJoins--">getJoins()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets collection of joins for this SQL schema.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCUser.html#getLastName--">getLastName()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCUser.html" title="interface in org.apache.nlpcraft.model">NCUser</a></dt>
 <dd>
 <div class="block">Gets last name of the user.</div>
@@ -487,7 +512,9 @@
 <div class="block">Gets the lemma of this word, a canonical form of this word.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#getLimit--">getLimit()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets the numeric value of the limit.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.html#getLogHolder--">getLogHolder()</a></span> - Method in interface org.apache.nlpcraft.probe.embedded.<a href="org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.html" title="interface in org.apache.nlpcraft.probe.embedded">NCEmbeddedResult</a></dt>
 <dd>
 <div class="block">Gets request processing log holder as JSON string.</div>
@@ -620,8 +647,6 @@
 <dd>
 <div class="block">Gets normalized text of the user input.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html#getOperation--">getOperation()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCModelFileAdapter.html#getOrigin--">getOrigin()</a></span> - Method in class org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model">NCModelFileAdapter</a></dt>
 <dd>
 <div class="block">Gets this file model adapter origin (file path or URI).</div>
@@ -638,8 +663,6 @@
 <dd>
 <div class="block">Gets original text of the request that produced this result.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html#getParameters--">getParameters()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlQuery</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCElement.html#getParentId--">getParentId()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCElement.html" title="interface in org.apache.nlpcraft.model">NCElement</a></dt>
 <dd>
 <div class="block">Gets optional ID of the immediate parent element.</div>
@@ -710,8 +733,6 @@
 <dd>
 <div class="block">Gets optional execution result type.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html#getSelect--">getSelect()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlAggregate</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCContext.html#getServerRequestId--">getServerRequestId()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCContext.html" title="interface in org.apache.nlpcraft.model">NCContext</a></dt>
 <dd>
 <div class="block">Gets globally unique ID of the current request.</div>
@@ -732,8 +753,6 @@
 <dd>
 <div class="block">Gets signup timestamp of the user.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html#getSql--">getSql()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlQuery</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCCustomWord.html#getStartCharIndex--">getStartCharIndex()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCCustomWord.html" title="interface in org.apache.nlpcraft.model">NCCustomWord</a></dt>
 <dd>
 <div class="block">Gets start character index of this word in the original text.</div>
@@ -761,11 +780,17 @@
 <div class="block">Gets optional list of value's synonyms.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#getTable--">getTable()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets name of the table this column belongs to.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getTable--">getTable()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets table name.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getTables--">getTables()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets collection of tables for this SQL schema.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCIntentMatch.html#getTermTokens-int-">getTermTokens(int)</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentMatch.html" title="interface in org.apache.nlpcraft.model">NCIntentMatch</a></dt>
 <dd>
 <div class="block">Gets tokens for given term.</div>
@@ -779,9 +804,13 @@
 <div class="block">Gets test sentence text.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html#getTo--">getTo()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlDateRange</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets 'to' timestamp.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getToColumns--">getToColumns()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets the list of columns in target table.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCConversation.html#getTokens--">getTokens()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCConversation.html" title="interface in org.apache.nlpcraft.model">NCConversation</a></dt>
 <dd>
 <div class="block">Gets an ordered list of tokens stored in the conversation STM for the current
@@ -792,11 +821,17 @@
 <div class="block">Gets tokens that were used to produce this query result.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getToTable--">getToTable()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets the name of the target table.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCResult.html#getType--">getType()</a></span> - Method in class org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model">NCResult</a></dt>
 <dd>
 <div class="block">Gets result type.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getType--">getType()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a></dt>
+<dd>
+<div class="block">Gets type of the join.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.html#getType--">getType()</a></span> - Method in interface org.apache.nlpcraft.probe.embedded.<a href="org/apache/nlpcraft/probe/embedded/NCEmbeddedResult.html" title="interface in org.apache.nlpcraft.probe.embedded">NCEmbeddedResult</a></dt>
 <dd>
 <div class="block">Gets optional result type.</div>
@@ -817,8 +852,6 @@
 <dd>
 <div class="block">Gets the value if this token was detected via element's value (or its synonyms).</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html#getValue--">getValue()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSimpleCondition</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCElement.html#getValueLoader--">getValueLoader()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCElement.html" title="interface in org.apache.nlpcraft.model">NCElement</a></dt>
 <dd>
 <div class="block">Gets optional dynamic value loader.</div>
@@ -827,8 +860,6 @@
 <dd>
 <div class="block">Gets optional map of <a href="org/apache/nlpcraft/model/NCValue.html" title="interface in org.apache.nlpcraft.model"><code>values</code></a> for this element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html#getValues--">getValues()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlInCondition</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCIntentMatch.html#getVariant--">getVariant()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentMatch.html" title="interface in org.apache.nlpcraft.model">NCIntentMatch</a></dt>
 <dd>
 <div class="block">Gets sentence parsing variant that produced the matching for this intent.</div>
@@ -886,9 +917,13 @@
 <div class="block">Indicates whether or not the intent match was ambiguous (not exact).</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#isAscending--">isAscending()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlLimit</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets whether limit ascending or descending.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html#isAscending--">isAscending()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Gets sorting direction.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCCustomWord.html#isBracketed--">isBracketed()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCCustomWord.html" title="interface in org.apache.nlpcraft.model">NCCustomWord</a></dt>
 <dd>
 <div class="block">Gets whether or not this word is surrounded by any of <code>'[', ']', '{', '}', '(', ')'</code> brackets.</div>
@@ -919,6 +954,14 @@
 <dd>
 <div class="block">Tests whether or not this token is found in Princeton WordNet database.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCElement.html#isMemberOf-java.lang.String-">isMemberOf(String)</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCElement.html" title="interface in org.apache.nlpcraft.model">NCElement</a></dt>
+<dd>
+<div class="block">Shortcut method to test if this element is a member of given group.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCToken.html#isMemberOf-java.lang.String-">isMemberOf(String)</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a></dt>
+<dd>
+<div class="block">Tests whether or not this token belongs to the given group.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCModelFileAdapter.html#isNonEnglishAllowed--">isNonEnglishAllowed()</a></span> - Method in class org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model">NCModelFileAdapter</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCModelView.html#isNonEnglishAllowed--">isNonEnglishAllowed()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCModelView.html" title="interface in org.apache.nlpcraft.model">NCModelView</a></dt>
@@ -944,7 +987,13 @@
 <div class="block">Whether or not to allow the user input with no user token detected.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#isNullable--">isNullable()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Tests whether or not this column is nullable.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCToken.html#isOfAlias-java.lang.String-">isOfAlias(String)</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a></dt>
+<dd>
+<div class="block">Tests whether or not this token has given alias.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/test/NCTestResult.html#isOk--">isOk()</a></span> - Method in interface org.apache.nlpcraft.model.tools.test.<a href="org/apache/nlpcraft/model/tools/test/NCTestResult.html" title="interface in org.apache.nlpcraft.model.tools.test">NCTestResult</a></dt>
 <dd>
 <div class="block">Tests whether or not this result corresponds to a successful execution.</div>
@@ -960,7 +1009,9 @@
 <div class="block">Whether or not to permutate multi-word synonyms.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#isPk--">isPk()</a></span> - Method in interface org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlColumn</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Tests whether or not this column is a primary key column.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCCustomWord.html#isQuoted--">isQuoted()</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCCustomWord.html" title="interface in org.apache.nlpcraft.model">NCCustomWord</a></dt>
 <dd>
 <div class="block">Gets whether or not this word is surrounded by single or double quotes.</div>
@@ -1022,7 +1073,9 @@
 <div class="block">Runs SQL model generator with given command line parameters.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-">makeSchema(NCModel)</a></span> - Static method in class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchemaBuilder</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Builds object presentation for SQL schema from given data model.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta(String)</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></dt>
 <dd>
 <div class="block">Shortcut method to get given metadata property.</div>
@@ -1035,6 +1088,10 @@
 <dd>
 <div class="block">Shortcut method to get given optional metadata property.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax(String)</a></span> - Method in interface org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></dt>
+<dd>
+<div class="block">Shortcut method to get given mandatory metadata property.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/factories/basic/NCBasicModelFactory.html#mkModel-java.lang.Class-">mkModel(Class&lt;? extends NCModel&gt;)</a></span> - Method in class org.apache.nlpcraft.model.factories.basic.<a href="org/apache/nlpcraft/model/factories/basic/NCBasicModelFactory.html" title="class in org.apache.nlpcraft.model.factories.basic">NCBasicModelFactory</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html#mkModel-java.lang.Class-">mkModel(Class&lt;? extends NCModel&gt;)</a></span> - Method in class org.apache.nlpcraft.model.factories.spring.<a href="org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html" title="class in org.apache.nlpcraft.model.factories.spring">NCSpringModelFactory</a></dt>
@@ -1113,15 +1170,15 @@
 <dd>
 <div class="block">Annotations referencing an intent defined externally in JSON or YAML model declaration.</div>
 </dd>
-<dt><a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCIntentSkip</span></a> - Exception in <a href="org/apache/nlpcraft/model/package-summary.html">org.apache.nlpcraft.model</a></dt>
+<dt><a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCIntentSkip</span></a> - Class in <a href="org/apache/nlpcraft/model/package-summary.html">org.apache.nlpcraft.model</a></dt>
 <dd>
 <div class="block">Control flow exception to skip current intent.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCIntentSkip.html#NCIntentSkip--">NCIntentSkip()</a></span> - Constructor for exception org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model">NCIntentSkip</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCIntentSkip.html#NCIntentSkip--">NCIntentSkip()</a></span> - Constructor for class org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model">NCIntentSkip</a></dt>
 <dd>
 <div class="block">Creates new intent skip exception.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCIntentSkip.html#NCIntentSkip-java.lang.String-">NCIntentSkip(String)</a></span> - Constructor for exception org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model">NCIntentSkip</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCIntentSkip.html#NCIntentSkip-java.lang.String-">NCIntentSkip(String)</a></span> - Constructor for class org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model">NCIntentSkip</a></dt>
 <dd>
 <div class="block">Creates new intent skip exception with given debug message.</div>
 </dd>
@@ -1183,15 +1240,15 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/opencensus/NCPrometheusExporter.html#NCPrometheusExporter--">NCPrometheusExporter()</a></span> - Constructor for class org.apache.nlpcraft.model.opencensus.<a href="org/apache/nlpcraft/model/opencensus/NCPrometheusExporter.html" title="class in org.apache.nlpcraft.model.opencensus">NCPrometheusExporter</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCRejection</span></a> - Exception in <a href="org/apache/nlpcraft/model/package-summary.html">org.apache.nlpcraft.model</a></dt>
+<dt><a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCRejection</span></a> - Class in <a href="org/apache/nlpcraft/model/package-summary.html">org.apache.nlpcraft.model</a></dt>
 <dd>
 <div class="block">Exception to indicate that user input cannot be processed as is.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCRejection.html#NCRejection-java.lang.String-">NCRejection(String)</a></span> - Constructor for exception org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model">NCRejection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCRejection.html#NCRejection-java.lang.String-">NCRejection(String)</a></span> - Constructor for class org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model">NCRejection</a></dt>
 <dd>
 <div class="block">Creates new rejection exception with given message.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCRejection.html#NCRejection-java.lang.String-java.lang.Throwable-">NCRejection(String, Throwable)</a></span> - Constructor for exception org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model">NCRejection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/NCRejection.html#NCRejection-java.lang.String-java.lang.Throwable-">NCRejection(String, Throwable)</a></span> - Constructor for class org.apache.nlpcraft.model.<a href="org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model">NCRejection</a></dt>
 <dd>
 <div class="block">Creates new rejection exception with given message and cause.</div>
 </dd>
@@ -1217,68 +1274,60 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html#NCSpringModelFactory--">NCSpringModelFactory()</a></span> - Constructor for class org.apache.nlpcraft.model.factories.spring.<a href="org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html" title="class in org.apache.nlpcraft.model.factories.spring">NCSpringModelFactory</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlAggregate</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlColumn</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL column.</div>
 </dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlCondition</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlDateRange</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL date range.</div>
 </dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlException</span></a> - Exception in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html#NCSqlException-java.lang.String-">NCSqlException(String)</a></span> - Constructor for exception org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html#NCSqlException-java.lang.String-java.lang.Throwable-">NCSqlException(String, Throwable)</a></span> - Constructor for exception org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlException</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlFunction.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlFunction</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlInCondition</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
+<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlExtractor</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
+<dd>
+<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.</div>
+</dd>
+<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlExtractorBuilder</span></a> - Class in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
+<dd>
+<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>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html#NCSqlExtractorBuilder--">NCSqlExtractorBuilder()</a></span> - Constructor for class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlExtractorBuilder</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlJoin</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL join (foreign key).</div>
+</dd>
+<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlJoinType</span></a> - Enum in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
+<dd>
+<div class="block">Type of the SQL join.</div>
 </dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlLimit</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL limit.</div>
 </dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlModelGenerator</span></a> - Class in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">Command line utility to generate NLPCraft model stub from given SQL RDBMS.</div>
+<div class="block">Command line utility to generate YAML/JSON NLPCraft model stub from given SQL RDBMS.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html#NCSqlModelGenerator--">NCSqlModelGenerator()</a></span> - Constructor for class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlModelGenerator</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlQuery</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSchema</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL schema.</div>
 </dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSchemaBuilder</span></a> - Class in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Builder for <a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlSchema</code></a> instances.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#NCSqlSchemaBuilder--">NCSqlSchemaBuilder()</a></span> - Constructor for class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchemaBuilder</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSimpleCondition</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlSort</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL sorting.</div>
 </dd>
 <dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlTable</span></a> - Interface in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
 <dd>
-<div class="block">TODO: add description.</div>
-</dd>
-<dt><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">NCSqlUtils</span></a> - Class in <a href="org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a></dt>
-<dd>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL table.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html#NCSqlUtils--">NCSqlUtils()</a></span> - Constructor for class org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen">NCSqlUtils</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.html" title="class in org.apache.nlpcraft.model.opencensus"><span class="typeNameLink">NCStackdriverStatsExporter</span></a> - Class in <a href="org/apache/nlpcraft/model/opencensus/package-summary.html">org.apache.nlpcraft.model.opencensus</a></dt>
 <dd>
 <div class="block">Probe lifecycle component that manages OpenCensus <a target=_ href="https://cloud.google.com/stackdriver/">Stackdriver</a> stats exporter.</div>
@@ -1532,6 +1581,21 @@
 <div class="block">Unregisters previously registered callback.</div>
 </dd>
 </dl>
+<a name="I:V">
+<!--   -->
+</a>
+<h2 class="title">V</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></dt>
+<dd>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html#values--">values()</a></span> - Static method in enum org.apache.nlpcraft.model.tools.sqlgen.<a href="org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a></dt>
+<dd>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</dd>
+</dl>
 <a name="I:X">
 <!--   -->
 </a>
@@ -1552,7 +1616,7 @@
 <div class="block">Creates <code>yaml</code> result.</div>
 </dd>
 </dl>
-<a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbs [...]
+<a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbs [...]
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/docs/apis/latest/index.html b/docs/apis/latest/index.html
index 9b10d67..bea8516 100644
--- a/docs/apis/latest/index.html
+++ b/docs/apis/latest/index.html
@@ -2,7 +2,7 @@
 <!-- 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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Apache NLPCraft 0.5.0</title>
 <script type="text/javascript">
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCCompany.html b/docs/apis/latest/org/apache/nlpcraft/model/NCCompany.html
index cb3e867..ed84cb0 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCCompany.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCCompany.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>NCCompany (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCContext.html b/docs/apis/latest/org/apache/nlpcraft/model/NCContext.html
index 9ec5700..2231ef6 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCContext.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCContext.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>NCContext (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCConversation.html b/docs/apis/latest/org/apache/nlpcraft/model/NCConversation.html
index b96d84a..d352d91 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCConversation.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCConversation.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>NCConversation (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCCustomElement.html b/docs/apis/latest/org/apache/nlpcraft/model/NCCustomElement.html
index 85fd3e6..1666b57 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCCustomElement.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCCustomElement.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>NCCustomElement (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -160,7 +160,7 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></h3>
-<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a></code></li>
+<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax</a></code></li>
 </ul>
 </li>
 </ul>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCCustomParser.html b/docs/apis/latest/org/apache/nlpcraft/model/NCCustomParser.html
index d2f692d..ff85679 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCCustomParser.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCCustomParser.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>NCCustomParser (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCCustomWord.html b/docs/apis/latest/org/apache/nlpcraft/model/NCCustomWord.html
index e6c54d3..7074c70 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCCustomWord.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCCustomWord.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>NCCustomWord (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCElement.html b/docs/apis/latest/org/apache/nlpcraft/model/NCElement.html
index ce3dc90..b856b48 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCElement.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCElement.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>NCElement (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -19,7 +19,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":18,"i1":18,"i2":6,"i3":18,"i4":18,"i5":18,"i6":18,"i7":18};
+var methods = {"i0":18,"i1":18,"i2":6,"i3":18,"i4":18,"i5":18,"i6":18,"i7":18,"i8":18};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -189,13 +189,19 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 <div class="block">Gets optional map of <a href="../../../../org/apache/nlpcraft/model/NCValue.html" title="interface in org.apache.nlpcraft.model"><code>values</code></a> for this element.</div>
 </td>
 </tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>default boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/nlpcraft/model/NCElement.html#isMemberOf-java.lang.String-">isMemberOf</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;grp)</code>
+<div class="block">Shortcut method to test if this element is a member of given group.</div>
+</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.nlpcraft.model.NCMetadata">
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></h3>
-<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a></code></li>
+<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax</a></code></li>
 </ul>
 </li>
 </ul>
@@ -303,6 +309,25 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 </dl>
 </li>
 </ul>
+<a name="isMemberOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isMemberOf</h4>
+<pre>default&nbsp;boolean&nbsp;isMemberOf(<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;grp)</pre>
+<div class="block">Shortcut method to test if this element is a member of given group. It is equivalent to:
+ <pre class="brush: java">
+     return getGroups().contains(grp);
+ </pre></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>grp</code> - Token group to test.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><code>True</code> if this element belongs to the given group, <code>false</code> otherwise.</dd>
+</dl>
+</li>
+</ul>
 <a name="getMetadata--">
 <!--   -->
 </a>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCIntent.html b/docs/apis/latest/org/apache/nlpcraft/model/NCIntent.html
index f156267..23a86aa 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCIntent.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCIntent.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>NCIntent (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCIntentMatch.html b/docs/apis/latest/org/apache/nlpcraft/model/NCIntentMatch.html
index 16071f6..a7f6f4c 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCIntentMatch.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCIntentMatch.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>NCIntentMatch (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCIntentRef.html b/docs/apis/latest/org/apache/nlpcraft/model/NCIntentRef.html
index f577d32..ad29d18 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCIntentRef.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCIntentRef.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>NCIntentRef (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCIntentSkip.html b/docs/apis/latest/org/apache/nlpcraft/model/NCIntentSkip.html
index df66d51..b590ddb 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCIntentSkip.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCIntentSkip.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>NCIntentSkip (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -74,7 +74,7 @@
 <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="#methods.inherited.from.class.java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
@@ -97,13 +97,7 @@
 <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>NCException</li>
 <li>
 <ul class="inheritance">
 <li>org.apache.nlpcraft.model.NCIntentSkip</li>
@@ -112,21 +106,13 @@
 </ul>
 </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></dd>
-</dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">NCIntentSkip</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>
+extends NCException</pre>
 <div class="block">Control flow exception to skip current intent. This exception can be thrown by the intent
  callback to indicate that current intent should be skipped (even though
  it was matched and its callback was called). If there's more than one intent matched the next best matching intent
@@ -145,8 +131,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 <a href="../../../../org/apache/nlpcraft/model/NCIntentTerm.html" title="annotation in org.apache.nlpcraft.model"><code>NCIntentTerm</code></a>, 
 <a href="../../../../org/apache/nlpcraft/model/NCIntentRef.html" title="annotation in org.apache.nlpcraft.model"><code>NCIntentRef</code></a>, 
 <a href="../../../../org/apache/nlpcraft/model/NCIntentMatch.html" title="interface in org.apache.nlpcraft.model"><code>NCIntentMatch</code></a>, 
-<a href="../../../../org/apache/nlpcraft/model/NCModel.html#onMatchedIntent-org.apache.nlpcraft.model.NCIntentMatch-"><code>NCModel.onMatchedIntent(NCIntentMatch)</code></a>, 
-<a href="../../../../serialized-form.html#org.apache.nlpcraft.model.NCIntentSkip">Serialized Form</a></dd>
+<a href="../../../../org/apache/nlpcraft/model/NCModel.html#onMatchedIntent-org.apache.nlpcraft.model.NCIntentMatch-"><code>NCModel.onMatchedIntent(NCIntentMatch)</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -185,18 +170,11 @@ 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>
-<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>
@@ -293,7 +271,7 @@ 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="#methods.inherited.from.class.java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCIntentTerm.html b/docs/apis/latest/org/apache/nlpcraft/model/NCIntentTerm.html
index 50d6da1..535a4fd 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCIntentTerm.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCIntentTerm.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>NCIntentTerm (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCLifecycle.html b/docs/apis/latest/org/apache/nlpcraft/model/NCLifecycle.html
index b1abe42..274b9d3 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCLifecycle.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCLifecycle.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>NCLifecycle (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCMetadata.html b/docs/apis/latest/org/apache/nlpcraft/model/NCMetadata.html
index 762cf1d..e169350 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCMetadata.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCMetadata.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>NCMetadata (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -19,7 +19,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":18,"i2":18,"i3":18};
+var methods = {"i0":6,"i1":18,"i2":18,"i3":18,"i4":18};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -160,6 +160,12 @@ var activeTableTab = "activeTableTab";
 <div class="block">Shortcut method to get given optional metadata property.</div>
 </td>
 </tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>default &lt;T&gt;&nbsp;T</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax</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;prop)</code>
+<div class="block">Shortcut method to get given mandatory metadata property.</div>
+</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -231,7 +237,35 @@ var activeTableTab = "activeTableTab";
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>prop</code> - Metadata property name.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>Metadata property value.</dd>
+<dd>Metadata property value or <code>null</code> if given metadata property not found.</dd>
+</dl>
+</li>
+</ul>
+<a name="metax-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>metax</h4>
+<pre>default&nbsp;&lt;T&gt;&nbsp;T&nbsp;metax(<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;prop)
+             throws NCException</pre>
+<div class="block">Shortcut method to get given mandatory metadata property. Equivalent to:
+ <pre class="brush: java">
+     T t = (T)getMetadata().get(prop);
+     if (t == null)
+         throw new NCException("Mandatory metadata property not found: " + prop);
+     else
+         return t;
+ </pre></div>
+<dl>
+<dt><span class="paramLabel">Type Parameters:</span></dt>
+<dd><code>T</code> - Type of the metadata property.</dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>prop</code> - Metadata property name.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Metadata property value or throws an exception if given metadata property not found.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown if given metadata property not found.</dd>
 </dl>
 </li>
 </ul>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCModel.html b/docs/apis/latest/org/apache/nlpcraft/model/NCModel.html
index 4d81215..cefaab0 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCModel.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCModel.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>NCModel (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -226,7 +226,7 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCModelView.html" title="
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></h3>
-<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a></code></li>
+<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.nlpcraft.model.NCLifecycle">
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCModelAdapter.html b/docs/apis/latest/org/apache/nlpcraft/model/NCModelAdapter.html
index 3c3ae48..4c2b656 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCModelAdapter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCModelAdapter.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>NCModelAdapter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -231,7 +231,7 @@ implements <a href="../../../../org/apache/nlpcraft/model/NCModel.html" title="i
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></h3>
-<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a></code></li>
+<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.nlpcraft.model.NCLifecycle">
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCModelFactory.html b/docs/apis/latest/org/apache/nlpcraft/model/NCModelFactory.html
index 095387e..9de4088 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCModelFactory.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCModelFactory.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>NCModelFactory (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCModelFileAdapter.html b/docs/apis/latest/org/apache/nlpcraft/model/NCModelFileAdapter.html
index 6c79588..3e3116e 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCModelFileAdapter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCModelFileAdapter.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>NCModelFileAdapter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -412,7 +412,7 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCModelAdapter.html" titl
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></h3>
-<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a></code></li>
+<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.nlpcraft.model.NCLifecycle">
@@ -1392,7 +1392,6 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCModelAdapter.html" titl
  <li><code>nlpcraft:city</code></li>
  <li><code>nlpcraft:num</code></li>
  <li><code>nlpcraft:coordinate</code></li>
- <li><code>nlpcraft:aggregation</code></li>
  <li><code>nlpcraft:relation</code></li>
  <li><code>nlpcraft:sort</code></li>
  <li><code>nlpcraft:limit</code></li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCModelView.html b/docs/apis/latest/org/apache/nlpcraft/model/NCModelView.html
index 9f66054..22f2d26 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCModelView.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCModelView.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>NCModelView (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -469,7 +469,7 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></h3>
-<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a></code></li>
+<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">metax</a></code></li>
 </ul>
 </li>
 </ul>
@@ -751,7 +751,6 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
  <li><code>nlpcraft:city</code></li>
  <li><code>nlpcraft:num</code></li>
  <li><code>nlpcraft:coordinate</code></li>
- <li><code>nlpcraft:aggregation</code></li>
  <li><code>nlpcraft:relation</code></li>
  <li><code>nlpcraft:sort</code></li>
  <li><code>nlpcraft:limit</code></li>
@@ -1662,7 +1661,6 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
  <li><code>nlpcraft:city</code></li>
  <li><code>nlpcraft:num</code></li>
  <li><code>nlpcraft:coordinate</code></li>
- <li><code>nlpcraft:aggregation</code></li>
  <li><code>nlpcraft:relation</code></li>
  <li><code>nlpcraft:sort</code></li>
  <li><code>nlpcraft:limit</code></li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCRejection.html b/docs/apis/latest/org/apache/nlpcraft/model/NCRejection.html
index 8d14bab..4395ada 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCRejection.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCRejection.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>NCRejection (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -74,7 +74,7 @@
 <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="#methods.inherited.from.class.java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
@@ -97,13 +97,7 @@
 <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>NCException</li>
 <li>
 <ul class="inheritance">
 <li>org.apache.nlpcraft.model.NCRejection</li>
@@ -112,31 +106,19 @@
 </ul>
 </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></dd>
-</dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">NCRejection</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>
+extends NCException</pre>
 <div class="block">Exception to indicate that user input cannot be processed as is. This exception can be thrown from
  intent callbacks.
  <p>
  This exception typically indicates that user has not provided enough information in the input string
  to have it processed automatically. In most cases this means that the user's input is either too short
  or too simple, too long or too complex, missing required context, or unrelated to requested data model.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../serialized-form.html#org.apache.nlpcraft.model.NCRejection">Serialized Form</a></dd>
-</dl>
 </li>
 </ul>
 </div>
@@ -175,18 +157,11 @@ 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>
-<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>
@@ -289,7 +264,7 @@ 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="#methods.inherited.from.class.java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCRequest.html b/docs/apis/latest/org/apache/nlpcraft/model/NCRequest.html
index 45c1d36..e958087 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCRequest.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCRequest.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>NCRequest (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCResult.html b/docs/apis/latest/org/apache/nlpcraft/model/NCResult.html
index e2b2a3a..08a04b9 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCResult.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCResult.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>NCResult (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCToken.html b/docs/apis/latest/org/apache/nlpcraft/model/NCToken.html
index d823267..6933e21 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCToken.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCToken.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>NCToken (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -19,7 +19,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":18,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":18,"i7":6,"i8":18,"i9":6,"i10":6,"i11":6,"i12":6,"i13":18,"i14":6,"i15":18,"i16":18,"i17":18,"i18":18};
+var methods = {"i0":18,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":18,"i7":6,"i8":18,"i9":6,"i10":6,"i11":6,"i12":6,"i13":18,"i14":6,"i15":18,"i16":18,"i17":18,"i18":18,"i19":18,"i20":18};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -252,11 +252,23 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 </tr>
 <tr id="i17" class="rowColor">
 <td class="colFirst"><code>default boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/nlpcraft/model/NCToken.html#isMemberOf-java.lang.String-">isMemberOf</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;grp)</code>
+<div class="block">Tests whether or not this token belongs to the given group.</div>
+</td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>default boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/nlpcraft/model/NCToken.html#isOfAlias-java.lang.String-">isOfAlias</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;alias)</code>
+<div class="block">Tests whether or not this token has given alias.</div>
+</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>default boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/nlpcraft/model/NCToken.html#isStopWord--">isStopWord</a></span>()</code>
 <div class="block">A shortcut method checking whether or not this token is a stopword.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>default boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/nlpcraft/model/NCToken.html#isUserDefined--">isUserDefined</a></span>()</code>
 <div class="block">Tests whether or not this token is a user-defined token.</div>
@@ -268,7 +280,7 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="interface in org.apache.nlpcraft.model">NCMetadata</a></h3>
-<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#getMetadata--">getMetadata</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a></code></li>
+<code><a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#getMetadata--">getMetadata</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#meta-java.lang.String-T-">meta</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metaOpt-java.lang.String-">metaOpt</a>, <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html#metax-java.lang.String-">meta [...]
 </ul>
 </li>
 </ul>
@@ -435,6 +447,25 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 </dl>
 </li>
 </ul>
+<a name="isOfAlias-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isOfAlias</h4>
+<pre>default&nbsp;boolean&nbsp;isOfAlias(<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;alias)</pre>
+<div class="block">Tests whether or not this token has given alias. It is equivalent to:
+ <pre class="brush: java">
+      return getAliases().contains(alias);
+ </pre></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>alias</code> - Alias to test.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><code>True</code> if this token has alias <code>alias</code>, <code>false</code> otherwise.</dd>
+</dl>
+</li>
+</ul>
 <a name="getValue--">
 <!--   -->
 </a>
@@ -470,6 +501,25 @@ extends <a href="../../../../org/apache/nlpcraft/model/NCMetadata.html" title="i
 </dl>
 </li>
 </ul>
+<a name="isMemberOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isMemberOf</h4>
+<pre>default&nbsp;boolean&nbsp;isMemberOf(<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;grp)</pre>
+<div class="block">Tests whether or not this token belongs to the given group. It is equivalent to:
+ <pre class="brush: java">
+      return getGroups().contains(grp);
+ </pre></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>grp</code> - Group to test.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><code>True</code> if this token belongs to the group <code>grp</code>, <code>false</code> otherwise.</dd>
+</dl>
+</li>
+</ul>
 <a name="getStartCharIndex--">
 <!--   -->
 </a>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCUser.html b/docs/apis/latest/org/apache/nlpcraft/model/NCUser.html
index 6e6e796..0d06935 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCUser.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCUser.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>NCUser (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCValue.html b/docs/apis/latest/org/apache/nlpcraft/model/NCValue.html
index 6d637f6..c3c1b7f 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCValue.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCValue.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>NCValue (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCValueLoader.html b/docs/apis/latest/org/apache/nlpcraft/model/NCValueLoader.html
index a800a42..77a105d 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCValueLoader.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCValueLoader.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>NCValueLoader (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/NCVariant.html b/docs/apis/latest/org/apache/nlpcraft/model/NCVariant.html
index c9ec83c..6df0874 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/NCVariant.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/NCVariant.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>NCVariant (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCompany.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCompany.html
index 2feb68e..13f523a 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCompany.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCompany.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCCompany (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCContext.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCContext.html
index 53d50d5..4afb518 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCContext.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCContext.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.NCContext (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCConversation.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCConversation.html
index e6769eb..580d6ac 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCConversation.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCConversation.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.NCConversation (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCustomElement.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCustomElement.html
index 5ee4a79..d25277c 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCustomElement.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCustomElement.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.NCCustomElement (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCustomParser.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCustomParser.html
index ebcf23e..88f6e49 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCustomParser.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCustomParser.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCCustomParser (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCustomWord.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCustomWord.html
index 4303647..6734507 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCustomWord.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCCustomWord.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.NCCustomWord (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCElement.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCElement.html
index 71445f4..7696f6e 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCElement.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCElement.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.NCElement (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntent.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntent.html
index e0e5301..d531b05 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntent.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntent.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.NCIntent (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentMatch.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentMatch.html
index f35e63a..7008c45 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentMatch.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentMatch.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.NCIntentMatch (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentRef.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentRef.html
index e5d8ad2..a389b32 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentRef.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentRef.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.NCIntentRef (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentSkip.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentSkip.html
index 87630b7..1963b0e 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentSkip.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentSkip.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.apache.nlpcraft.model.NCIntentSkip (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentTerm.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentTerm.html
index 85a79cb..9ee6e92 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentTerm.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCIntentTerm.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.apache.nlpcraft.model.NCIntentTerm (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCLifecycle.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCLifecycle.html
index deeff8e..5abc500 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCLifecycle.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCLifecycle.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCLifecycle (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCMetadata.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCMetadata.html
index 1b76831..3ca40b2 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCMetadata.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCMetadata.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCMetadata (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModel.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModel.html
index 3970c99..086ffc2 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModel.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModel.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.NCModel (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -245,7 +245,9 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a></code></td>
-<td class="colLast"><span class="typeNameLabel">NCSqlSchemaBuilder.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-">makeSchema</a></span>(<a href="../../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>&nbsp;model)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">NCSqlSchemaBuilder.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-">makeSchema</a></span>(<a href="../../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>&nbsp;model)</code>
+<div class="block">Builds object presentation for SQL schema from given data model.</div>
+</td>
 </tr>
 </tbody>
 </table>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelAdapter.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelAdapter.html
index df9fc43..e14a5e4 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelAdapter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelAdapter.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.apache.nlpcraft.model.NCModelAdapter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelFactory.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelFactory.html
index 3031122..cb1ff41 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelFactory.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelFactory.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.NCModelFactory (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelFileAdapter.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelFileAdapter.html
index 7d90b18..2b88db3 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelFileAdapter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelFileAdapter.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.NCModelFileAdapter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelView.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelView.html
index 34b082f..5e5d17a 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelView.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCModelView.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.NCModelView (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCRejection.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCRejection.html
index a5a84c2..b86daa2 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCRejection.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCRejection.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.apache.nlpcraft.model.NCRejection (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCRequest.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCRequest.html
index aeb40fb..3c8b90d 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCRequest.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCRequest.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCRequest (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCResult.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCResult.html
index 9a6adc8..99f2e0c 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCResult.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCResult.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.NCResult (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCToken.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCToken.html
index 8c6def6..b9bc53f 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCToken.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCToken.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.NCToken (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -206,19 +206,6 @@
 </a>
 <h3>Uses of <a href="../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</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/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</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/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</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#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>
-</tbody>
-</table>
-<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> with parameters of type <a href="../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -226,86 +213,34 @@
 </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.nlpcraft.model.tool [...]
-                <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 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"><span class="typeNameLabel">NCSqlUtils.</span><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 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"><span class="typeNameLabel">NCSqlUtils.</span><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 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#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 [...]
-                          <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="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"><span class="typeNameLabel">NCSqlUtils.</span><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 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.tools.sqlge [...]
-                    <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 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"><span class="typeNameLabel">NCSqlUtils.</span><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 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"><span class="typeNameLabel">NCSqlUtils.</span><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 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">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>
+<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"><span class="typeNameLabel">NCSqlExtractor.</span><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 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"><span class="typeNameLabel">NCSqlUtils.</span><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>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Method parameters in <a href="../../../../../org/apache/nlpcraft/model/tools/sqlgen/package-summary.html">org.apache.nlpcraft.model.tools.sqlgen</a> with type arguments of type <a href="../../../../../org/apache/nlpcraft/model/NCToken.html" title="interface in org.apache.nlpcraft.model">NCToken</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>
+<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"><span class="typeNameLabel">NCSqlExtractor.</span><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>
-<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.nlpcraft.model.tool [...]
-                <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><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"><span class="typeNameLabel">NCSqlExtractor.</span><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 class="rowColor">
-<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"><span class="typeNameLabel">NCSqlUtils.</span><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>
+<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"><span class="typeNameLabel">NCSqlExtractor.</span><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 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"><span class="typeNameLabel">NCSqlUtils.</span><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>
+<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"><span class="typeNameLabel">NCSqlExtractor.</span><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>
 </tbody>
 </table>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCUser.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCUser.html
index 42fefbd..cddaec6 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCUser.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCUser.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCUser (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCValue.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCValue.html
index 601594b..cbb4b4f 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCValue.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCValue.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCValue (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCValueLoader.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCValueLoader.html
index 9706d2f..384334d 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCValueLoader.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCValueLoader.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.nlpcraft.model.NCValueLoader (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCVariant.html b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCVariant.html
index 90a9baa..961fea2 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCVariant.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/class-use/NCVariant.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.NCVariant (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -91,6 +91,12 @@
 <div class="block">Contains <b>main API</b> for defining data models.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<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>
@@ -146,6 +152,27 @@
 </tbody>
 </table>
 </li>
+<li class="blockList"><a name="org.apache.nlpcraft.model.tools.sqlgen">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../org/apache/nlpcraft/model/NCVariant.html" title="interface in org.apache.nlpcraft.model">NCVariant</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> with parameters of type <a href="../../../../../org/apache/nlpcraft/model/NCVariant.html" title="interface in org.apache.nlpcraft.model">NCVariant</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/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>
+</li>
 </ul>
 </li>
 </ul>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/NCBasicModelFactory.html b/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/NCBasicModelFactory.html
index 03342c7..7835327 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/NCBasicModelFactory.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/NCBasicModelFactory.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>NCBasicModelFactory (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/class-use/NCBasicModelFactory.html b/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/class-use/NCBasicModelFactory.html
index 5b16424..1fc7204 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/class-use/NCBasicModelFactory.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/class-use/NCBasicModelFactory.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.apache.nlpcraft.model.factories.basic.NCBasicModelFactory (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-frame.html b/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-frame.html
index c4025ee..0202975 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-frame.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-frame.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>org.apache.nlpcraft.model.factories.basic (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-summary.html b/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-summary.html
index f69ab90..3a978e7 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-summary.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-summary.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>org.apache.nlpcraft.model.factories.basic (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-tree.html b/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-tree.html
index 83d8d90..5575ae4 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-tree.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-tree.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>org.apache.nlpcraft.model.factories.basic Class Hierarchy (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-use.html b/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-use.html
index 734cbde..9310a90 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-use.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/factories/basic/package-use.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Package org.apache.nlpcraft.model.factories.basic (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html b/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html
index fdb2fed..ff04f2c 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/NCSpringModelFactory.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>NCSpringModelFactory (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/class-use/NCSpringModelFactory.html b/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/class-use/NCSpringModelFactory.html
index f0da898..92ccb7f 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/class-use/NCSpringModelFactory.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/class-use/NCSpringModelFactory.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.apache.nlpcraft.model.factories.spring.NCSpringModelFactory (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-frame.html b/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-frame.html
index 003ba0c..75a2c6e 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-frame.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-frame.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>org.apache.nlpcraft.model.factories.spring (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-summary.html b/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-summary.html
index f9a5ba3..6359574 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-summary.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-summary.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>org.apache.nlpcraft.model.factories.spring (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-tree.html b/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-tree.html
index 71b8bad..238f87b 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-tree.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-tree.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>org.apache.nlpcraft.model.factories.spring Class Hierarchy (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-use.html b/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-use.html
index 79979f7..c52c7d5 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-use.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/factories/spring/package-use.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Package org.apache.nlpcraft.model.factories.spring (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCBaseTraceExporter.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCBaseTraceExporter.html
index f70868d..45dc10c 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCBaseTraceExporter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCBaseTraceExporter.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>NCBaseTraceExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCJaegerExporter.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCJaegerExporter.html
index a2f8d3e..40e5e7c 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCJaegerExporter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCJaegerExporter.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>NCJaegerExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCPrometheusExporter.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCPrometheusExporter.html
index 8708f11..d7846fb 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCPrometheusExporter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCPrometheusExporter.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>NCPrometheusExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.html
index e4f7ef2..959bc87 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCStackdriverStatsExporter.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>NCStackdriverStatsExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCStackdriverTraceExporter.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCStackdriverTraceExporter.html
index 9070590..bf36566 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCStackdriverTraceExporter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCStackdriverTraceExporter.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>NCStackdriverTraceExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCZipkinExporter.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCZipkinExporter.html
index 321db75..9fc7bc4 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCZipkinExporter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/NCZipkinExporter.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>NCZipkinExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCBaseTraceExporter.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCBaseTraceExporter.html
index 8ebf37d..3eff521 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCBaseTraceExporter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCBaseTraceExporter.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.opencensus.NCBaseTraceExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCJaegerExporter.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCJaegerExporter.html
index 60900ae..05afee7 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCJaegerExporter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCJaegerExporter.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.opencensus.NCJaegerExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCPrometheusExporter.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCPrometheusExporter.html
index 007bb0f..1459775 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCPrometheusExporter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCPrometheusExporter.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.opencensus.NCPrometheusExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverStatsExporter.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverStatsExporter.html
index 622654f..4354879 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverStatsExporter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverStatsExporter.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.opencensus.NCStackdriverStatsExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverTraceExporter.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverTraceExporter.html
index 6041e12..c070fe5 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverTraceExporter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCStackdriverTraceExporter.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.opencensus.NCStackdriverTraceExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCZipkinExporter.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCZipkinExporter.html
index d5ef37f..c901341 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCZipkinExporter.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/class-use/NCZipkinExporter.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.opencensus.NCZipkinExporter (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-frame.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-frame.html
index 8bf64da..ada4f84 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-frame.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-frame.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>org.apache.nlpcraft.model.opencensus (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-summary.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-summary.html
index 7dcc589..4ac4f03 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-summary.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-summary.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>org.apache.nlpcraft.model.opencensus (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-tree.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-tree.html
index b4b7668..9e050e4 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-tree.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-tree.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>org.apache.nlpcraft.model.opencensus Class Hierarchy (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-use.html b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-use.html
index 9c36918..56d621e 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-use.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/opencensus/package-use.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Package org.apache.nlpcraft.model.opencensus (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/package-frame.html b/docs/apis/latest/org/apache/nlpcraft/model/package-frame.html
index 6dbeab0..85fed0e 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/package-frame.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/package-frame.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>org.apache.nlpcraft.model (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -36,14 +36,11 @@
 </ul>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
+<li><a href="NCIntentSkip.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCIntentSkip</a></li>
 <li><a href="NCModelAdapter.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCModelAdapter</a></li>
 <li><a href="NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCModelFileAdapter</a></li>
-<li><a href="NCResult.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCResult</a></li>
-</ul>
-<h2 title="Exceptions">Exceptions</h2>
-<ul title="Exceptions">
-<li><a href="NCIntentSkip.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCIntentSkip</a></li>
 <li><a href="NCRejection.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCRejection</a></li>
+<li><a href="NCResult.html" title="class in org.apache.nlpcraft.model" target="classFrame">NCResult</a></li>
 </ul>
 <h2 title="Annotation Types">Annotation Types</h2>
 <ul title="Annotation Types">
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/package-summary.html b/docs/apis/latest/org/apache/nlpcraft/model/package-summary.html
index 523fd8f..57ffbf9 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/package-summary.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/package-summary.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>org.apache.nlpcraft.model (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -215,38 +215,21 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCModelAdapter.html" title="class in org.apache.nlpcraft.model">NCModelAdapter</a></td>
+<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model">NCIntentSkip</a></td>
 <td class="colLast">
-<div class="block">Adapter for data models.</div>
+<div class="block">Control flow exception to skip current intent.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model">NCModelFileAdapter</a></td>
-<td class="colLast">
-<div class="block">Adapter for data models that can load model configuration from external JSON/YAML file.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model">NCResult</a></td>
+<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCModelAdapter.html" title="class in org.apache.nlpcraft.model">NCModelAdapter</a></td>
 <td class="colLast">
-<div class="block">Data model result returned from model intent callbacks.</div>
+<div class="block">Adapter for data models.</div>
 </td>
 </tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Exception Summary table, listing exceptions, and an explanation">
-<caption><span>Exception Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Exception</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model">NCIntentSkip</a></td>
+<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model">NCModelFileAdapter</a></td>
 <td class="colLast">
-<div class="block">Control flow exception to skip current intent.</div>
+<div class="block">Adapter for data models that can load model configuration from external JSON/YAML file.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -255,6 +238,12 @@
 <div class="block">Exception to indicate that user input cannot be processed as is.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model">NCResult</a></td>
+<td class="colLast">
+<div class="block">Data model result returned from model intent callbacks.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/package-tree.html b/docs/apis/latest/org/apache/nlpcraft/model/package-tree.html
index d7b72b4..60a039c 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/package-tree.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/package-tree.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>org.apache.nlpcraft.model Class Hierarchy (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -84,26 +84,22 @@
 <ul>
 <li type="circle">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"><span class="typeNameLink">Object</span></a>
 <ul>
-<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCModelAdapter.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCModelAdapter</span></a> (implements org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>)
+<li type="circle">NCException
 <ul>
-<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCModelFileAdapter</span></a></li>
+<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCRejection</span></a></li>
 </ul>
 </li>
-<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCResult</span></a> (implements java.io.<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>)</li>
-<li type="circle">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"><span class="typeNameLink">Throwable</span></a> (implements java.io.<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>)
-<ul>
-<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Exception</span></a>
-<ul>
-<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">RuntimeException</span></a>
+<li type="circle">NCException
 <ul>
 <li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCIntentSkip.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCIntentSkip</span></a></li>
-<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCRejection.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCRejection</span></a></li>
-</ul>
-</li>
 </ul>
 </li>
+<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCModelAdapter.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCModelAdapter</span></a> (implements org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>)
+<ul>
+<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCModelFileAdapter</span></a></li>
 </ul>
 </li>
+<li type="circle">org.apache.nlpcraft.model.<a href="../../../../org/apache/nlpcraft/model/NCResult.html" title="class in org.apache.nlpcraft.model"><span class="typeNameLink">NCResult</span></a> (implements java.io.<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>)</li>
 </ul>
 </li>
 </ul>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/package-use.html b/docs/apis/latest/org/apache/nlpcraft/model/package-use.html
index 5c0a442..aff8ae3 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/package-use.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/package-use.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:47 PDT 2020 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Package org.apache.nlpcraft.model (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -315,6 +315,11 @@
 <div class="block">Detected model element.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../org/apache/nlpcraft/model/class-use/NCVariant.html#org.apache.nlpcraft.model.tools.sqlgen">NCVariant</a>
+<div class="block">A list of tokens representing one possible parsing variant of the user input.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html
index af14dc5..9e1b4cf 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.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>NCSqlColumn (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -52,8 +52,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.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/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</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>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" target="_top">Frames</a></li>
@@ -105,7 +105,50 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">NCSqlColumn</span></pre>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL column.
+ <p>
+ In JSON/YAML generated model SQL column is represented by the model element (example):
+ <pre class="brush: js">
+   elements:
+     - id: "col:orders_customer_id"
+       groups:
+       - "column"
+       synonyms:
+       - "{customer_id|customer &lt;ID&gt;}"
+       - "orders {customer_id|customer &lt;ID&gt;}"
+       - "{customer_id|customer &lt;ID&gt;} &lt;OF&gt; orders"
+       metadata:
+         sql:name: "customer_id"
+         sql:tablename: "orders"
+         sql:datatype: 12
+         sql:isnullable: true
+         sql:ispk: false
+       description: "Auto-generated from 'orders.customer_id' column."
+       valueLoader: "org.apache.nlpcraft.examples.sql.db.SqlValueLoader"
+ </pre>
+ Few notes:
+ <ul>
+     <li>
+         All model elements representing SQL column have ID in a form of <code>col:sql_table_name</code>.
+     </li>
+     <li>
+         All model elements representing SQL column belong to <code>column</code> group.
+     </li>
+     <li>
+         These model elements have auto-generated synonyms and set of mandatory metadata.
+     </li>
+     <li>
+         User can freely add group membership, change synonyms, add new metadata, add or change value loader.
+     </li>
+ </ul></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-"><code>NCSqlSchemaBuilder.makeSchema(NCModel)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html#build-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCVariant-"><code>NCSqlExtractorBuilder.build(NCSqlSchema, NCVariant)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractColumn-org.apache.nlpcraft.model.NCToken-"><code>NCSqlExtractor.extractColumn(NCToken)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getColumns--"><code>NCSqlTable.getColumns()</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getAllColumns--"><code>NCSqlSchema.getAllColumns()</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -126,23 +169,34 @@ var activeTableTab = "activeTableTab";
 </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/NCSqlColumn.html#getColumn--">getColumn</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#getColumn--">getColumn</a></span>()</code>
+<div class="block">Gets native name of this column.</div>
+</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#getDataType--">getDataType</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#getDataType--">getDataType</a></span>()</code>
+<div class="block">Gets JDBC <a target="new" href="https://docs.oracle.com/javase/8/docs/api/java/sql/Types.html">data type</a>
+ for this column.</div>
+</td>
 </tr>
 <tr id="i2" 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/NCSqlColumn.html#getTable--">getTable</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#getTable--">getTable</a></span>()</code>
+<div class="block">Gets name of the table this column belongs to.</div>
+</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#isNullable--">isNullable</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#isNullable--">isNullable</a></span>()</code>
+<div class="block">Tests whether or not this column is nullable.</div>
+</td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#isPk--">isPk</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html#isPk--">isPk</a></span>()</code>
+<div class="block">Tests whether or not this column is a primary key column.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -166,8 +220,16 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getTable</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;getTable()</pre>
+<div class="block">Gets name of the table this column belongs to.
+ <p>
+ In JSON/YAML generated model the table name is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:tablename: "customer_id"
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Name of the table this column belongs to.</dd>
 </dl>
 </li>
 </ul>
@@ -178,8 +240,16 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getColumn</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;getColumn()</pre>
+<div class="block">Gets native name of this column.
+ <p>
+ In JSON/YAML generated model the native column name is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:name: "customer_id"
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Name of this column.</dd>
 </dl>
 </li>
 </ul>
@@ -190,8 +260,18 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getDataType</h4>
 <pre>int&nbsp;getDataType()</pre>
+<div class="block">Gets JDBC <a target="new" href="https://docs.oracle.com/javase/8/docs/api/java/sql/Types.html">data type</a>
+ for this column.
+ <p>
+ In JSON/YAML generated model the data type is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:datatype: 12
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>JDBC <a target="new" href="https://docs.oracle.com/javase/8/docs/api/java/sql/Types.html">data type</a>
+      for this column.</dd>
 </dl>
 </li>
 </ul>
@@ -202,8 +282,16 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>isPk</h4>
 <pre>boolean&nbsp;isPk()</pre>
+<div class="block">Tests whether or not this column is a primary key column.
+ <p>
+ In JSON/YAML generated model the primary key flag is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:ispk: false
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Whether or not this column is a primary key column.</dd>
 </dl>
 </li>
 </ul>
@@ -214,8 +302,16 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>isNullable</h4>
 <pre>boolean&nbsp;isNullable()</pre>
+<div class="block">Tests whether or not this column is nullable.
+ <p>
+ In JSON/YAML generated model the nullable flag is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:isnullable: false
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Whether or not this column is nullable.</dd>
 </dl>
 </li>
 </ul>
@@ -248,8 +344,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.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/NCSqlCondition.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</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>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../../index.html?org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.html" target="_top">Frames</a></li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html
index a087442..ad71e1f 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.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>NCSqlDateRange (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -52,8 +52,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.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/NCSqlException.html" title="class 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/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/NCSqlExtractor.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/NCSqlDateRange.html" target="_top">Frames</a></li>
@@ -105,7 +105,13 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">NCSqlDateRange</span></pre>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL date range.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-"><code>NCSqlSchemaBuilder.makeSchema(NCModel)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html#build-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCVariant-"><code>NCSqlExtractorBuilder.build(NCSqlSchema, NCVariant)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractDateRange-org.apache.nlpcraft.model.NCToken-"><code>NCSqlExtractor.extractDateRange(NCToken)</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -126,11 +132,15 @@ var activeTableTab = "activeTableTab";
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Timestamp.html?is-external=true" title="class or interface in java.sql">Timestamp</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html#getFrom--">getFrom</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html#getFrom--">getFrom</a></span>()</code>
+<div class="block">Gets 'from' timestamp.</div>
+</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Timestamp.html?is-external=true" title="class or interface in java.sql">Timestamp</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html#getTo--">getTo</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlDateRange.html#getTo--">getTo</a></span>()</code>
+<div class="block">Gets 'to' timestamp.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -154,6 +164,11 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getFrom</h4>
 <pre><a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Timestamp.html?is-external=true" title="class or interface in java.sql">Timestamp</a>&nbsp;getFrom()</pre>
+<div class="block">Gets 'from' timestamp.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The 'from' timestamp.</dd>
+</dl>
 </li>
 </ul>
 <a name="getTo--">
@@ -163,6 +178,11 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getTo</h4>
 <pre><a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Timestamp.html?is-external=true" title="class or interface in java.sql">Timestamp</a>&nbsp;getTo()</pre>
+<div class="block">Gets 'to' timestamp.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The 'to' timestamp.</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -194,8 +214,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlCondition.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/NCSqlException.html" title="class 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/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/NCSqlExtractor.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/NCSqlDateRange.html" target="_top">Frames</a></li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html
index eb5b672..8c50c23 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.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>NCSqlJoin (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -19,7 +19,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":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";
@@ -52,8 +52,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.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>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.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/NCSqlJoinType.html" title="enum 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/NCSqlJoin.html" target="_top">Frames</a></li>
@@ -105,7 +105,25 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">NCSqlJoin</span></pre>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL join (foreign key).
+ <p>
+ In JSON/YAML generated model SQL joins are declared with the following data model
+ metadata (example):
+ <pre class="brush: js">
+   sql:joins:
+   - fromtable: "orders"
+     fromcolumns:
+     - "customer_id"
+     totable: "customers"
+     tocolumns:
+     - "customer_id"
+     jointype: "left"
+ </pre></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-"><code>NCSqlSchemaBuilder.makeSchema(NCModel)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getJoins--"><code>NCSqlSchema.getJoins()</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -126,19 +144,33 @@ var activeTableTab = "activeTableTab";
 </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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getFromColumns--">getFromColumns</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getFromColumns--">getFromColumns</a></span>()</code>
+<div class="block">Gets the list of columns in originating table.</div>
+</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/NCSqlJoin.html#getFromTable--">getFromTable</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getFromTable--">getFromTable</a></span>()</code>
+<div class="block">Gets the name of the originating table.</div>
+</td>
 </tr>
 <tr id="i2" 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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getToColumns--">getToColumns</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getToColumns--">getToColumns</a></span>()</code>
+<div class="block">Gets the list of columns in target table.</div>
+</td>
 </tr>
 <tr id="i3" 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/NCSqlJoin.html#getToTable--">getToTable</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html#getToTable--">getToTable</a></span>()</code>
+<div class="block">Gets the name of the target table.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<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"><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>
 </table>
 </li>
@@ -162,8 +194,10 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getFromTable</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;getFromTable()</pre>
+<div class="block">Gets the name of the originating table.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Name of the originating table.</dd>
 </dl>
 </li>
 </ul>
@@ -174,8 +208,10 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getToTable</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;getToTable()</pre>
+<div class="block">Gets the name of the target table.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Name of the target table.</dd>
 </dl>
 </li>
 </ul>
@@ -186,20 +222,38 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getFromColumns</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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;getFromColumns()</pre>
+<div class="block">Gets the list of columns in originating table.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>List of columns in originating table.</dd>
 </dl>
 </li>
 </ul>
 <a name="getToColumns--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>getToColumns</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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;getToColumns()</pre>
+<div class="block">Gets the list of columns in target table.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>List of columns in target table.</dd>
+</dl>
+</li>
+</ul>
+<a name="getType--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getType</h4>
+<pre><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.html" title="enum in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoinType</a>&nbsp;getType()</pre>
+<div class="block">Gets type of the join.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Type of join.</dd>
 </dl>
 </li>
 </ul>
@@ -232,8 +286,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlInCondition.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>
+<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.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/NCSqlJoinType.html" title="enum 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/NCSqlJoin.html" target="_top">Frames</a></li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html
index ac7f9b7..0533635 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.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>NCSqlLimit (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -52,7 +52,7 @@ var activeTableTab = "activeTableTab";
 </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/NCSqlJoinType.html" title="enum 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/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -105,7 +105,11 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">NCSqlLimit</span></pre>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL limit.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-"><code>NCSqlSchemaBuilder.makeSchema(NCModel)</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -126,15 +130,21 @@ 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/NCSqlLimit.html#getColumn--">getColumn</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#getColumn--">getColumn</a></span>()</code>
+<div class="block">Gets SQL column this limit is applied.</div>
+</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#getLimit--">getLimit</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#getLimit--">getLimit</a></span>()</code>
+<div class="block">Gets the numeric value of the limit.</div>
+</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#isAscending--">isAscending</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.html#isAscending--">isAscending</a></span>()</code>
+<div class="block">Gets whether limit ascending or descending.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -158,6 +168,11 @@ var activeTableTab = "activeTableTab";
 <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>
+<div class="block">Gets SQL column this limit is applied.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>SQL column this limit is applied.</dd>
+</dl>
 </li>
 </ul>
 <a name="getLimit--">
@@ -167,6 +182,11 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getLimit</h4>
 <pre>int&nbsp;getLimit()</pre>
+<div class="block">Gets the numeric value of the limit.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Numeric value of the limit.</dd>
+</dl>
 </li>
 </ul>
 <a name="isAscending--">
@@ -176,6 +196,11 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>isAscending</h4>
 <pre>boolean&nbsp;isAscending()</pre>
+<div class="block">Gets whether limit ascending or descending.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Whether limit ascending or descending.</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -207,7 +232,7 @@ var activeTableTab = "activeTableTab";
 </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/NCSqlJoinType.html" title="enum 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/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html
index ab1e246..54e312c 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.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>NCSqlModelGenerator (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -53,7 +53,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.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/NCSqlQuery.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/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/NCSqlModelGenerator.html" target="_top">Frames</a></li>
@@ -114,16 +114,38 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>public class <span class="typeNameLabel">NCSqlModelGenerator</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">Command line utility to generate NLPCraft model stub from given SQL RDBMS.
+<div class="block">Command line utility to generate YAML/JSON NLPCraft model stub from given SQL RDBMS.
  <p>
- You need to provide JDBC URL and driver, database schema, as well as set of tables and columns for which you
- want to generate NLPCraft model stub. After the model stub is generated you need to further configure and customize
- it for your specific needs.
- <p>
- Run this class with <code>--help</code> parameter to get a full up-to-date documentation:
+ This command line utility take several parameters like JDBC URL and driver, database schema, and
+ optional set of tables and columns for which it will generate YAML/JSON NLPCraft model stub. Run
+ this class with <code>--help</code> parameter to get a full up-to-date documentation:
  <pre class="brush:plain">
- java -cp nlpcraft-x.x.x-all-deps.jar org.apache.nlpcraft.model.tools.sqlgen.NCSqlModelGenerator --help
- </pre></div>
+ java -cp apache-nlpcraft-x.x.x-all-deps.jar org.apache.nlpcraft.model.tools.sqlgen.NCSqlModelGenerator --help
+ </pre>
+ <p>
+ After the model stub is generated:
+ <ul>
+     <li>
+         Modify and extend generated model stub to your own needs. In most cases, you'll need
+         to add, remove or modify auto-generated synonyms, add intents, etc. Note, however, that generated model
+         is fully complete and can be used as is.
+     </li>
+     <li>
+         Use generated YAML/JSON-based model together with <a href="../../../../../../org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model"><code>NCModelFileAdapter</code></a>
+         class to instantiate model from this file.
+     </li>
+     <li>
+         Use <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-"><code>NCSqlSchemaBuilder.makeSchema(NCModel)</code></a> method to get an object representation of the
+         SQL data schema for the model. You can use this object representation along with many utility
+         methods in <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlExtractor</code></a> class to efficiently auto-generate SQL queries against the source RDBMS.
+     </li>
+ </ul></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/NCModelFileAdapter.html" title="class in org.apache.nlpcraft.model"><code>NCModelFileAdapter</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlSchemaBuilder</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>
 </div>
@@ -216,6 +238,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>args</code> - Command line parameters. Execute with <code>--help</code> parameter to get a full
       documentation.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown in case of any errors.</dd>
 </dl>
 </li>
 </ul>
@@ -249,7 +273,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlLimit.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/NCSqlQuery.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/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/NCSqlModelGenerator.html" target="_top">Frames</a></li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html
index 3b58c22..1fab903 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.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>NCSqlSchema (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -19,8 +19,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var methods = {"i0":18,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -52,7 +52,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.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/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/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -105,7 +105,12 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">NCSqlSchema</span></pre>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL schema. This representation gives object model for the SQL metadata
+ that was extracted from RDBMS and added to the data model stub by <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlModelGenerator</code></a> utility.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-"><code>NCSqlSchemaBuilder.makeSchema(NCModel)</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -119,18 +124,28 @@ var activeTableTab = "activeTableTab";
 </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>
+<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><span id="t5" class="tableTab"><span><a href="javascript:show(16);">Default Methods</a></span><span class="tabE [...]
 <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/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getJoins--">getJoins</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>default <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</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/NCSqlSchema.html#getAllColumns--">getAllColumns</a></span>()</code>
+<div class="block">Creates and returns collection of all SQL columns across all tables in given schema.</div>
+</td>
 </tr>
 <tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getJoins--">getJoins</a></span>()</code>
+<div class="block">Gets collection of joins for this SQL schema.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getTables--">getTables</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getTables--">getTables</a></span>()</code>
+<div class="block">Gets collection of tables for this SQL schema.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -154,20 +169,42 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getTables</h4>
 <pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlTable</a>&gt;&nbsp;getTables()</pre>
+<div class="block">Gets collection of tables for this SQL schema.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Collection of tables for this SQL schema.</dd>
 </dl>
 </li>
 </ul>
 <a name="getJoins--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>getJoins</h4>
 <pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlJoin</a>&gt;&nbsp;getJoins()</pre>
+<div class="block">Gets collection of joins for this SQL schema.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Collection of joins for this SQL schema.</dd>
+</dl>
+</li>
+</ul>
+<a name="getAllColumns--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getAllColumns</h4>
+<pre>default&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</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;getAllColumns()</pre>
+<div class="block">Creates and returns collection of all SQL columns across all tables in given schema. It is
+ equivalent to:
+ <pre class="brush: java">
+     return getTables().stream().flatMap(t -> t.getColumns().stream()).collect(Collectors.toList());
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Collection of all SQL columns across all tables in given schema.</dd>
 </dl>
 </li>
 </ul>
@@ -200,7 +237,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.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/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/NCSqlSchemaBuilder.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html
index ada0a9f..181f978 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.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>NCSqlSchemaBuilder (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -53,7 +53,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.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/NCSqlSimpleCondition.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/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/NCSqlSchemaBuilder.html" target="_top">Frames</a></li>
@@ -114,6 +114,13 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>public class <span class="typeNameLabel">NCSqlSchemaBuilder</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/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlSchema</code></a> instances. Once you have <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlSchema</code></a>
+ you can also use utility methods from <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlExtractor</code></a>.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<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>
 </div>
@@ -151,7 +158,9 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-">makeSchema</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>&nbsp;model)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-">makeSchema</a></span>(<a href="../../../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>&nbsp;model)</code>
+<div class="block">Builds object presentation for SQL schema from given data model.</div>
+</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -199,6 +208,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <li class="blockList">
 <h4>makeSchema</h4>
 <pre>public static&nbsp;<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSchema</a>&nbsp;makeSchema(<a href="../../../../../../org/apache/nlpcraft/model/NCModel.html" title="interface in org.apache.nlpcraft.model">NCModel</a>&nbsp;model)</pre>
+<div class="block">Builds object presentation for SQL schema from given data model. Note that the model must be
+ generated by <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlModelGenerator</code></a> class.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>model</code> - Data model to generate object SQL schema presentation. Data model must be
+      generated by <a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><code>NCSqlModelGenerator</code></a> class.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Object presentation of the SQL schema for a given data model.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>NCException</code> - Thrown in case of any errors.</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<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>
 </li>
@@ -231,7 +254,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.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/NCSqlSimpleCondition.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/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/NCSqlSchemaBuilder.html" target="_top">Frames</a></li>
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html
index 3cad799..2cbee24 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.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>NCSqlSort (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -52,7 +52,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.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/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/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -105,7 +105,12 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">NCSqlSort</span></pre>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL sorting.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSort--"><code>NCSqlTable.getDefaultSort()</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractSort-org.apache.nlpcraft.model.NCToken-"><code>NCSqlExtractor.extractSort(NCToken)</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -126,11 +131,15 @@ 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/NCSqlSort.html#getColumn--">getColumn</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html#getColumn--">getColumn</a></span>()</code>
+<div class="block">Gets SQL column by which to sort.</div>
+</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html#isAscending--">isAscending</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.html#isAscending--">isAscending</a></span>()</code>
+<div class="block">Gets sorting direction.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -154,8 +163,10 @@ var activeTableTab = "activeTableTab";
 <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>
+<div class="block">Gets SQL column by which to sort.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>SQL column by which to sort.</dd>
 </dl>
 </li>
 </ul>
@@ -166,8 +177,10 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>isAscending</h4>
 <pre>boolean&nbsp;isAscending()</pre>
+<div class="block">Gets sorting direction.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd><code>True</code> for ascending sorting, <code>false</code> for descending.</dd>
 </dl>
 </li>
 </ul>
@@ -200,7 +213,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSimpleCondition.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/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/NCSqlTable.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html
index d862bd9..0227f30 100644
--- a/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html
+++ b/docs/apis/latest/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.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>NCSqlTable (Apache NLPCraft 0.5.0)</title>
-<meta name="date" content="2020-03-14">
+<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>
@@ -53,7 +53,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.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/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&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/NCSqlTable.html" target="_top">Frames</a></li>
@@ -105,7 +105,53 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">NCSqlTable</span></pre>
-<div class="block">TODO: add description.</div>
+<div class="block">Object presentation of SQL table.
+ <p>
+ In JSON/YAML generated model the table is the model element (example):
+ <pre class="brush: js">
+   elements:
+     - id: "tbl:orders"
+       groups:
+       - "table"
+       synonyms:
+       - "orders"
+       metadata:
+         sql:name: "orders"
+         sql:defaultselect:
+         - "order_id"
+         - "order_date"
+         - "required_date"
+         sql:defaultsort:
+         - "orders.order_id#desc"
+         sql:extratables:
+         - "customers"
+         - "shippers"
+         - "employees"
+         sql:defaultdate: "orders.order_date"
+       description: "Auto-generated from 'orders' table."
+ </pre>
+ Few notes:
+ <ul>
+     <li>
+         All model elements representing SQL column have ID in a form of <code>tbl:sql_table_name</code>.
+     </li>
+     <li>
+         All model elements representing SQL column belong to <code>table</code> group.
+     </li>
+     <li>
+         These model elements have auto-generated synonyms and set of mandatory metadata.
+     </li>
+     <li>
+         User can freely add group membership, change synonyms, or add new metadata.
+     </li>
+ </ul></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchemaBuilder.html#makeSchema-org.apache.nlpcraft.model.NCModel-"><code>NCSqlSchemaBuilder.makeSchema(NCModel)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractorBuilder.html#build-org.apache.nlpcraft.model.tools.sqlgen.NCSqlSchema-org.apache.nlpcraft.model.NCVariant-"><code>NCSqlExtractorBuilder.build(NCSqlSchema, NCVariant)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.html#extractTable-org.apache.nlpcraft.model.NCToken-"><code>NCSqlExtractor.extractTable(NCToken)</code></a>, 
+<a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSchema.html#getTables--"><code>NCSqlSchema.getTables()</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -126,29 +172,39 @@ var activeTableTab = "activeTableTab";
 </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/NCSqlTable.html#getColumns--">getColumns</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getColumns--">getColumns</a></span>()</code>
+<div class="block">Gets collections of this table columns.</div>
+</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Optional.html?is-external=true" title="class or interface in java.util">Optional</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/NCSqlTable.html#getDefaultDate--">getDefaultDate</a></span>()</code>
-<div class="block">Note that this columns can contains to another table.</div>
+<div class="block">Gets a column that defines a default date for this table.</div>
 </td>
 </tr>
 <tr id="i2" 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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSelect--">getDefaultSelect</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSelect--">getDefaultSelect</a></span>()</code>
+<div class="block">Gets the list of the column names for the default select set.</div>
+</td>
 </tr>
 <tr id="i3" 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/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSort--">getDefaultSort</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getDefaultSort--">getDefaultSort</a></span>()</code>
+<div class="block">Gets default sort descriptor.</div>
+</td>
 </tr>
 <tr id="i4" 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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getExtraTables--">getExtraTables</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getExtraTables--">getExtraTables</a></span>()</code>
+<div class="block">Gets the list of extra tables this table is referencing.</div>
+</td>
 </tr>
 <tr id="i5" 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/NCSqlTable.html#getTable--">getTable</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.html#getTable--">getTable</a></span>()</code>
+<div class="block">Gets table name.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -172,8 +228,17 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getTable</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;getTable()</pre>
+<div class="block">Gets table name.
+ <p>
+ In JSON/YAML generated model the table name is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+      sql:name: "orders"
+ </pre>
+ Note also that all elements declaring SQL tables belong to <code>table</code> group.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>table name.</dd>
 </dl>
 </li>
 </ul>
@@ -184,8 +249,10 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getColumns</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;getColumns()</pre>
+<div class="block">Gets collections of this table columns.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Collections of this table columns.</dd>
 </dl>
 </li>
 </ul>
@@ -196,8 +263,19 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getDefaultSort</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/NCSqlSort.html" title="interface in org.apache.nlpcraft.model.tools.sqlgen">NCSqlSort</a>&gt;&nbsp;getDefaultSort()</pre>
+<div class="block">Gets default sort descriptor.
+ <p>
+ In JSON/YAML generated model the default sort list is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:defaultsort:
+     - "orders.order_id#desc"
+ </pre>
+ Note the <code>table.column#{asc|desc}</code> notation for identifying table name,
+ column name and the sort order.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Default sort descriptor.</dd>
 </dl>
 </li>
 </ul>
@@ -208,8 +286,19 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getDefaultSelect</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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;getDefaultSelect()</pre>
+<div class="block">Gets the list of the column names for the default select set.
+ <p>
+ In JSON/YAML generated model the default select list is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:defaultselect:
+     - "order_id"
+     - "order_date"
+     - "required_date"
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>List of the column names for the default select set.</dd>
 </dl>
 </li>
 </ul>
@@ -220,8 +309,20 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getExtraTables</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/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;getExtraTables()</pre>
+<div class="block">Gets the list of extra tables this table is referencing. Extra tables are joined together with this table
+ for default selection. Often, a single domain dataset if spread over multiple tables and this
+ allows to have a meaningful default selection.
+ <p>
+ In JSON/YAML generated model the extra tables list is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:extratables:
+     - "other_part_table"
+     - "another_part_table"
+ </pre></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>List of extra tables this table's default selection.</dd>
 </dl>
 </li>
 </ul>
@@ -232,9 +333,18 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <h4>getDefaultDate</h4>
 <pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Optional.html?is-external=true" title="class or interface in java.util">Optional</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;getDefaultDate()</pre>
-<div class="block">Note that this columns can contains to another table.</div>
+<div class="block">Gets a column that defines a default date for this table. Note that this column
+ can belong to another table.
+ <p>
+ In JSON/YAML generated model the default date column is declared with the following element
+ metadata (example):
+ <pre class="brush: js">
+     sql:defaultdate: "orders.order_date"
+ </pre>
+ Note <code>table.column</code> notation for the table and column names.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Column that defines a default date for this table.</dd>
 </dl>
 </li>
 </ul>
@@ -268,7 +378,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/nlpcraft/model/tools/sqlgen/NCSqlSort.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/NCSqlUtils.html" title="class in org.apache.nlpcraft.model.tools.sqlgen"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
... 1372 lines suppressed ...