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/12 21:47:33 UTC

[incubator-nlpcraft] 01/01: Fixing remaining old licenses + misc.

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

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

commit acf0dcf33fac377cb536c92a29f925e4d7356c5f
Author: Aaron Radzinzski <ar...@datalingvo.com>
AuthorDate: Thu Mar 12 14:47:23 2020 -0700

    Fixing remaining old licenses + misc.
---
 bin/nccurl.sh                                      | 40 ++++-------
 bin/prepare.sh                                     | 40 ++++-------
 docker/Dockerfile                                  | 43 +++++-------
 docker/prepare.sh                                  | 40 ++++-------
 docs/Gemfile                                       | 38 ++++-------
 docs/_config.yml                                   | 43 ++++--------
 docs/_data/blogs.yml                               | 78 ++++------------------
 docs/_data/metrics.yml                             | 38 ++++-------
 docs/_data/news.yml                                | 68 ++++---------------
 docs/_data/releases.yml                            | 38 ++++-------
 docs/_scss/404.scss                                | 38 ++++-------
 docs/_scss/basic-concepts.scss                     | 38 ++++-------
 docs/_scss/blogs.scss                              | 38 ++++-------
 docs/_scss/buttons.scss                            | 38 ++++-------
 docs/_scss/colors.scss                             | 38 ++++-------
 docs/_scss/download.scss                           | 38 ++++-------
 docs/_scss/fonts.scss                              | 38 ++++-------
 docs/_scss/footer.scss                             | 38 ++++-------
 docs/_scss/header.scss                             | 38 ++++-------
 docs/_scss/index.scss                              | 38 ++++-------
 docs/_scss/integrations.scss                       | 38 ++++-------
 docs/_scss/metrics-and-tracing.scss                | 38 ++++-------
 docs/_scss/misc.scss                               | 38 ++++-------
 docs/_scss/server-and-probes.scss                  | 38 ++++-------
 docs/_scss/sh.scss                                 | 38 ++++-------
 docs/_scss/three-cols.scss                         | 38 ++++-------
 docs/_scss/use-cases.scss                          | 38 ++++-------
 docs/apis/javadoc-0.8.2/stylesheet.css             | 38 ++++-------
 docs/apis/latest/stylesheet.css                    | 38 ++++-------
 docs/assets/css/style.scss                         | 38 ++++-------
 javadoc/stylesheet.css                             | 38 ++++-------
 sql/mysql/database.sql                             | 38 ++++-------
 sql/mysql/drop_schema.sql                          | 38 ++++-------
 sql/mysql/schema.sql                               | 42 ++++--------
 sql/oracle/database.sql                            | 38 ++++-------
 sql/oracle/drop_schema.sql                         | 38 ++++-------
 sql/oracle/schema.sql                              | 42 ++++--------
 sql/postgres/database.sh                           | 41 ++++--------
 sql/postgres/drop_schema.sql                       | 38 ++++-------
 sql/postgres/schema.sql                            | 42 ++++--------
 .../mgrs/nlp/enrichers/sort/NCSortEnricher.scala   |  4 +-
 41 files changed, 498 insertions(+), 1127 deletions(-)

diff --git a/bin/nccurl.sh b/bin/nccurl.sh
index 3c7be78..11a204d 100755
--- a/bin/nccurl.sh
+++ b/bin/nccurl.sh
@@ -1,34 +1,20 @@
+#!/bin/bash
 #
-#  "Commons Clause" License, https://commonsclause.com/
-#
-#  The Software is provided to you by the Licensor under the License,
-#  as defined below, subject to the following condition.
-#
-#  Without limiting other conditions in the License, the grant of rights
-#  under the License will not include, and the License does not grant to
-#  you, the right to Sell the Software.
-#
-#  For purposes of the foregoing, "Sell" means practicing any or all of
-#  the rights granted to you under the License to provide to third parties,
-#  for a fee or other consideration (including without limitation fees for
-#  hosting or consulting/support services related to the Software), a
-#  product or service whose value derives, entirely or substantially, from
-#  the functionality of the Software. Any license notice or attribution
-#  required by the License must also include this Commons Clause License
-#  Condition notice.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-#  Software:    NLPCraft
-#  License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
-#  Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#      _   ____      ______           ______
-#     / | / / /___  / ____/________ _/ __/ /_
-#    /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
-#   / /|  / / /_/ / /___/ /  / /_/ / __/ /_
-#  /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
-#         /_/
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
-#!/bin/bash
 
 # Quick shortcut script for localhost testing with curl (w/o excessive command line).
 #
diff --git a/bin/prepare.sh b/bin/prepare.sh
index a87abf1..1072c8d 100755
--- a/bin/prepare.sh
+++ b/bin/prepare.sh
@@ -1,34 +1,20 @@
+#!/bin/bash
 #
-#  "Commons Clause" License, https://commonsclause.com/
-#
-#  The Software is provided to you by the Licensor under the License,
-#  as defined below, subject to the following condition.
-#
-#  Without limiting other conditions in the License, the grant of rights
-#  under the License will not include, and the License does not grant to
-#  you, the right to Sell the Software.
-#
-#  For purposes of the foregoing, "Sell" means practicing any or all of
-#  the rights granted to you under the License to provide to third parties,
-#  for a fee or other consideration (including without limitation fees for
-#  hosting or consulting/support services related to the Software), a
-#  product or service whose value derives, entirely or substantially, from
-#  the functionality of the Software. Any license notice or attribution
-#  required by the License must also include this Commons Clause License
-#  Condition notice.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-#  Software:    NLPCraft
-#  License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
-#  Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#      _   ____      ______           ______
-#     / | / / /___  / ____/________ _/ __/ /_
-#    /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
-#   / /|  / / /_/ / /___/ /  / /_/ / __/ /_
-#  /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
-#         /_/
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
-#!/bin/bash
 
 if [[ $1 = "" ]] ; then
     echo "Version must be set as input parameter."
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 91831c0..c3a6914 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,37 +1,24 @@
 #
-#  "Commons Clause" License, https://commonsclause.com/
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-#  The Software is provided to you by the Licensor under the License,
-#  as defined below, subject to the following condition.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#  Without limiting other conditions in the License, the grant of rights
-#  under the License will not include, and the License does not grant to
-#  you, the right to Sell the Software.
-#
-#  For purposes of the foregoing, "Sell" means practicing any or all of
-#  the rights granted to you under the License to provide to third parties,
-#  for a fee or other consideration (including without limitation fees for
-#  hosting or consulting/support services related to the Software), a
-#  product or service whose value derives, entirely or substantially, from
-#  the functionality of the Software. Any license notice or attribution
-#  required by the License must also include this Commons Clause License
-#  Condition notice.
-#
-#  Software:    NLPCraft
-#  License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
-#  Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
-#
-#      _   ____      ______           ______
-#     / | / / /___  / ____/________ _/ __/ /_
-#    /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
-#   / /|  / / /_/ / /___/ /  / /_/ / __/ /_
-#  /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
-#         /_/
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
+
 FROM openjdk:8-alpine
-LABEL Software="https://nlpcraft.org"
+LABEL Software="https://nlpcraft.apache.org"
 LABEL License="Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0"
-LABEL Licensor="Copyright (C) NLPCraft. https://www.nlpcraft.org"
+LABEL Licensor="Copyright 2020 (C) Apache Software Foundation"
 ARG JAR_FILE
 COPY $JAR_FILE nlpcraft-all-deps.jar
 ENTRYPOINT ["java", \
diff --git a/docker/prepare.sh b/docker/prepare.sh
index 2cc401c..7d9fc8c 100755
--- a/docker/prepare.sh
+++ b/docker/prepare.sh
@@ -1,34 +1,20 @@
+#!/bin/bash
 #
-#  "Commons Clause" License, https://commonsclause.com/
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-#  The Software is provided to you by the Licensor under the License,
-#  as defined below, subject to the following condition.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#  Without limiting other conditions in the License, the grant of rights
-#  under the License will not include, and the License does not grant to
-#  you, the right to Sell the Software.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
-#  For purposes of the foregoing, "Sell" means practicing any or all of
-#  the rights granted to you under the License to provide to third parties,
-#  for a fee or other consideration (including without limitation fees for
-#  hosting or consulting/support services related to the Software), a
-#  product or service whose value derives, entirely or substantially, from
-#  the functionality of the Software. Any license notice or attribution
-#  required by the License must also include this Commons Clause License
-#  Condition notice.
-#
-#  Software:    NLPCraft
-#  License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
-#  Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
-#
-#      _   ____      ______           ______
-#     / | / / /___  / ____/________ _/ __/ /_
-#    /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
-#   / /|  / / /_/ / /___/ /  / /_/ / __/ /_
-#  /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
-#         /_/
-#
-#!/usr/bin/env bash
 
 if [[ $1 = "" ]] ; then
     echo "Dockerhub username must be defined as the first parameter."
diff --git a/docs/Gemfile b/docs/Gemfile
index e7fea7f..5301edb 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -1,32 +1,18 @@
 #
-#   "Commons Clause" License, https://commonsclause.com/
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-#   The Software is provided to you by the Licensor under the License,
-#   as defined below, subject to the following condition.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#   Without limiting other conditions in the License, the grant of rights
-#   under the License will not include, and the License does not grant to
-#   you, the right to Sell the Software.
-#
-#   For purposes of the foregoing, "Sell" means practicing any or all of
-#   the rights granted to you under the License to provide to third parties,
-#   for a fee or other consideration (including without limitation fees for
-#   hosting or consulting/support services related to the Software), a
-#   product or service whose value derives, entirely or substantially, from
-#   the functionality of the Software. Any license notice or attribution
-#   required by the License must also include this Commons Clause License
-#   Condition notice.
-#
-#   Software:    NLPCraft
-#   License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
-#   Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
-#
-#       _   ____      ______           ______
-#      / | / / /___  / ____/________ _/ __/ /_
-#     /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
-#    / /|  / / /_/ / /___/ /  / /_/ / __/ /_
-#   /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
-#          /_/
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 
 source "https://rubygems.org"
diff --git a/docs/_config.yml b/docs/_config.yml
index ed311c0..faecd9b 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,37 +1,22 @@
 #
-#   "Commons Clause" License, https://commonsclause.com/
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-#   The Software is provided to you by the Licensor under the License,
-#   as defined below, subject to the following condition.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#   Without limiting other conditions in the License, the grant of rights
-#   under the License will not include, and the License does not grant to
-#   you, the right to Sell the Software.
-#
-#   For purposes of the foregoing, "Sell" means practicing any or all of
-#   the rights granted to you under the License to provide to third parties,
-#   for a fee or other consideration (including without limitation fees for
-#   hosting or consulting/support services related to the Software), a
-#   product or service whose value derives, entirely or substantially, from
-#   the functionality of the Software. Any license notice or attribution
-#   required by the License must also include this Commons Clause License
-#   Condition notice.
-#
-#   Software:    NLPCraft
-#   License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
-#   Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
-#
-#       _   ____      ______           ______
-#      / | / / /___  / ____/________ _/ __/ /_
-#     /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
-#    / /|  / / /_/ / /___/ /  / /_/ / __/ /_
-#   /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
-#          /_/
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 
-title: NLPCraft
-email: info@nlpcraft.org
-copyright: Copyright (C) NLPCraft.
+title: Apache NLPCraft
+copyright: Copyright 2020 (C) Apache Software Foundation.
 baseurl: ""
 url: ""
 
diff --git a/docs/_data/blogs.yml b/docs/_data/blogs.yml
index 4323f34..58e2258 100644
--- a/docs/_data/blogs.yml
+++ b/docs/_data/blogs.yml
@@ -1,32 +1,18 @@
 #
-#   "Commons Clause" License, https://commonsclause.com/
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-#   The Software is provided to you by the Licensor under the License,
-#   as defined below, subject to the following condition.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#   Without limiting other conditions in the License, the grant of rights
-#   under the License will not include, and the License does not grant to
-#   you, the right to Sell the Software.
-#
-#   For purposes of the foregoing, "Sell" means practicing any or all of
-#   the rights granted to you under the License to provide to third parties,
-#   for a fee or other consideration (including without limitation fees for
-#   hosting or consulting/support services related to the Software), a
-#   product or service whose value derives, entirely or substantially, from
-#   the functionality of the Software. Any license notice or attribution
-#   required by the License must also include this Commons Clause License
-#   Condition notice.
-#
-#   Software:    NLPCraft
-#   License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
-#   Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
-#
-#       _   ____      ______           ______
-#      / | / / /___  / ____/________ _/ __/ /_
-#     /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
-#    / /|  / / /_/ / /___/ /  / /_/ / __/ /_
-#   /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
-#          /_/
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 
 - title: О пользе кодирования при разработке NLP моделей
@@ -68,43 +54,3 @@
   avatar_url: images/monakhov.png
   publish_date: July 18, 2019
   flag-ico: images/ru-flag-128x128.png
-
-#- title: Introducing NLPCraft 0.6
-#  url: https://medium.com/@aradzinski/introducing-nlpcraft-0-6-74cea6a4d203
-#  excerpt: Google NL and Standford CoreNLP integration, new intent DSL, bugfixes & improvements.
-#  author: Aaron Radzinksi
-#  avatar_url: images/lion.jpg
-#  publish_date: June 21, 2019
-#  linkedin_id: aaron-radzinski-6b2228167
-#  twitter_id: aaron_radzinski
-#  medium_id: aradzinski
-
-#- title: Here’s Why Natural Language Interface Is Hard
-#  url: https://chatbotslife.com/heres-why-developing-natural-language-interface-is-hard-3cb2f8fe7de8
-#  excerpt: In this article I would like to show why NLI (Natural Language Interface) is often so hard to do.
-#  author: Aaron Radzinksi
-#  avatar_url: images/lion.jpg
-#  publish_date: Sep 27, 2018
-#  linkedin_id: aaron-radzinski-6b2228167
-#  twitter_id: aaron_radzinski
-#  medium_id: aradzinski
-
-#- title: Natural Language Interface In Enterprise
-#  url: https://medium.com/@aradzinski/natural-language-interface-in-enterprise-5f06ca7ed36f
-#  excerpt: Why enterprise application companies should take a cue from Apple Siri and Google Assistant.
-#  author: Aaron Radzinksi
-#  avatar_url: images/lion.jpg
-#  publish_date: July 29, 2018
-#  linkedin_id: aaron-radzinski-6b2228167
-#  twitter_id: aaron_radzinski
-#  medium_id: aradzinski
-
-#- title: The Problem With Conversational Interfaces - The Conversation
-#  url: https://medium.com/@aradzinski/the-problem-with-conversational-interfaces-the-conversation-eda4ad55453b
-#  excerpt: Here are my thoughts on the role of conversation in NLU/P systems.
-#  author: Aaron Radzinksi
-#  avatar_url: images/lion.jpg
-#  publish_date: July 23, 2018
-#  linkedin_id: aaron-radzinski-6b2228167
-#  twitter_id: aaron_radzinski
-#  medium_id: aradzinski
\ No newline at end of file
diff --git a/docs/_data/metrics.yml b/docs/_data/metrics.yml
index 936d964..800441a 100644
--- a/docs/_data/metrics.yml
+++ b/docs/_data/metrics.yml
@@ -1,32 +1,18 @@
 #
-#   "Commons Clause" License, https://commonsclause.com/
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-#   The Software is provided to you by the Licensor under the License,
-#   as defined below, subject to the following condition.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#   Without limiting other conditions in the License, the grant of rights
-#   under the License will not include, and the License does not grant to
-#   you, the right to Sell the Software.
-#
-#   For purposes of the foregoing, "Sell" means practicing any or all of
-#   the rights granted to you under the License to provide to third parties,
-#   for a fee or other consideration (including without limitation fees for
-#   hosting or consulting/support services related to the Software), a
-#   product or service whose value derives, entirely or substantially, from
-#   the functionality of the Software. Any license notice or attribution
-#   required by the License must also include this Commons Clause License
-#   Condition notice.
-#
-#   Software:    NLPCraft
-#   License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
-#   Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
-#
-#       _   ____      ______           ______
-#      / | / / /___  / ____/________ _/ __/ /_
-#     /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
-#    / /|  / / /_/ / /___/ /  / /_/ / __/ /_
-#   /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
-#          /_/
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 
 server:
diff --git a/docs/_data/news.yml b/docs/_data/news.yml
index dba2e42..58ee185 100644
--- a/docs/_data/news.yml
+++ b/docs/_data/news.yml
@@ -1,32 +1,18 @@
 #
-#   "Commons Clause" License, https://commonsclause.com/
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-#   The Software is provided to you by the Licensor under the License,
-#   as defined below, subject to the following condition.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#   Without limiting other conditions in the License, the grant of rights
-#   under the License will not include, and the License does not grant to
-#   you, the right to Sell the Software.
-#
-#   For purposes of the foregoing, "Sell" means practicing any or all of
-#   the rights granted to you under the License to provide to third parties,
-#   for a fee or other consideration (including without limitation fees for
-#   hosting or consulting/support services related to the Software), a
-#   product or service whose value derives, entirely or substantially, from
-#   the functionality of the Software. Any license notice or attribution
-#   required by the License must also include this Commons Clause License
-#   Condition notice.
-#
-#   Software:    NLPCraft
-#   License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
-#   Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
-#
-#       _   ____      ______           ______
-#      / | / / /___  / ____/________ _/ __/ /_
-#     /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
-#    / /|  / / /_/ / /___/ /  / /_/ / __/ /_
-#   /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
-#          /_/
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 
 - title: Использование именованных сущностей (NE) в NLPCraft
@@ -53,33 +39,3 @@
   linkedin_id: aaron-radzinski-6b2228167
   twitter_id: aaron_radzinski
   medium_id: aradzinski
-
-#- title: Here’s Why Natural Language Interface Is Hard
-#  url: https://chatbotslife.com/heres-why-developing-natural-language-interface-is-hard-3cb2f8fe7de8
-#  excerpt: In this article I would like to show why NLI (Natural Language Interface) is often so hard to do.
-#  author: Aaron Radzinksi
-#  avatar_url: images/lion.jpg
-#  publish_date: Sep 27, 2018
-#  linkedin_id: aaron-radzinski-6b2228167
-#  twitter_id: aaron_radzinski
-#  medium_id: aradzinski
-
-#- title: Natural Language Interface In Enterprise
-#  url: https://medium.com/@aradzinski/natural-language-interface-in-enterprise-5f06ca7ed36f
-#  excerpt: Why enterprise application companies should take a cue from Apple Siri and Google Assistant.
-#  author: Aaron Radzinksi
-#  avatar_url: images/lion.jpg
-#  publish_date: July 29, 2018
-#  linkedin_id: aaron-radzinski-6b2228167
-#  twitter_id: aaron_radzinski
-#  medium_id: aradzinski
-
-#- title: The Problem With Conversational Interfaces - The Conversation
-#  url: https://medium.com/@aradzinski/the-problem-with-conversational-interfaces-the-conversation-eda4ad55453b
-#  excerpt: Here are my thoughts on the role of conversation in NLU/P systems.
-#  author: Aaron Radzinksi
-#  avatar_url: images/lion.jpg
-#  publish_date: July 23, 2018
-#  linkedin_id: aaron-radzinski-6b2228167
-#  twitter_id: aaron_radzinski
-#  medium_id: aradzinski
\ No newline at end of file
diff --git a/docs/_data/releases.yml b/docs/_data/releases.yml
index ec5f4c6..bfe57d1 100644
--- a/docs/_data/releases.yml
+++ b/docs/_data/releases.yml
@@ -1,32 +1,18 @@
 #
-#   "Commons Clause" License, https://commonsclause.com/
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-#   The Software is provided to you by the Licensor under the License,
-#   as defined below, subject to the following condition.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#   Without limiting other conditions in the License, the grant of rights
-#   under the License will not include, and the License does not grant to
-#   you, the right to Sell the Software.
-#
-#   For purposes of the foregoing, "Sell" means practicing any or all of
-#   the rights granted to you under the License to provide to third parties,
-#   for a fee or other consideration (including without limitation fees for
-#   hosting or consulting/support services related to the Software), a
-#   product or service whose value derives, entirely or substantially, from
-#   the functionality of the Software. Any license notice or attribution
-#   required by the License must also include this Commons Clause License
-#   Condition notice.
-#
-#   Software:    NLPCraft
-#   License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
-#   Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
-#
-#       _   ____      ______           ______
-#      / | / / /___  / ____/________ _/ __/ /_
-#     /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
-#    / /|  / / /_/ / /___/ /  / /_/ / __/ /_
-#   /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
-#          /_/
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 
 - version: 0.8.2
diff --git a/docs/_scss/404.scss b/docs/_scss/404.scss
index 6486225..79d384f 100644
--- a/docs/_scss/404.scss
+++ b/docs/_scss/404.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 .page-not-found {
diff --git a/docs/_scss/basic-concepts.scss b/docs/_scss/basic-concepts.scss
index f2f9a53..b26c3a6 100644
--- a/docs/_scss/basic-concepts.scss
+++ b/docs/_scss/basic-concepts.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #basic-concepts {
diff --git a/docs/_scss/blogs.scss b/docs/_scss/blogs.scss
index 76e118c..8b9700c 100644
--- a/docs/_scss/blogs.scss
+++ b/docs/_scss/blogs.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #blog {
diff --git a/docs/_scss/buttons.scss b/docs/_scss/buttons.scss
index d0f7503..ac58e79 100644
--- a/docs/_scss/buttons.scss
+++ b/docs/_scss/buttons.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 @mixin custom-button($fg, $bg) {
diff --git a/docs/_scss/colors.scss b/docs/_scss/colors.scss
index e6bdc2b..4ac592d 100644
--- a/docs/_scss/colors.scss
+++ b/docs/_scss/colors.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /*
diff --git a/docs/_scss/download.scss b/docs/_scss/download.scss
index f75d14e..a9872f6 100644
--- a/docs/_scss/download.scss
+++ b/docs/_scss/download.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #downloads {
diff --git a/docs/_scss/fonts.scss b/docs/_scss/fonts.scss
index 4c0b77f..ba69e88 100644
--- a/docs/_scss/fonts.scss
+++ b/docs/_scss/fonts.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 @font-face {
diff --git a/docs/_scss/footer.scss b/docs/_scss/footer.scss
index 67f772f..af9812f 100644
--- a/docs/_scss/footer.scss
+++ b/docs/_scss/footer.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 // Footer styling.
diff --git a/docs/_scss/header.scss b/docs/_scss/header.scss
index f5e168a..1178748 100644
--- a/docs/_scss/header.scss
+++ b/docs/_scss/header.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #top-header {
diff --git a/docs/_scss/index.scss b/docs/_scss/index.scss
index 786be58..e2c5d84 100644
--- a/docs/_scss/index.scss
+++ b/docs/_scss/index.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #banner-box {
diff --git a/docs/_scss/integrations.scss b/docs/_scss/integrations.scss
index 3ae59ab..93fb743 100644
--- a/docs/_scss/integrations.scss
+++ b/docs/_scss/integrations.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #integrations {
diff --git a/docs/_scss/metrics-and-tracing.scss b/docs/_scss/metrics-and-tracing.scss
index 91572c6..1879c9d 100644
--- a/docs/_scss/metrics-and-tracing.scss
+++ b/docs/_scss/metrics-and-tracing.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #metrics-and-tracing {
diff --git a/docs/_scss/misc.scss b/docs/_scss/misc.scss
index 446e7b9..440eb8f 100644
--- a/docs/_scss/misc.scss
+++ b/docs/_scss/misc.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 $min-width: 768px;
diff --git a/docs/_scss/server-and-probes.scss b/docs/_scss/server-and-probes.scss
index 32eae42..0cfbce6 100644
--- a/docs/_scss/server-and-probes.scss
+++ b/docs/_scss/server-and-probes.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #server-and-probes {
diff --git a/docs/_scss/sh.scss b/docs/_scss/sh.scss
index ac85fe4..a9125be 100644
--- a/docs/_scss/sh.scss
+++ b/docs/_scss/sh.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 .syntaxhighlighter {
diff --git a/docs/_scss/three-cols.scss b/docs/_scss/three-cols.scss
index b38132b..759d076 100644
--- a/docs/_scss/three-cols.scss
+++ b/docs/_scss/three-cols.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 .first-column {
diff --git a/docs/_scss/use-cases.scss b/docs/_scss/use-cases.scss
index c1067df..cc7a9bb 100644
--- a/docs/_scss/use-cases.scss
+++ b/docs/_scss/use-cases.scss
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #use-cases {
diff --git a/docs/apis/javadoc-0.8.2/stylesheet.css b/docs/apis/javadoc-0.8.2/stylesheet.css
index d8678b0..30779e5 100644
--- a/docs/apis/javadoc-0.8.2/stylesheet.css
+++ b/docs/apis/javadoc-0.8.2/stylesheet.css
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 body {
diff --git a/docs/apis/latest/stylesheet.css b/docs/apis/latest/stylesheet.css
index d8678b0..30779e5 100644
--- a/docs/apis/latest/stylesheet.css
+++ b/docs/apis/latest/stylesheet.css
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 body {
diff --git a/docs/assets/css/style.scss b/docs/assets/css/style.scss
index d224844..b5cd060 100644
--- a/docs/assets/css/style.scss
+++ b/docs/assets/css/style.scss
@@ -2,34 +2,20 @@
 ---
 
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the    grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /*
diff --git a/javadoc/stylesheet.css b/javadoc/stylesheet.css
index d8678b0..30779e5 100644
--- a/javadoc/stylesheet.css
+++ b/javadoc/stylesheet.css
@@ -1,32 +1,18 @@
 /*
- * "Commons Clause" License, https://commonsclause.com/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * The Software is provided to you by the Licensor under the License,
- * as defined below, subject to the following condition.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Without limiting other conditions in the License, the grant of rights
- * under the License will not include, and the License does not grant to
- * you, the right to Sell the Software.
- *
- * For purposes of the foregoing, "Sell" means practicing any or all of
- * the rights granted to you under the License to provide to third parties,
- * for a fee or other consideration (including without limitation fees for
- * hosting or consulting/support services related to the Software), a
- * product or service whose value derives, entirely or substantially, from
- * the functionality of the Software. Any license notice or attribution
- * required by the License must also include this Commons Clause License
- * Condition notice.
- *
- * Software:    NLPCraft
- * License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
- * Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
- *
- *     _   ____      ______           ______
- *    / | / / /___  / ____/________ _/ __/ /_
- *   /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
- *  / /|  / / /_/ / /___/ /  / /_/ / __/ /_
- * /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
- *        /_/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 body {
diff --git a/sql/mysql/database.sql b/sql/mysql/database.sql
index d657cb1..ceda8b8 100644
--- a/sql/mysql/database.sql
+++ b/sql/mysql/database.sql
@@ -1,32 +1,18 @@
 --
---   "Commons Clause" License, https://commonsclause.com/
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
 --
---   The Software is provided to you by the Licensor under the License,
---   as defined below, subject to the following condition.
+--      http://www.apache.org/licenses/LICENSE-2.0
 --
---   Without limiting other conditions in the License, the grant of rights
---   under the License will not include, and the License does not grant to
---   you, the right to Sell the Software.
---
---   For purposes of the foregoing, "Sell" means practicing any or all of
---   the rights granted to you under the License to provide to third parties,
---   for a fee or other consideration (including without limitation fees for
---   hosting or consulting/support services related to the Software), a
---   product or service whose value derives, entirely or substantially, from
---   the functionality of the Software. Any license notice or attribution
---   required by the License must also include this Commons Clause License
---   Condition notice.
---
---   Software:    NLPCraft
---   License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
---   Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
---
---       _   ____      ______           ______
---      / | / / /___  / ____/________ _/ __/ /_
---     /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
---    / /|  / / /_/ / /___/ /  / /_/ / __/ /_
---   /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
---          /_/
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
 --
 
 CREATE SCHEMA IF NOT EXISTS nlpcraft DEFAULT CHARACTER SET utf8;
\ No newline at end of file
diff --git a/sql/mysql/drop_schema.sql b/sql/mysql/drop_schema.sql
index 3694239..d461dda 100644
--- a/sql/mysql/drop_schema.sql
+++ b/sql/mysql/drop_schema.sql
@@ -1,32 +1,18 @@
 --
---   "Commons Clause" License, https://commonsclause.com/
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
 --
---   The Software is provided to you by the Licensor under the License,
---   as defined below, subject to the following condition.
+--      http://www.apache.org/licenses/LICENSE-2.0
 --
---   Without limiting other conditions in the License, the grant of rights
---   under the License will not include, and the License does not grant to
---   you, the right to Sell the Software.
---
---   For purposes of the foregoing, "Sell" means practicing any or all of
---   the rights granted to you under the License to provide to third parties,
---   for a fee or other consideration (including without limitation fees for
---   hosting or consulting/support services related to the Software), a
---   product or service whose value derives, entirely or substantially, from
---   the functionality of the Software. Any license notice or attribution
---   required by the License must also include this Commons Clause License
---   Condition notice.
---
---   Software:    NLPCraft
---   License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
---   Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
---
---       _   ____      ______           ______
---      / | / / /___  / ____/________ _/ __/ /_
---     /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
---    / /|  / / /_/ / /___/ /  / /_/ / __/ /_
---   /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
---          /_/
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
 --
 
 USE nlpcraft;
diff --git a/sql/mysql/schema.sql b/sql/mysql/schema.sql
index 8660f75..53df137 100644
--- a/sql/mysql/schema.sql
+++ b/sql/mysql/schema.sql
@@ -1,32 +1,18 @@
 --
---   "Commons Clause" License, https://commonsclause.com/
---
---   The Software is provided to you by the Licensor under the License,
---   as defined below, subject to the following condition.
---
---   Without limiting other conditions in the License, the grant of rights
---   under the License will not include, and the License does not grant to
---   you, the right to Sell the Software.
---
---   For purposes of the foregoing, "Sell" means practicing any or all of
---   the rights granted to you under the License to provide to third parties,
---   for a fee or other consideration (including without limitation fees for
---   hosting or consulting/support services related to the Software), a
---   product or service whose value derives, entirely or substantially, from
---   the functionality of the Software. Any license notice or attribution
---   required by the License must also include this Commons Clause License
---   Condition notice.
---
---   Software:    NLPCraft
---   License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
---   Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
---
---       _   ____      ______           ______
---      / | / / /___  / ____/________ _/ __/ /_
---     /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
---    / /|  / / /_/ / /___/ /  / /_/ / __/ /_
---   /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
---          /_/
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
 --
 
 --
diff --git a/sql/oracle/database.sql b/sql/oracle/database.sql
index aa14e49..e1e2b51 100644
--- a/sql/oracle/database.sql
+++ b/sql/oracle/database.sql
@@ -1,32 +1,18 @@
 --
---   "Commons Clause" License, https://commonsclause.com/
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
 --
---   The Software is provided to you by the Licensor under the License,
---   as defined below, subject to the following condition.
+--      http://www.apache.org/licenses/LICENSE-2.0
 --
---   Without limiting other conditions in the License, the grant of rights
---   under the License will not include, and the License does not grant to
---   you, the right to Sell the Software.
---
---   For purposes of the foregoing, "Sell" means practicing any or all of
---   the rights granted to you under the License to provide to third parties,
---   for a fee or other consideration (including without limitation fees for
---   hosting or consulting/support services related to the Software), a
---   product or service whose value derives, entirely or substantially, from
---   the functionality of the Software. Any license notice or attribution
---   required by the License must also include this Commons Clause License
---   Condition notice.
---
---   Software:    NLPCraft
---   License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
---   Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
---
---       _   ____      ______           ______
---      / | / / /___  / ____/________ _/ __/ /_
---     /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
---    / /|  / / /_/ / /___/ /  / /_/ / __/ /_
---   /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
---          /_/
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
 --
 
 CREATE USER nlpcraft IDENTIFIED BY nlpcraft;
diff --git a/sql/oracle/drop_schema.sql b/sql/oracle/drop_schema.sql
index a2f7205..a20720f 100644
--- a/sql/oracle/drop_schema.sql
+++ b/sql/oracle/drop_schema.sql
@@ -1,32 +1,18 @@
 --
---   "Commons Clause" License, https://commonsclause.com/
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
 --
---   The Software is provided to you by the Licensor under the License,
---   as defined below, subject to the following condition.
+--      http://www.apache.org/licenses/LICENSE-2.0
 --
---   Without limiting other conditions in the License, the grant of rights
---   under the License will not include, and the License does not grant to
---   you, the right to Sell the Software.
---
---   For purposes of the foregoing, "Sell" means practicing any or all of
---   the rights granted to you under the License to provide to third parties,
---   for a fee or other consideration (including without limitation fees for
---   hosting or consulting/support services related to the Software), a
---   product or service whose value derives, entirely or substantially, from
---   the functionality of the Software. Any license notice or attribution
---   required by the License must also include this Commons Clause License
---   Condition notice.
---
---   Software:    NLPCraft
---   License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
---   Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
---
---       _   ____      ______           ______
---      / | / / /___  / ____/________ _/ __/ /_
---     /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
---    / /|  / / /_/ / /___/ /  / /_/ / __/ /_
---   /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
---          /_/
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
 --
 
 BEGIN
diff --git a/sql/oracle/schema.sql b/sql/oracle/schema.sql
index 83e1b71..12ac03b 100644
--- a/sql/oracle/schema.sql
+++ b/sql/oracle/schema.sql
@@ -1,32 +1,18 @@
 --
---   "Commons Clause" License, https://commonsclause.com/
---
---   The Software is provided to you by the Licensor under the License,
---   as defined below, subject to the following condition.
---
---   Without limiting other conditions in the License, the grant of rights
---   under the License will not include, and the License does not grant to
---   you, the right to Sell the Software.
---
---   For purposes of the foregoing, "Sell" means practicing any or all of
---   the rights granted to you under the License to provide to third parties,
---   for a fee or other consideration (including without limitation fees for
---   hosting or consulting/support services related to the Software), a
---   product or service whose value derives, entirely or substantially, from
---   the functionality of the Software. Any license notice or attribution
---   required by the License must also include this Commons Clause License
---   Condition notice.
---
---   Software:    NLPCraft
---   License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
---   Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
---
---       _   ____      ______           ______
---      / | / / /___  / ____/________ _/ __/ /_
---     /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
---    / /|  / / /_/ / /___/ /  / /_/ / __/ /_
---   /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
---          /_/
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
 --
 
 --
diff --git a/sql/postgres/database.sh b/sql/postgres/database.sh
index a671629..64aa2fa 100755
--- a/sql/postgres/database.sh
+++ b/sql/postgres/database.sh
@@ -1,34 +1,21 @@
+#!/bin/bash
 #
-#  "Commons Clause" License, https://commonsclause.com/
-#
-#  The Software is provided to you by the Licensor under the License,
-#  as defined below, subject to the following condition.
-#
-#  Without limiting other conditions in the License, the grant of rights
-#  under the License will not include, and the License does not grant to
-#  you, the right to Sell the Software.
-#
-#  For purposes of the foregoing, "Sell" means practicing any or all of
-#  the rights granted to you under the License to provide to third parties,
-#  for a fee or other consideration (including without limitation fees for
-#  hosting or consulting/support services related to the Software), a
-#  product or service whose value derives, entirely or substantially, from
-#  the functionality of the Software. Any license notice or attribution
-#  required by the License must also include this Commons Clause License
-#  Condition notice.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-#  Software:    NLPCraft
-#  License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
-#  Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#      _   ____      ______           ______
-#     / | / / /___  / ____/________ _/ __/ /_
-#    /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
-#   / /|  / / /_/ / /___/ /  / /_/ / __/ /_
-#  /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
-#         /_/
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
-#!/bin/bash
+
 
 sudo -u postgres psql
 create user nlpcraft with password 'nlpcraft';
diff --git a/sql/postgres/drop_schema.sql b/sql/postgres/drop_schema.sql
index 6c24fc0..4cd8646 100644
--- a/sql/postgres/drop_schema.sql
+++ b/sql/postgres/drop_schema.sql
@@ -1,32 +1,18 @@
 --
---   "Commons Clause" License, https://commonsclause.com/
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
 --
---   The Software is provided to you by the Licensor under the License,
---   as defined below, subject to the following condition.
+--      http://www.apache.org/licenses/LICENSE-2.0
 --
---   Without limiting other conditions in the License, the grant of rights
---   under the License will not include, and the License does not grant to
---   you, the right to Sell the Software.
---
---   For purposes of the foregoing, "Sell" means practicing any or all of
---   the rights granted to you under the License to provide to third parties,
---   for a fee or other consideration (including without limitation fees for
---   hosting or consulting/support services related to the Software), a
---   product or service whose value derives, entirely or substantially, from
---   the functionality of the Software. Any license notice or attribution
---   required by the License must also include this Commons Clause License
---   Condition notice.
---
---   Software:    NLPCraft
---   License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
---   Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
---
---       _   ____      ______           ______
---      / | / / /___  / ____/________ _/ __/ /_
---     /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
---    / /|  / / /_/ / /___/ /  / /_/ / __/ /_
---   /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
---          /_/
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
 --
 
 DROP TABLE IF EXISTS proc_log CASCADE;
diff --git a/sql/postgres/schema.sql b/sql/postgres/schema.sql
index 39f60ce..2444dbb 100644
--- a/sql/postgres/schema.sql
+++ b/sql/postgres/schema.sql
@@ -1,32 +1,18 @@
 --
---   "Commons Clause" License, https://commonsclause.com/
---
---   The Software is provided to you by the Licensor under the License,
---   as defined below, subject to the following condition.
---
---   Without limiting other conditions in the License, the grant of rights
---   under the License will not include, and the License does not grant to
---   you, the right to Sell the Software.
---
---   For purposes of the foregoing, "Sell" means practicing any or all of
---   the rights granted to you under the License to provide to third parties,
---   for a fee or other consideration (including without limitation fees for
---   hosting or consulting/support services related to the Software), a
---   product or service whose value derives, entirely or substantially, from
---   the functionality of the Software. Any license notice or attribution
---   required by the License must also include this Commons Clause License
---   Condition notice.
---
---   Software:    NLPCraft
---   License:     Apache 2.0, https://www.apache.org/licenses/LICENSE-2.0
---   Licensor:    Copyright (C) NLPCraft. https://nlpcraft.org
---
---       _   ____      ______           ______
---      / | / / /___  / ____/________ _/ __/ /_
---     /  |/ / / __ \/ /   / ___/ __ `/ /_/ __/
---    / /|  / / /_/ / /___/ /  / /_/ / __/ /_
---   /_/ |_/_/ .___/\____/_/   \__,_/_/  \__/
---          /_/
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
 --
 
 --
diff --git a/src/main/scala/org/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala b/src/main/scala/org/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
index 7e9de2c..dddd833 100644
--- a/src/main/scala/org/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
+++ b/src/main/scala/org/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
@@ -55,7 +55,7 @@ object NCSortEnricher extends NCProbeEnricher {
         ).flatMap { case (txt, asc) ⇒ p.expand(txt).map(p ⇒ NCNlpCoreManager.stem(p) → asc) }
     }
 
-    require(SORT.size + BY.size + ORDER.size == (SORT ++ BY ++ ORDER.unzip._1).distinct.size)
+    require(SORT.size + BY.size + ORDER.size == (SORT ++ BY ++ ORDER.map(_._1)).distinct.size)
 
     private final val TOK_ID: String = "nlpcraft:sort"
 
@@ -196,7 +196,7 @@ object NCSortEnricher extends NCProbeEnricher {
 
         val hOpt: Option[KeyWordsHolder] =
             get0(SORT, toks) match {
-                case Some(sort) ⇒ Some(KeyWordsHolder(sort, get0(BY, toks), get0(ORDER.unzip._1, toks)))
+                case Some(sort) ⇒ Some(KeyWordsHolder(sort, get0(BY, toks), get0(ORDER.map(_._1), toks)))
                 case None ⇒ None
             }