diff --git a/README.markdown b/README.markdown
index 8c2307750..5f1c78591 100644
--- a/README.markdown
+++ b/README.markdown
@@ -181,7 +181,7 @@ For unit-testing with embedded Cassandra, add this dependency with **test** scop
  For any question, bug encountered, you can use the **[mailing list]**
 
 ## License
-Copyright 2012-2019 DuyHai DOAN
+Copyright 2012-2021 DuyHai DOAN
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this application except in compliance with the License. You may obtain a copy of the License at
 
diff --git a/achilles-common/pom.xml b/achilles-common/pom.xml
index b2a669da0..2f95116e2 100644
--- a/achilles-common/pom.xml
+++ b/achilles-common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/achilles-common/src/main/java/com/datastax/driver/core/StatementWrapperUtils.java b/achilles-common/src/main/java/com/datastax/driver/core/StatementWrapperUtils.java
index 8aba37883..685c3450c 100644
--- a/achilles-common/src/main/java/com/datastax/driver/core/StatementWrapperUtils.java
+++ b/achilles-common/src/main/java/com/datastax/driver/core/StatementWrapperUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-common/src/main/java/info/archinnov/achilles/internals/futures/FutureUtils.java b/achilles-common/src/main/java/info/archinnov/achilles/internals/futures/FutureUtils.java
index 78fbcae57..6461c529d 100644
--- a/achilles-common/src/main/java/info/archinnov/achilles/internals/futures/FutureUtils.java
+++ b/achilles-common/src/main/java/info/archinnov/achilles/internals/futures/FutureUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-common/src/main/java/info/archinnov/achilles/internals/statement/StatementHelper.java b/achilles-common/src/main/java/info/archinnov/achilles/internals/statement/StatementHelper.java
index 30604d041..8342e3b47 100644
--- a/achilles-common/src/main/java/info/archinnov/achilles/internals/statement/StatementHelper.java
+++ b/achilles-common/src/main/java/info/archinnov/achilles/internals/statement/StatementHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-common/src/main/java/info/archinnov/achilles/internals/statement/StatementType.java b/achilles-common/src/main/java/info/archinnov/achilles/internals/statement/StatementType.java
index f2d31ea7d..dc5c6bc4e 100644
--- a/achilles-common/src/main/java/info/archinnov/achilles/internals/statement/StatementType.java
+++ b/achilles-common/src/main/java/info/archinnov/achilles/internals/statement/StatementType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-common/src/main/java/info/archinnov/achilles/script/ScriptExecutor.java b/achilles-common/src/main/java/info/archinnov/achilles/script/ScriptExecutor.java
index 10ae767e6..5cff1e0f4 100644
--- a/achilles-common/src/main/java/info/archinnov/achilles/script/ScriptExecutor.java
+++ b/achilles-common/src/main/java/info/archinnov/achilles/script/ScriptExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-common/src/test/java/info/archinnov/achilles/script/ScriptExecutorTest.java b/achilles-common/src/test/java/info/archinnov/achilles/script/ScriptExecutorTest.java
index f112bf9f2..88272b10a 100644
--- a/achilles-common/src/test/java/info/archinnov/achilles/script/ScriptExecutorTest.java
+++ b/achilles-common/src/test/java/info/archinnov/achilles/script/ScriptExecutorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-common/src/test/resources/logback.xml b/achilles-common/src/test/resources/logback.xml
index 25733149e..ff9618652 100644
--- a/achilles-common/src/test/resources/logback.xml
+++ b/achilles-common/src/test/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/achilles-core/buildDependentModules.sh b/achilles-core/buildDependentModules.sh
index 9650d34ec..25eb5bc89 100755
--- a/achilles-core/buildDependentModules.sh
+++ b/achilles-core/buildDependentModules.sh
@@ -1,5 +1,21 @@
 #!/usr/bin/env bash
 
+#
+# Copyright (C) 2012-2021 DuyHai DOAN
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 cd ../achilles-model && \
 mvn clean install && \
 cd ../achilles-common && \
diff --git a/achilles-core/pom.xml b/achilles-core/pom.xml
index 4fe752034..3e0a23090 100644
--- a/achilles-core/pom.xml
+++ b/achilles-core/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/com/datastax/driver/core/TupleTypeBuilder.java b/achilles-core/src/main/java/com/datastax/driver/core/TupleTypeBuilder.java
index 33b8b62df..71f189b66 100644
--- a/achilles-core/src/main/java/com/datastax/driver/core/TupleTypeBuilder.java
+++ b/achilles-core/src/main/java/com/datastax/driver/core/TupleTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/com/datastax/driver/core/UserTypeBuilder.java b/achilles-core/src/main/java/com/datastax/driver/core/UserTypeBuilder.java
index c85056d53..7c3179721 100644
--- a/achilles-core/src/main/java/com/datastax/driver/core/UserTypeBuilder.java
+++ b/achilles-core/src/main/java/com/datastax/driver/core/UserTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/com/datastax/driver/core/querybuilder/MapEntryClause.java b/achilles-core/src/main/java/com/datastax/driver/core/querybuilder/MapEntryClause.java
index 0feda37e9..18d9af84f 100644
--- a/achilles-core/src/main/java/com/datastax/driver/core/querybuilder/MapEntryClause.java
+++ b/achilles-core/src/main/java/com/datastax/driver/core/querybuilder/MapEntryClause.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/com/datastax/driver/core/querybuilder/NonEscapingSetAssignment.java b/achilles-core/src/main/java/com/datastax/driver/core/querybuilder/NonEscapingSetAssignment.java
index 9ec0bc879..a3e61d615 100644
--- a/achilles-core/src/main/java/com/datastax/driver/core/querybuilder/NonEscapingSetAssignment.java
+++ b/achilles-core/src/main/java/com/datastax/driver/core/querybuilder/NonEscapingSetAssignment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/com/datastax/driver/core/querybuilder/NotEq.java b/achilles-core/src/main/java/com/datastax/driver/core/querybuilder/NotEq.java
index e2f566583..4ff683bac 100644
--- a/achilles-core/src/main/java/com/datastax/driver/core/querybuilder/NotEq.java
+++ b/achilles-core/src/main/java/com/datastax/driver/core/querybuilder/NotEq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/async/DefaultExecutorThreadFactory.java b/achilles-core/src/main/java/info/archinnov/achilles/async/DefaultExecutorThreadFactory.java
index 37be47604..4868fa6a4 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/async/DefaultExecutorThreadFactory.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/async/DefaultExecutorThreadFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/bootstrap/AbstractManagerFactoryBuilder.java b/achilles-core/src/main/java/info/archinnov/achilles/bootstrap/AbstractManagerFactoryBuilder.java
index daa354dbe..6ee40350b 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/bootstrap/AbstractManagerFactoryBuilder.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/bootstrap/AbstractManagerFactoryBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/configuration/ArgumentExtractor.java b/achilles-core/src/main/java/info/archinnov/achilles/configuration/ArgumentExtractor.java
index e0cebcb0d..ab9d982b3 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/configuration/ArgumentExtractor.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/configuration/ArgumentExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/configuration/ConfigurationParameters.java b/achilles-core/src/main/java/info/archinnov/achilles/configuration/ConfigurationParameters.java
index cd43e34b6..81be69066 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/configuration/ConfigurationParameters.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/configuration/ConfigurationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/generated/function/AbstractCQLCompatibleType.java b/achilles-core/src/main/java/info/archinnov/achilles/generated/function/AbstractCQLCompatibleType.java
index 8054f34db..8ce68c9d2 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/generated/function/AbstractCQLCompatibleType.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/generated/function/AbstractCQLCompatibleType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/apt/AptUtils.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/apt/AptUtils.java
index 6fb0eb4c3..ece4c2a97 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/apt/AptUtils.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/apt/AptUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/apt/annotations/AchillesMeta.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/apt/annotations/AchillesMeta.java
index 533b335de..009ad68f5 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/apt/annotations/AchillesMeta.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/apt/annotations/AchillesMeta.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/apt/processors/meta/AchillesProcessor.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/apt/processors/meta/AchillesProcessor.java
index 4321edb6d..a9484a29e 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/apt/processors/meta/AchillesProcessor.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/apt/processors/meta/AchillesProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cache/CacheKey.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cache/CacheKey.java
index 2473131dc..57573c859 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cache/CacheKey.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cache/CacheKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cache/StatementsCache.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cache/StatementsCache.java
index 1ab1da5f9..2c41e155e 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cache/StatementsCache.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cache/StatementsCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/CassandraFeature.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/CassandraFeature.java
index bc44c3df6..cbaa2fcbd 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/CassandraFeature.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/CassandraFeature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_4_8_X.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_4_8_X.java
index af9540961..3d011d744 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_4_8_X.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_4_8_X.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_0.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_0.java
index 564d19d7b..0e3335615 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_0.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_1.java
index ded71499d..53d892334 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_2.java
index d06aeb63b..1baeb7013 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_3.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_3.java
index dec5425d8..ae9b2bf70 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_3.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_4.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_4.java
index cf854c14e..e5c2ce3ca 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_4.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_4.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_5.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_5.java
index 7173cd212..f08d1ac18 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_5.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_5.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_6.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_6.java
index 7959cdc55..98b420efd 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_6.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_6.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_7.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_7.java
index 9f06e663b..0f5071437 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_7.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_7.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_8.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_8.java
index a6f564738..333300f92 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_8.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_8.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_9.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_9.java
index 1c4c11ec0..47bcd6866 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_9.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_0_9.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_0.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_0.java
index 85487723c..11db680d1 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_0.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_1.java
index cfa63cb25..547b513e2 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_10.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_10.java
index 9bc1c50fd..242fde894 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_10.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_10.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_2.java
index fc7af82e4..f6cebefa7 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_3.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_3.java
index d9db2be2d..42bfa4429 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_3.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_4.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_4.java
index be6510836..e8852e6df 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_4.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_4.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_5.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_5.java
index 2a1b49b76..90760cab8 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_5.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_5.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_6.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_6.java
index 53383d92b..7f4059b00 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_6.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_6.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_7.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_7.java
index 7d97fc523..da654b628 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_7.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_7.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_8.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_8.java
index 9ab4d859b..bc9cdfdde 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_8.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_8.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_9.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_9.java
index d325c2a32..f1c49d5ce 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_9.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/DSE_5_1_9.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/InternalCassandraVersion.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/InternalCassandraVersion.java
index b9510dd7e..f391df4a7 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/InternalCassandraVersion.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/InternalCassandraVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V2_1.java
index 4209fd331..c797b344f 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V2_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V2_2.java
index d00aa4d20..666756b45 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V2_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V2_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_0.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_0.java
index c39472081..da9519c88 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_0.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_1.java
index ed830b7fd..9e3adab3d 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_10.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_10.java
index e3b514923..85e483436 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_10.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_10.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_0.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_0.java
index 3c4eeaa04..3070e5f49 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_0.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_1.java
index 57fbb78ca..ef39017f4 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_2.java
index e3abe0da2..5f920d8eb 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_3.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_3.java
index 54d77d2aa..eaac4f4c9 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_3.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_4.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_4.java
index de76477f7..f51d299a9 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_4.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_4.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_2.java
index 19e45d17a..bb76cef27 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_3.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_3.java
index c5406fad8..19d866a3c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_3.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_4.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_4.java
index 125343765..34dda2fb9 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_4.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_4.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_5.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_5.java
index c0ca775fe..e8523152a 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_5.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_5.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_6.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_6.java
index 6282dda44..ec2c95c43 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_6.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_6.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_7.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_7.java
index 5df57398a..393e97bea 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_7.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_7.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_8.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_8.java
index a25f42527..0b74b64c8 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_8.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_8.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_9.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_9.java
index d475f40b9..45275116f 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_9.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_9.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/ByteArrayCodec.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/ByteArrayCodec.java
index 99523c3f6..cbbfc7c45 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/ByteArrayCodec.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/ByteArrayCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/ByteArrayPrimitiveCodec.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/ByteArrayPrimitiveCodec.java
index 12683cbb1..b4c1632f2 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/ByteArrayPrimitiveCodec.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/ByteArrayPrimitiveCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/EnumNameCodec.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/EnumNameCodec.java
index 865ff4aa9..01eeae570 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/EnumNameCodec.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/EnumNameCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/EnumOrdinalCodec.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/EnumOrdinalCodec.java
index 5fc498de9..299f8d17a 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/EnumOrdinalCodec.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/EnumOrdinalCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/FallThroughCodec.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/FallThroughCodec.java
index 0dc1e0666..86f9472de 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/FallThroughCodec.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/FallThroughCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/JSONCodec.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/JSONCodec.java
index 737ceb9e8..a69c2051b 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/JSONCodec.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codec/JSONCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/ManagerCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/ManagerCodeGen.java
index 1468c5eb0..1b96db055 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/ManagerCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/ManagerCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/ManagerFactoryBuilderCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/ManagerFactoryBuilderCodeGen.java
index dc218be1d..a74509e7b 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/ManagerFactoryBuilderCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/ManagerFactoryBuilderCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/ManagerFactoryCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/ManagerFactoryCodeGen.java
index 84a79d58d..57bf3f835 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/ManagerFactoryCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/ManagerFactoryCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/crud/CrudAPICodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/crud/CrudAPICodeGen.java
index f4504e1c0..516ff59df 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/crud/CrudAPICodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/crud/CrudAPICodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/crud/cassandra2_1/CrudAPICodeGen2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/crud/cassandra2_1/CrudAPICodeGen2_1.java
index 8454e5956..abd454e12 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/crud/cassandra2_1/CrudAPICodeGen2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/crud/cassandra2_1/CrudAPICodeGen2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/crud/cassandra2_2/CrudAPICodeGen2_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/crud/cassandra2_2/CrudAPICodeGen2_2.java
index b9cdede75..68aa3b5be 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/crud/cassandra2_2/CrudAPICodeGen2_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/crud/cassandra2_2/CrudAPICodeGen2_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/AbstractDSLCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/AbstractDSLCodeGen.java
index 47af17442..2fb9dec2c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/AbstractDSLCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/AbstractDSLCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/BaseSingleColumnRestriction.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/BaseSingleColumnRestriction.java
index 26059815b..4dce67f8e 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/BaseSingleColumnRestriction.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/BaseSingleColumnRestriction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/JSONFunctionCallSupport.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/JSONFunctionCallSupport.java
index cf18e5bdb..3f4ed6a0e 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/JSONFunctionCallSupport.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/JSONFunctionCallSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/LWTConditionsCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/LWTConditionsCodeGen.java
index 68d03da4e..e2bde8d83 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/LWTConditionsCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/LWTConditionsCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/MultiColumnsSliceRestrictionCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/MultiColumnsSliceRestrictionCodeGen.java
index 31d24e1c2..2e876ee7d 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/MultiColumnsSliceRestrictionCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/MultiColumnsSliceRestrictionCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/DeleteDSLCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/DeleteDSLCodeGen.java
index 9cdde95b8..3e4c4dbea 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/DeleteDSLCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/DeleteDSLCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/DeleteWhereDSLCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/DeleteWhereDSLCodeGen.java
index 873f28de0..79b7fda00 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/DeleteWhereDSLCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/DeleteWhereDSLCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra2_1/DeleteDSLCodeGen2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra2_1/DeleteDSLCodeGen2_1.java
index 8c7bc785b..763dc4996 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra2_1/DeleteDSLCodeGen2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra2_1/DeleteDSLCodeGen2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra2_1/DeleteWhereDSLCodeGen2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra2_1/DeleteWhereDSLCodeGen2_1.java
index 4310d0aa5..4f94e803d 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra2_1/DeleteWhereDSLCodeGen2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra2_1/DeleteWhereDSLCodeGen2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra2_2/DeleteWhereDSLCodeGen2_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra2_2/DeleteWhereDSLCodeGen2_2.java
index d501f6719..8aa903003 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra2_2/DeleteWhereDSLCodeGen2_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra2_2/DeleteWhereDSLCodeGen2_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra3_0/DeleteWhereDSLCodeGen3_0.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra3_0/DeleteWhereDSLCodeGen3_0.java
index 30e74262b..b915a0285 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra3_0/DeleteWhereDSLCodeGen3_0.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/delete/cassandra3_0/DeleteWhereDSLCodeGen3_0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/SelectDSLCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/SelectDSLCodeGen.java
index c474cc785..c9e41e75d 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/SelectDSLCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/SelectDSLCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/SelectWhereDSLCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/SelectWhereDSLCodeGen.java
index 4eca07afd..e071337e7 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/SelectWhereDSLCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/SelectWhereDSLCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_1/SelectDSLCodeGen2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_1/SelectDSLCodeGen2_1.java
index e28e51cf4..b47a65c13 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_1/SelectDSLCodeGen2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_1/SelectDSLCodeGen2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_1/SelectWhereDSLCodeGen2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_1/SelectWhereDSLCodeGen2_1.java
index 367647c8e..80cb94ba6 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_1/SelectWhereDSLCodeGen2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_1/SelectWhereDSLCodeGen2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_2/SelectDSLCodeGen2_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_2/SelectDSLCodeGen2_2.java
index 85912bedf..f379f3af5 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_2/SelectDSLCodeGen2_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_2/SelectDSLCodeGen2_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_2/SelectWhereDSLCodeGen2_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_2/SelectWhereDSLCodeGen2_2.java
index 3c03f7c4f..fb10c0528 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_2/SelectWhereDSLCodeGen2_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra2_2/SelectWhereDSLCodeGen2_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra3_10/SelectDSLCodeGen3_10.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra3_10/SelectDSLCodeGen3_10.java
index 641764297..dcebdf896 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra3_10/SelectDSLCodeGen3_10.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra3_10/SelectDSLCodeGen3_10.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra3_10/SelectWhereDSLCodeGen3_10.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra3_10/SelectWhereDSLCodeGen3_10.java
index b054b2bd0..fe86d1391 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra3_10/SelectWhereDSLCodeGen3_10.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra3_10/SelectWhereDSLCodeGen3_10.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra3_6/SelectWhereDSLCodeGen3_6.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra3_6/SelectWhereDSLCodeGen3_6.java
index 014019dca..7ac85ec4b 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra3_6/SelectWhereDSLCodeGen3_6.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/select/cassandra3_6/SelectWhereDSLCodeGen3_6.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/UpdateDSLCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/UpdateDSLCodeGen.java
index 67d182053..8a575f5a7 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/UpdateDSLCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/UpdateDSLCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/UpdateWhereDSLCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/UpdateWhereDSLCodeGen.java
index 22973ce17..7c0089e36 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/UpdateWhereDSLCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/UpdateWhereDSLCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_1/UpdateDSLCodeGen2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_1/UpdateDSLCodeGen2_1.java
index 483c47082..274192082 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_1/UpdateDSLCodeGen2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_1/UpdateDSLCodeGen2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_1/UpdateWhereDSLCodeGen2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_1/UpdateWhereDSLCodeGen2_1.java
index eb9376b0a..7528035ee 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_1/UpdateWhereDSLCodeGen2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_1/UpdateWhereDSLCodeGen2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_2/UpdateDSLCodeGen2_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_2/UpdateDSLCodeGen2_2.java
index f9d903113..c09b1ea73 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_2/UpdateDSLCodeGen2_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_2/UpdateDSLCodeGen2_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_2/UpdateWhereDSLCodeGen2_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_2/UpdateWhereDSLCodeGen2_2.java
index 1b829eb6d..caf2ad52a 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_2/UpdateWhereDSLCodeGen2_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra2_2/UpdateWhereDSLCodeGen2_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra3_0/UpdateWhereDSLCodeGen3_0.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra3_0/UpdateWhereDSLCodeGen3_0.java
index 7faf4f9be..f3ca2fcb9 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra3_0/UpdateWhereDSLCodeGen3_0.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra3_0/UpdateWhereDSLCodeGen3_0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra3_6/UpdateDSLCodeGen3_6.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra3_6/UpdateDSLCodeGen3_6.java
index 52bb996ad..2ee0da917 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra3_6/UpdateDSLCodeGen3_6.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/dsl/update/cassandra3_6/UpdateDSLCodeGen3_6.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/FunctionParameterTypesCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/FunctionParameterTypesCodeGen.java
index 674415c07..c5fe6fe2b 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/FunctionParameterTypesCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/FunctionParameterTypesCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/FunctionsRegistryCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/FunctionsRegistryCodeGen.java
index 6abff4e5a..989b26a30 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/FunctionsRegistryCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/FunctionsRegistryCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/InternalSystemFunctionRegistry.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/InternalSystemFunctionRegistry.java
index 4aa1d0b6b..a9bd4800f 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/InternalSystemFunctionRegistry.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/InternalSystemFunctionRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra2_1/FunctionParameterTypesCodeGen2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra2_1/FunctionParameterTypesCodeGen2_1.java
index 8abf93351..540a70905 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra2_1/FunctionParameterTypesCodeGen2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra2_1/FunctionParameterTypesCodeGen2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra2_1/FunctionsRegistryCodeGen2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra2_1/FunctionsRegistryCodeGen2_1.java
index ee62516c3..40382176d 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra2_1/FunctionsRegistryCodeGen2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra2_1/FunctionsRegistryCodeGen2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra2_2/FunctionsRegistryCodeGen2_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra2_2/FunctionsRegistryCodeGen2_2.java
index 962fc5528..595f7b6c7 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra2_2/FunctionsRegistryCodeGen2_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra2_2/FunctionsRegistryCodeGen2_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra3_2/FunctionsRegistryCodeGen3_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra3_2/FunctionsRegistryCodeGen3_2.java
index a96bac2e2..b653eb067 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra3_2/FunctionsRegistryCodeGen3_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra3_2/FunctionsRegistryCodeGen3_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra3_8/FunctionParameterTypesCodeGen3_8.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra3_8/FunctionParameterTypesCodeGen3_8.java
index 1392771de..a22c25ae9 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra3_8/FunctionParameterTypesCodeGen3_8.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/function/cassandra3_8/FunctionParameterTypesCodeGen3_8.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/DSESearchSupport.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/DSESearchSupport.java
index 690bb3b40..279b92294 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/DSESearchSupport.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/DSESearchSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/IndexSelectDSLCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/IndexSelectDSLCodeGen.java
index cb7ba142e..957da00a9 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/IndexSelectDSLCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/IndexSelectDSLCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/IndexSelectWhereDSLCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/IndexSelectWhereDSLCodeGen.java
index 6a64a8a55..81bc1091b 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/IndexSelectWhereDSLCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/IndexSelectWhereDSLCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/SASISupport.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/SASISupport.java
index d2b9aca85..89bbffb7c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/SASISupport.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/SASISupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_1/IndexSelectDSLCodeGen2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_1/IndexSelectDSLCodeGen2_1.java
index 0e3a7f84b..d6814ad70 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_1/IndexSelectDSLCodeGen2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_1/IndexSelectDSLCodeGen2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_1/IndexSelectWhereDSLCodeGen2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_1/IndexSelectWhereDSLCodeGen2_1.java
index 631401c79..7c6b8065f 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_1/IndexSelectWhereDSLCodeGen2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_1/IndexSelectWhereDSLCodeGen2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_2/IndexSelectDSLCodeGen2_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_2/IndexSelectDSLCodeGen2_2.java
index 38e39b8d5..d1b5f29ec 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_2/IndexSelectDSLCodeGen2_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_2/IndexSelectDSLCodeGen2_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_2/IndexSelectWhereDSLCodeGen2_2.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_2/IndexSelectWhereDSLCodeGen2_2.java
index 97aed8918..b6cc7724f 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_2/IndexSelectWhereDSLCodeGen2_2.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra2_2/IndexSelectWhereDSLCodeGen2_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra3_7/IndexSelectWhereDSLCodeGen3_7.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra3_7/IndexSelectWhereDSLCodeGen3_7.java
index 180a8fc8b..98cf12d5c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra3_7/IndexSelectWhereDSLCodeGen3_7.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/cassandra3_7/IndexSelectWhereDSLCodeGen3_7.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/dse_4_8/IndexSelectWhereDSLCodeGen_DSE_4_8.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/dse_4_8/IndexSelectWhereDSLCodeGen_DSE_4_8.java
index 4ffb4497d..0d93f04d5 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/dse_4_8/IndexSelectWhereDSLCodeGen_DSE_4_8.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/dse_4_8/IndexSelectWhereDSLCodeGen_DSE_4_8.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/dse_5_0_0/IndexSelectWhereDSLCodeGen_DSE_5_0_0.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/dse_5_0_0/IndexSelectWhereDSLCodeGen_DSE_5_0_0.java
index f92bc2d3c..dd9a6e18e 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/dse_5_0_0/IndexSelectWhereDSLCodeGen_DSE_5_0_0.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/index/dse_5_0_0/IndexSelectWhereDSLCodeGen_DSE_5_0_0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/CommonBeanMetaCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/CommonBeanMetaCodeGen.java
index 71d245318..87b195a20 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/CommonBeanMetaCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/CommonBeanMetaCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/EntityMetaCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/EntityMetaCodeGen.java
index d93a67880..37b7b25d0 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/EntityMetaCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/EntityMetaCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/EntityMetaColumnsForFunctionsCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/EntityMetaColumnsForFunctionsCodeGen.java
index bd1095f3c..56ffbef1f 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/EntityMetaColumnsForFunctionsCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/EntityMetaColumnsForFunctionsCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/UDTMetaCodeGen.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/UDTMetaCodeGen.java
index 28b3d4281..c1290f187 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/UDTMetaCodeGen.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/codegen/meta/UDTMetaCodeGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/context/ConfigurationContext.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/context/ConfigurationContext.java
index c509f3b6a..a53796b43 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/context/ConfigurationContext.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/context/ConfigurationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cql/TupleExtractor.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cql/TupleExtractor.java
index e6f848188..714864b9b 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cql/TupleExtractor.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cql/TupleExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cql/TypeMapper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cql/TypeMapper.java
index da5ecbf20..6cb65db4b 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cql/TypeMapper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cql/TypeMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/AsyncAware.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/AsyncAware.java
index 06e0c52a7..474da6901 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/AsyncAware.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/AsyncAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/LWTHelper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/LWTHelper.java
index 1419ab835..d5faf26f8 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/LWTHelper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/LWTHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/RawAndTypeMapDefaultImpl.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/RawAndTypeMapDefaultImpl.java
index 32d027deb..779ff2ee6 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/RawAndTypeMapDefaultImpl.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/RawAndTypeMapDefaultImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/SchemaNameAware.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/SchemaNameAware.java
index 126c20e5b..1ff31a300 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/SchemaNameAware.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/SchemaNameAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/StatementProvider.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/StatementProvider.java
index 6678875f3..0676fe83e 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/StatementProvider.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/StatementProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/StatementTypeAware.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/StatementTypeAware.java
index 38b61f828..6c5f5bdfe 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/StatementTypeAware.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/StatementTypeAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/TypedMapAware.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/TypedMapAware.java
index 75fabd1d1..4edc6a91c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/TypedMapAware.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/TypedMapAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/action/MutationAction.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/action/MutationAction.java
index 63b3a0da1..5ad47b4b2 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/action/MutationAction.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/action/MutationAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/action/SelectAction.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/action/SelectAction.java
index 660909650..2e2afbe64 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/action/SelectAction.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/action/SelectAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/action/SelectJSONAction.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/action/SelectJSONAction.java
index a3d93a339..e78a5058a 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/action/SelectJSONAction.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/action/SelectJSONAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/DeleteByPartitionWithOptions.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/DeleteByPartitionWithOptions.java
index 3256d066c..ca5fd0e92 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/DeleteByPartitionWithOptions.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/DeleteByPartitionWithOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/DeleteWithOptions.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/DeleteWithOptions.java
index 1c9b1df20..b85b5de24 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/DeleteWithOptions.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/DeleteWithOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/FindWithOptions.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/FindWithOptions.java
index 21980a4be..a57fcbad5 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/FindWithOptions.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/FindWithOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/InsertJSONWithOptions.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/InsertJSONWithOptions.java
index 215a2aba7..bb127a8e4 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/InsertJSONWithOptions.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/InsertJSONWithOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/InsertWithOptions.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/InsertWithOptions.java
index 4645d7ac1..bf360eb46 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/InsertWithOptions.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/InsertWithOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/UpdateWithOptions.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/UpdateWithOptions.java
index 7f38250a5..2d304297d 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/UpdateWithOptions.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/crud/UpdateWithOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForCRUDInsert.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForCRUDInsert.java
index ad0f726d8..f44effdb4 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForCRUDInsert.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForCRUDInsert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForCRUDUpdate.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForCRUDUpdate.java
index 733630010..c4a892927 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForCRUDUpdate.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForCRUDUpdate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForSelect.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForSelect.java
index c4c15432b..464e543d4 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForSelect.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForSelect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForUpdateOrDelete.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForUpdateOrDelete.java
index 94c65d289..12a85692a 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForUpdateOrDelete.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/options/AbstractOptionsForUpdateOrDelete.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDelete.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDelete.java
index baeaea29f..602498ebf 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDelete.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDelete.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteColumns.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteColumns.java
index 9c8390fc7..db4b2c81c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteColumns.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteColumns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteEnd.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteEnd.java
index 0c2e1ffe9..d7aff081c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteEnd.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteEnd.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteFrom.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteFrom.java
index 61170c7d5..aad8907fe 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteFrom.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteFrom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteWhere.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteWhere.java
index 6b0024aa3..6e7dc1d0f 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteWhere.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteWhere.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteWherePartition.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteWherePartition.java
index 5e34bf5d8..e142a8c17 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteWherePartition.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/delete/AbstractDeleteWherePartition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractIndexSelectWhere.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractIndexSelectWhere.java
index a20e62e12..b84215111 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractIndexSelectWhere.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractIndexSelectWhere.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractIndexSelectWhereJSON.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractIndexSelectWhereJSON.java
index eb8b9655f..432603a11 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractIndexSelectWhereJSON.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractIndexSelectWhereJSON.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractIndexSelectWhereTypeMap.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractIndexSelectWhereTypeMap.java
index 7fa9da1a9..d6d0197ca 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractIndexSelectWhereTypeMap.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractIndexSelectWhereTypeMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelect.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelect.java
index 6bf604471..ba51490b2 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelect.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectColumns.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectColumns.java
index 0ddefcead..7acb2ba34 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectColumns.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectColumns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectColumnsTypeMap.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectColumnsTypeMap.java
index 466e8d546..6b27b609a 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectColumnsTypeMap.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectColumnsTypeMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectFrom.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectFrom.java
index 403f61c1d..611623c78 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectFrom.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectFrom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectFromJSON.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectFromJSON.java
index 2bdecba71..f17604bd2 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectFromJSON.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectFromJSON.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectFromTypeMap.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectFromTypeMap.java
index 5adbb88e4..067a96ff2 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectFromTypeMap.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectFromTypeMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWhere.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWhere.java
index 69bdcbb5d..b0968131f 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWhere.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWhere.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWhereJSON.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWhereJSON.java
index 437dc410f..cf6c7a588 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWhereJSON.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWhereJSON.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWherePartition.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWherePartition.java
index 4ac1d1092..fd76372ad 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWherePartition.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWherePartition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWherePartitionJSON.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWherePartitionJSON.java
index ae3badabe..f1f89f5f6 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWherePartitionJSON.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWherePartitionJSON.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWherePartitionTypeMap.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWherePartitionTypeMap.java
index ed937439d..e01d83d82 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWherePartitionTypeMap.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWherePartitionTypeMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWhereTypeMap.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWhereTypeMap.java
index 756169168..d3abb13cd 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWhereTypeMap.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/select/AbstractSelectWhereTypeMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdate.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdate.java
index aee3ab447..d1e4995ea 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdate.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateColumns.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateColumns.java
index 750395938..942913fb9 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateColumns.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateColumns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateEnd.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateEnd.java
index 6f1d6eae1..79f19e178 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateEnd.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateEnd.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateFrom.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateFrom.java
index 5f316a08c..bac003f9c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateFrom.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateFrom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateWhere.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateWhere.java
index bcf19884a..f4452e0dd 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateWhere.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/query/update/AbstractUpdateWhere.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/raw/NativeQuery.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/raw/NativeQuery.java
index b98d95cfd..5bb292afa 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/raw/NativeQuery.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/raw/NativeQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/raw/TypedQuery.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/raw/TypedQuery.java
index 5f25e1bae..4470cf78d 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/raw/TypedQuery.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/raw/TypedQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/raw/TypedQueryValidator.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/raw/TypedQueryValidator.java
index 25d7dc51e..85d1bc5bc 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/raw/TypedQueryValidator.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/dsl/raw/TypedQueryValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/factory/DefaultBeanFactory.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/factory/DefaultBeanFactory.java
index 1f90f60af..e28d0eef1 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/factory/DefaultBeanFactory.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/factory/DefaultBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/factory/TupleTypeFactory.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/factory/TupleTypeFactory.java
index 3d6fe3d82..085759af6 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/factory/TupleTypeFactory.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/factory/TupleTypeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/factory/UserTypeFactory.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/factory/UserTypeFactory.java
index a662e9750..08235d179 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/factory/UserTypeFactory.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/factory/UserTypeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectBeanFactory.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectBeanFactory.java
index 9b2980d41..5e303753d 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectBeanFactory.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectConsistency.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectConsistency.java
index 9021a3c26..a802a9734 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectConsistency.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectConsistency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectInsertStrategy.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectInsertStrategy.java
index 8599e88b9..79baa0720 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectInsertStrategy.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectInsertStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectJacksonMapper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectJacksonMapper.java
index e93d87b09..28c779ae3 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectJacksonMapper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectJacksonMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectKeyspace.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectKeyspace.java
index 2adf155a1..37dee759a 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectKeyspace.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectKeyspace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectRuntimeCodecs.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectRuntimeCodecs.java
index 0b0707962..ee2c2e601 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectRuntimeCodecs.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectRuntimeCodecs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectSchemaStrategy.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectSchemaStrategy.java
index b412490a7..fce0873d4 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectSchemaStrategy.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectSchemaStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectUserAndTupleTypeFactory.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectUserAndTupleTypeFactory.java
index d2ac61710..4d529c9f4 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectUserAndTupleTypeFactory.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/injectable/InjectUserAndTupleTypeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/interceptor/AchillesInternalInterceptor.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/interceptor/AchillesInternalInterceptor.java
index 95c9db479..0c89b457c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/interceptor/AchillesInternalInterceptor.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/interceptor/AchillesInternalInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/interceptor/DefaultPostLoadBeanValidationInterceptor.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/interceptor/DefaultPostLoadBeanValidationInterceptor.java
index 1f5a165b9..e8dff19d8 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/interceptor/DefaultPostLoadBeanValidationInterceptor.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/interceptor/DefaultPostLoadBeanValidationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/interceptor/DefaultPreMutateBeanValidationInterceptor.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/interceptor/DefaultPreMutateBeanValidationInterceptor.java
index 1ad10ca89..4f3966279 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/interceptor/DefaultPreMutateBeanValidationInterceptor.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/interceptor/DefaultPreMutateBeanValidationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractEntityProperty.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractEntityProperty.java
index 82f7a0b66..37e2560bd 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractEntityProperty.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractEntityProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractProperty.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractProperty.java
index 7aec0cda6..09c35c7d6 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractProperty.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractTupleProperty.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractTupleProperty.java
index 06426fe84..b8619b336 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractTupleProperty.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractTupleProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractUDTClassProperty.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractUDTClassProperty.java
index 5908cf615..c3a092123 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractUDTClassProperty.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractUDTClassProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractViewProperty.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractViewProperty.java
index b8af48865..67a2b10aa 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractViewProperty.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/AbstractViewProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/ComputedProperty.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/ComputedProperty.java
index edfdc0120..371d8e7cf 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/ComputedProperty.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/ComputedProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/JdkOptionalProperty.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/JdkOptionalProperty.java
index 93c908aa4..634e70379 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/JdkOptionalProperty.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/JdkOptionalProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/ListProperty.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/ListProperty.java
index 8901be7ed..bda6217ba 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/ListProperty.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/ListProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/MapProperty.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/MapProperty.java
index dc341b7af..535d4f16c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/MapProperty.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/MapProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/SetProperty.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/SetProperty.java
index 5a51a7d51..e02f78469 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/SetProperty.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/SetProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/SimpleProperty.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/SimpleProperty.java
index 3e81e966b..faaa278b2 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/SimpleProperty.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/SimpleProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple10Property.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple10Property.java
index 2e184b545..b77842355 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple10Property.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple10Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple1Property.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple1Property.java
index 1149c9444..23d69651b 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple1Property.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple1Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple2Property.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple2Property.java
index 32f3a50a0..994c25f3a 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple2Property.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple2Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple3Property.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple3Property.java
index 1db84d12c..d7d8e8c35 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple3Property.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple3Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple4Property.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple4Property.java
index 51917a30b..8980dc5a7 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple4Property.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple4Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple5Property.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple5Property.java
index 590883574..012731ecc 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple5Property.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple5Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple6Property.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple6Property.java
index 12dacf962..f2a986dc9 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple6Property.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple6Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple7Property.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple7Property.java
index 3eb14ffc1..f4a9a9024 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple7Property.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple7Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple8Property.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple8Property.java
index 04a28db55..03219f182 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple8Property.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple8Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple9Property.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple9Property.java
index 782338cb7..1f54c5baf 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple9Property.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/Tuple9Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/UDTProperty.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/UDTProperty.java
index e7e65fd72..c27d9319e 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/UDTProperty.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/UDTProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ClusteringColumnInfo.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ClusteringColumnInfo.java
index 2b5e6316c..8886aeb6c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ClusteringColumnInfo.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ClusteringColumnInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ColumnInfo.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ColumnInfo.java
index ef75089b3..150e3006c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ColumnInfo.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ColumnInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ColumnType.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ColumnType.java
index 9ef8c9cf0..5170d3e33 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ColumnType.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ColumnType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ComputedColumnInfo.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ComputedColumnInfo.java
index 7f1daca17..d4b0c63b4 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ComputedColumnInfo.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/ComputedColumnInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/FieldInfo.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/FieldInfo.java
index 6133d79e6..b87fd5e5c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/FieldInfo.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/FieldInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/KeyColumnInfo.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/KeyColumnInfo.java
index bf95a8011..9b4cf05f4 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/KeyColumnInfo.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/KeyColumnInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/PartitionKeyInfo.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/PartitionKeyInfo.java
index 053b24d35..d6c45a95e 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/PartitionKeyInfo.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/columns/PartitionKeyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/functions/FunctionCall.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/functions/FunctionCall.java
index 0b4fd5e44..19409e398 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/functions/FunctionCall.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/functions/FunctionCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/functions/FunctionProperty.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/functions/FunctionProperty.java
index 44729e7e9..0264094ec 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/functions/FunctionProperty.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/functions/FunctionProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/index/IndexImpl.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/index/IndexImpl.java
index d2218389f..89cba479e 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/index/IndexImpl.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/index/IndexImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/index/IndexInfo.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/index/IndexInfo.java
index 184fa0be3..6ee83769a 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/index/IndexInfo.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/index/IndexInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/index/IndexType.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/index/IndexType.java
index 85ee6254d..c57338f2c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/index/IndexType.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/metamodel/index/IndexType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/options/CassandraOptions.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/options/CassandraOptions.java
index 0b7d2f96f..25b89873f 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/options/CassandraOptions.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/options/CassandraOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/AbstractBeanParser.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/AbstractBeanParser.java
index 75c7140c8..71daa9ff0 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/AbstractBeanParser.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/AbstractBeanParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/AnnotationTree.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/AnnotationTree.java
index 996b58a3a..518a65b66 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/AnnotationTree.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/AnnotationTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/CodecFactory.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/CodecFactory.java
index 74f17ba34..bf044c995 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/CodecFactory.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/CodecFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/CodecRegistryParser.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/CodecRegistryParser.java
index 37461b764..d28d7350d 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/CodecRegistryParser.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/CodecRegistryParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/EntityParser.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/EntityParser.java
index bdb73bf03..3a5b05a9d 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/EntityParser.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/EntityParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FieldInfoParser.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FieldInfoParser.java
index 303b290dc..9ccc34827 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FieldInfoParser.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FieldInfoParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FieldParser.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FieldParser.java
index 7f62f9a91..35745d878 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FieldParser.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FieldParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FunctionParamParser.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FunctionParamParser.java
index ea4b72dbf..557de8145 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FunctionParamParser.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FunctionParamParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FunctionParser.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FunctionParser.java
index 8026a1dfd..2d0f62ce4 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FunctionParser.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/FunctionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/TypeUtils.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/TypeUtils.java
index f92f322a1..637a1fe28 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/TypeUtils.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/TypeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/UDTParser.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/UDTParser.java
index 278dbe6ad..173d00bdc 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/UDTParser.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/UDTParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/accessors/Getter.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/accessors/Getter.java
index 0664bc835..b9ddebea9 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/accessors/Getter.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/accessors/Getter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/accessors/Setter.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/accessors/Setter.java
index 14a324f81..5ce87f9ec 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/accessors/Setter.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/accessors/Setter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/AccessorsExclusionContext.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/AccessorsExclusionContext.java
index c41356a3a..bfdc19013 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/AccessorsExclusionContext.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/AccessorsExclusionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/CodecContext.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/CodecContext.java
index 91058950f..50a10204b 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/CodecContext.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/CodecContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/ConstructorInfo.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/ConstructorInfo.java
index f3a30915b..b4c67c375 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/ConstructorInfo.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/ConstructorInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/DSESearchInfoContext.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/DSESearchInfoContext.java
index 40bac6b23..33589a3af 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/DSESearchInfoContext.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/DSESearchInfoContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/EntityParsingContext.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/EntityParsingContext.java
index ffef4ed6d..9fec46570 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/EntityParsingContext.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/EntityParsingContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FieldInfoContext.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FieldInfoContext.java
index 802821a4f..73488afc9 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FieldInfoContext.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FieldInfoContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FieldParsingContext.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FieldParsingContext.java
index aafaee7a8..50e0906bf 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FieldParsingContext.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FieldParsingContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FunctionSignature.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FunctionSignature.java
index 6e8ff923f..f7c63d2da 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FunctionSignature.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FunctionSignature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FunctionsContext.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FunctionsContext.java
index 3dcfcceaf..ebea49565 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FunctionsContext.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/FunctionsContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/GlobalParsingContext.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/GlobalParsingContext.java
index 11e870689..d79330c98 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/GlobalParsingContext.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/GlobalParsingContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/IndexInfoContext.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/IndexInfoContext.java
index 0e12acff2..378ef18a1 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/IndexInfoContext.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/IndexInfoContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/IndexInfoHelper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/IndexInfoHelper.java
index 3f6ebcc8b..5150dda9e 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/IndexInfoHelper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/IndexInfoHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/RuntimeCodecContext.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/RuntimeCodecContext.java
index 687d145e4..07e2f6846 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/RuntimeCodecContext.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/RuntimeCodecContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/SASIInfoContext.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/SASIInfoContext.java
index 50ff3f8c6..32cb92b0e 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/SASIInfoContext.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/SASIInfoContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/BeanValidator.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/BeanValidator.java
index fa0c3f06b..5981be9cd 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/BeanValidator.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/BeanValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/FieldValidator.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/FieldValidator.java
index 4dab3d74c..bb635766b 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/FieldValidator.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/FieldValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/NestedTypesValidator.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/NestedTypesValidator.java
index 0f7874332..4886df35a 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/NestedTypesValidator.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/NestedTypesValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/TypeValidator.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/TypeValidator.java
index 5e6f33897..480c6c2c1 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/TypeValidator.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/TypeValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/BeanValidator2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/BeanValidator2_1.java
index 0def0e31f..6c0b9f09c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/BeanValidator2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/BeanValidator2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/FieldValidator2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/FieldValidator2_1.java
index 3b4ea2350..141cce976 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/FieldValidator2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/FieldValidator2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/NestedTypeValidator2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/NestedTypeValidator2_1.java
index 5506c3f0b..70f62fd7b 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/NestedTypeValidator2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/NestedTypeValidator2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/TypeValidator2_1.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/TypeValidator2_1.java
index 85daeff29..b5920e937 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/TypeValidator2_1.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra2_1/TypeValidator2_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_0/BeanValidator3_0.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_0/BeanValidator3_0.java
index 121c691b8..798fb18d2 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_0/BeanValidator3_0.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_0/BeanValidator3_0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_10/FieldValidator3_10.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_10/FieldValidator3_10.java
index dfa091505..715cfb96a 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_10/FieldValidator3_10.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_10/FieldValidator3_10.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_10/TypeValidator3_10.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_10/TypeValidator3_10.java
index f32700c12..e3378185e 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_10/TypeValidator3_10.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_10/TypeValidator3_10.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_6/NestedTypeValidator3_6.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_6/NestedTypeValidator3_6.java
index c2777804e..b6fdd62ea 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_6/NestedTypeValidator3_6.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_6/NestedTypeValidator3_6.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_7/FieldValidator3_7.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_7/FieldValidator3_7.java
index 3284f5b32..651ec1d13 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_7/FieldValidator3_7.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/cassandra3_7/FieldValidator3_7.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/dse_4_8/FieldValidator_DSE_4_8.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/dse_4_8/FieldValidator_DSE_4_8.java
index c90d1d5d1..71e31e3c7 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/dse_4_8/FieldValidator_DSE_4_8.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/validator/dse_4_8/FieldValidator_DSE_4_8.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/AbstractManager.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/AbstractManager.java
index 106692960..3487d1997 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/AbstractManager.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/AbstractManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/AbstractManagerFactory.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/AbstractManagerFactory.java
index 55089b1a0..8968e7588 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/AbstractManagerFactory.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/AbstractManagerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/BeanInternalValidator.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/BeanInternalValidator.java
index 38c4bc8fc..5b6ceab1c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/BeanInternalValidator.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/BeanInternalValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/BeanValueExtractor.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/BeanValueExtractor.java
index cac0469f9..b8489e33f 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/BeanValueExtractor.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/BeanValueExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/RuntimeEngine.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/RuntimeEngine.java
index 07f2655e5..f7f3b0e39 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/RuntimeEngine.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/runtime/RuntimeEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/schema/SchemaContext.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/schema/SchemaContext.java
index af97a9b89..fa80ab736 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/schema/SchemaContext.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/schema/SchemaContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/schema/SchemaCreator.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/schema/SchemaCreator.java
index 53e0c7974..1e53344b1 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/schema/SchemaCreator.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/schema/SchemaCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/schema/SchemaValidator.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/schema/SchemaValidator.java
index a354be35a..82e3d220f 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/schema/SchemaValidator.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/schema/SchemaValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/BoundStatementWrapper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/BoundStatementWrapper.java
index f29abccb2..9c7e75cb9 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/BoundStatementWrapper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/BoundStatementWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/BoundValueInfo.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/BoundValueInfo.java
index f33641420..5b08c79bf 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/BoundValueInfo.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/BoundValueInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/BoundValuesWrapper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/BoundValuesWrapper.java
index 64394a116..56cd747d5 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/BoundValuesWrapper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/BoundValuesWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/NativeStatementWrapper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/NativeStatementWrapper.java
index f2988833e..58893676e 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/NativeStatementWrapper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/NativeStatementWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/OperationType.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/OperationType.java
index cb744f61f..4e1b4841c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/OperationType.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/OperationType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/PreparedStatementGenerator.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/PreparedStatementGenerator.java
index 827826849..3acc059b3 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/PreparedStatementGenerator.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/PreparedStatementGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/StatementType.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/StatementType.java
index 65b2af6f9..44bbb83a1 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/StatementType.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/StatementType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/StatementWrapper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/StatementWrapper.java
index 9173b977e..0298f66fe 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/StatementWrapper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/statements/StatementWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/field_filtering/FieldFilter.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/field_filtering/FieldFilter.java
index 72a1505a5..d5545e7be 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/field_filtering/FieldFilter.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/field_filtering/FieldFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/CaseSensitiveNaming.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/CaseSensitiveNaming.java
index 6f426b93d..dd44b3843 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/CaseSensitiveNaming.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/CaseSensitiveNaming.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/InternalNamingStrategy.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/InternalNamingStrategy.java
index 3075afbb8..a530c8570 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/InternalNamingStrategy.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/InternalNamingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/LowerCaseNaming.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/LowerCaseNaming.java
index 949cc28f5..bd10ca32e 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/LowerCaseNaming.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/LowerCaseNaming.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/SnakeCaseNaming.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/SnakeCaseNaming.java
index 373c1116f..bc0304e29 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/SnakeCaseNaming.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/strategy/naming/SnakeCaseNaming.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/ConfigMap.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/ConfigMap.java
index a62d1d6c8..9679c6eb5 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/ConfigMap.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/ConfigMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/EntityIteratorWrapper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/EntityIteratorWrapper.java
index 80dd7f933..84f8468d4 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/EntityIteratorWrapper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/EntityIteratorWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/JSONIteratorWrapper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/JSONIteratorWrapper.java
index 99d176020..058136cce 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/JSONIteratorWrapper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/JSONIteratorWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/LimitedResultSetWrapper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/LimitedResultSetWrapper.java
index c6f3ba304..2014928e2 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/LimitedResultSetWrapper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/LimitedResultSetWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/OverridingOptional.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/OverridingOptional.java
index aabfcb27a..f72fdac4c 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/OverridingOptional.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/OverridingOptional.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/ResultLoggingIteratorWrapper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/ResultLoggingIteratorWrapper.java
index 7f27fefa6..754069c18 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/ResultLoggingIteratorWrapper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/ResultLoggingIteratorWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/ResultSetWrapper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/ResultSetWrapper.java
index 03476788a..76b83f83d 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/ResultSetWrapper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/ResultSetWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/RuntimeCodecWrapper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/RuntimeCodecWrapper.java
index 1709b0646..9039a5a48 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/RuntimeCodecWrapper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/RuntimeCodecWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/TypedMapIteratorWrapper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/TypedMapIteratorWrapper.java
index 9c1f03c5b..f57e77cf6 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/types/TypedMapIteratorWrapper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/types/TypedMapIteratorWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/CodecRegistryHelper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/CodecRegistryHelper.java
index 58f66382d..73a343416 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/CodecRegistryHelper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/CodecRegistryHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/CollectionsHelper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/CollectionsHelper.java
index 4b879b428..655359083 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/CollectionsHelper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/CollectionsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/LoggerHelper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/LoggerHelper.java
index b7c81d588..8af5026f0 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/LoggerHelper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/LoggerHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/NamingHelper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/NamingHelper.java
index 1a195d8eb..fa8e63038 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/NamingHelper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/NamingHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/TypeNameHelper.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/TypeNameHelper.java
index aadb3d164..e97ad24df 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/TypeNameHelper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/utils/TypeNameHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/json/DefaultJacksonMapper.java b/achilles-core/src/main/java/info/archinnov/achilles/json/DefaultJacksonMapper.java
index 04113ab14..18d2ad222 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/json/DefaultJacksonMapper.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/json/DefaultJacksonMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/json/DefaultJacksonMapperFactory.java b/achilles-core/src/main/java/info/archinnov/achilles/json/DefaultJacksonMapperFactory.java
index c5e273dd0..93bac9a0d 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/json/DefaultJacksonMapperFactory.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/json/DefaultJacksonMapperFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/json/JacksonMapperFactory.java b/achilles-core/src/main/java/info/archinnov/achilles/json/JacksonMapperFactory.java
index 370a49099..ffe728377 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/json/JacksonMapperFactory.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/json/JacksonMapperFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/main/java/org/eclipse/jdt/internal/compiler/apt/model/DeclaredTypeImplContainer.java b/achilles-core/src/main/java/org/eclipse/jdt/internal/compiler/apt/model/DeclaredTypeImplContainer.java
index 21d81f119..d68f70fd9 100644
--- a/achilles-core/src/main/java/org/eclipse/jdt/internal/compiler/apt/model/DeclaredTypeImplContainer.java
+++ b/achilles-core/src/main/java/org/eclipse/jdt/internal/compiler/apt/model/DeclaredTypeImplContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/apt_utils/AbstractTestProcessor.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/apt_utils/AbstractTestProcessor.java
index ad12a9e0c..135a41b64 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/apt_utils/AbstractTestProcessor.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/apt_utils/AbstractTestProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/apt_utils/AptAssertOK.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/apt_utils/AptAssertOK.java
index 58400c51c..6e0e73920 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/apt_utils/AptAssertOK.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/apt_utils/AptAssertOK.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/ManagerCodeGenTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/ManagerCodeGenTest.java
index bffa0e4fe..d9ffa8ea2 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/ManagerCodeGenTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/ManagerCodeGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/TypeParsingResultConsumer.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/TypeParsingResultConsumer.java
index 07dc3f780..6182f290e 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/TypeParsingResultConsumer.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/TypeParsingResultConsumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/dsl/select/SelectDSLCodeGenTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/dsl/select/SelectDSLCodeGenTest.java
index 02feecbf5..dd41a4207 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/dsl/select/SelectDSLCodeGenTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/dsl/select/SelectDSLCodeGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/index/IndexSelectDSLCodeGenTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/index/IndexSelectDSLCodeGenTest.java
index fbc00a77e..f4898ceca 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/index/IndexSelectDSLCodeGenTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/index/IndexSelectDSLCodeGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/meta/EntityMetaCodeGenTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/meta/EntityMetaCodeGenTest.java
index dfc1d6923..dba0fc604 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/meta/EntityMetaCodeGenTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/meta/EntityMetaCodeGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/meta/UDTMetaCodeGenTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/meta/UDTMetaCodeGenTest.java
index c6f3633e2..acad38ff4 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/meta/UDTMetaCodeGenTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/codegen/meta/UDTMetaCodeGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/AnnotationTreeTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/AnnotationTreeTest.java
index d3594509b..2f5d066b5 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/AnnotationTreeTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/AnnotationTreeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/CodeCompilationTester.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/CodeCompilationTester.java
index 344b8322a..1916a66fe 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/CodeCompilationTester.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/CodeCompilationTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/CodecFactoryTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/CodecFactoryTest.java
index 3ff5f59dc..535630565 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/CodecFactoryTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/CodecFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/EntityParserTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/EntityParserTest.java
index 40945bad7..ec8786459 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/EntityParserTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/EntityParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/FieldInfoParserTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/FieldInfoParserTest.java
index 59d2a4c89..73a4c9e1c 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/FieldInfoParserTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/FieldInfoParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/FieldParserTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/FieldParserTest.java
index 77e7993e9..1bb41d272 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/FieldParserTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/FieldParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/FunctionParserTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/FunctionParserTest.java
index 20640cca6..e4ff0df30 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/FunctionParserTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/FunctionParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/validator/BeanValidatorTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/validator/BeanValidatorTest.java
index 88b931642..168cea0f3 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/validator/BeanValidatorTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/validator/BeanValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/validator/TypeValidatorTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/validator/TypeValidatorTest.java
index 1b3f5869c..e029872ea 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/validator/TypeValidatorTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/validator/TypeValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/validator/cassandra3_0/BeanValidator3_0Test.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/validator/cassandra3_0/BeanValidator3_0Test.java
index e2676b2c9..176390936 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/validator/cassandra3_0/BeanValidator3_0Test.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/parser/validator/cassandra3_0/BeanValidator3_0Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/APUnitTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/APUnitTest.java
index 844dc3733..0b4932bea 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/APUnitTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/APUnitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/TestEntityDecoy.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/TestEntityDecoy.java
index ba08435bc..56bdd2c49 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/TestEntityDecoy.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/TestEntityDecoy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/IntToStringCodec.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/IntToStringCodec.java
index fb474a24e..cd0607927 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/IntToStringCodec.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/IntToStringCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/SimpleLongWrapperCodec.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/SimpleLongWrapperCodec.java
index 09229b82e..3672a8f80 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/SimpleLongWrapperCodec.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/SimpleLongWrapperCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/SimpleLongWrapperCodec2.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/SimpleLongWrapperCodec2.java
index 865716a58..67851c3d3 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/SimpleLongWrapperCodec2.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/SimpleLongWrapperCodec2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/StringToLongCodec.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/StringToLongCodec.java
index de4901d4c..b98624cd0 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/StringToLongCodec.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/codecs/StringToLongCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestCodecRegistry.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestCodecRegistry.java
index 22d37d959..d487e3732 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestCodecRegistry.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestCodecRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestCodecRegistry2.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestCodecRegistry2.java
index 110ea370a..6750b8da8 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestCodecRegistry2.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestCodecRegistry2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestCodecRegistryWrong.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestCodecRegistryWrong.java
index 0f5f75ba4..84060a212 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestCodecRegistryWrong.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestCodecRegistryWrong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestFunctionRegistry.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestFunctionRegistry.java
index 742b1df18..dd37a626a 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestFunctionRegistry.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/config/TestFunctionRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/dsl/index/TestEntityWithIndexAndUDT.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/dsl/index/TestEntityWithIndexAndUDT.java
index 11162de38..dd896d0fa 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/dsl/index/TestEntityWithIndexAndUDT.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/dsl/index/TestEntityWithIndexAndUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/dsl/select/TestEntityWithUDTAsClustering.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/dsl/select/TestEntityWithUDTAsClustering.java
index 25069aaf6..be7b566ca 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/dsl/select/TestEntityWithUDTAsClustering.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/dsl/select/TestEntityWithUDTAsClustering.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/dsl/select/TestUDTWithNoKeyspace.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/dsl/select/TestUDTWithNoKeyspace.java
index 723b29b01..cabde9a12 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/dsl/select/TestUDTWithNoKeyspace.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/dsl/select/TestUDTWithNoKeyspace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistry.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistry.java
index 38e430f03..ad0659927 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistry.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithBlankKeyspace.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithBlankKeyspace.java
index f6ce92afc..04df00b4e 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithBlankKeyspace.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithBlankKeyspace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithComplexReturnTypes.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithComplexReturnTypes.java
index c23257431..3ef702281 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithComplexReturnTypes.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithComplexReturnTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithComplexTypes.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithComplexTypes.java
index 51fb2ce53..6cf3484c8 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithComplexTypes.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithComplexTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithDuplicateFunction.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithDuplicateFunction.java
index 7ac86c759..967af19a9 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithDuplicateFunction.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithDuplicateFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithForbiddenFunctionName.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithForbiddenFunctionName.java
index 64247ef8c..0088cfe86 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithForbiddenFunctionName.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithForbiddenFunctionName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithForbiddenKeyspaceName.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithForbiddenKeyspaceName.java
index 0592df6e4..46535dc49 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithForbiddenKeyspaceName.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithForbiddenKeyspaceName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithKeyspaceName.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithKeyspaceName.java
index f28ab5e8e..7ba9f5108 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithKeyspaceName.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithKeyspaceName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithNotFrozenNestedCollection.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithNotFrozenNestedCollection.java
index d5fad3367..7157a4320 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithNotFrozenNestedCollection.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithNotFrozenNestedCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithOpsCenterKeyspaceName.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithOpsCenterKeyspaceName.java
index 5a7f2b52b..ceb2b58ed 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithOpsCenterKeyspaceName.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithOpsCenterKeyspaceName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithPrimitiveReturnType.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithPrimitiveReturnType.java
index f76bf6ada..b749b9afe 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithPrimitiveReturnType.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithPrimitiveReturnType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithUnsupportedParamType.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithUnsupportedParamType.java
index c0f1fcb50..1e881c014 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithUnsupportedParamType.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithUnsupportedParamType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithUnsupportedReturnType.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithUnsupportedReturnType.java
index 743231e8e..ac0cd9f1a 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithUnsupportedReturnType.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithUnsupportedReturnType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithVoidReturn.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithVoidReturn.java
index 59cef58ef..c1b7abdd9 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithVoidReturn.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/functions/TestFunctionRegistryWithVoidReturn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/manager/TestEntityWithSASI.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/manager/TestEntityWithSASI.java
index 190d19688..ace9176c2 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/manager/TestEntityWithSASI.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/manager/TestEntityWithSASI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityAsChild.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityAsChild.java
index a34a144b7..bf93f96fa 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityAsChild.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityAsChild.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityAsChildShadowingVariable.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityAsChildShadowingVariable.java
index 7e80af132..51d2c578f 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityAsChildShadowingVariable.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityAsChildShadowingVariable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityAsParent.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityAsParent.java
index 855cb9f06..1db76dea4 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityAsParent.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityAsParent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntitySensor.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntitySensor.java
index deeb96f75..4916470d4 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntitySensor.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntitySensor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntitySensorWithCollection.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntitySensorWithCollection.java
index ff1dfaeda..cea89921d 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntitySensorWithCollection.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntitySensorWithCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithAbstractClass.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithAbstractClass.java
index abb375a82..b67c765cc 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithAbstractClass.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithAbstractClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithClusteringColumns.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithClusteringColumns.java
index 7c538dc51..43ce97f4e 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithClusteringColumns.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithClusteringColumns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComplexCounters.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComplexCounters.java
index e38240cb5..89b823281 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComplexCounters.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComplexCounters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComplexIndices.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComplexIndices.java
index a0c1341f8..8687d27ed 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComplexIndices.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComplexIndices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComplexTypes.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComplexTypes.java
index 9751156e9..dd425a332 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComplexTypes.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComplexTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCompositePartitionKey.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCompositePartitionKey.java
index ee139810e..59fa1e254 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCompositePartitionKey.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCompositePartitionKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComputedColumn.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComputedColumn.java
index ca684cee3..26556178d 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComputedColumn.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithComputedColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCounterColumn.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCounterColumn.java
index 8238cbf71..3d15c16c9 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCounterColumn.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCounterColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCustomConstructor.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCustomConstructor.java
index 9b0ae76a8..9bf870fdd 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCustomConstructor.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCustomConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCustomConstructorAndDeclaredFields.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCustomConstructorAndDeclaredFields.java
index abc1a0968..7fc869eaa 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCustomConstructorAndDeclaredFields.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithCustomConstructorAndDeclaredFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithDuplicateCQLColumn.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithDuplicateCQLColumn.java
index 7b6d0b667..696bfe961 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithDuplicateCQLColumn.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithDuplicateCQLColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithImplicitFieldParsing.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithImplicitFieldParsing.java
index f0cc0b3b6..3f35f862d 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithImplicitFieldParsing.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithImplicitFieldParsing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoMatchingFieldForDeclaredParamInConstructor.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoMatchingFieldForDeclaredParamInConstructor.java
index a04d9f200..36a863836 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoMatchingFieldForDeclaredParamInConstructor.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoMatchingFieldForDeclaredParamInConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoMatchingFieldForParamInConstructor.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoMatchingFieldForParamInConstructor.java
index ae8314540..c39be5923 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoMatchingFieldForParamInConstructor.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoMatchingFieldForParamInConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoPartitionKey.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoPartitionKey.java
index f32dabaf1..afaae9f36 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoPartitionKey.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoPartitionKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoPublicConstructor.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoPublicConstructor.java
index 6d041f85c..f4b54a8f2 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoPublicConstructor.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithNoPublicConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithSimplePartitionKey.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithSimplePartitionKey.java
index e360e1bd1..4c4579a83 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithSimplePartitionKey.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithSimplePartitionKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticAnnotations.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticAnnotations.java
index 9e0f1a473..1ab1fb277 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticAnnotations.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticAnnotations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticColumn.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticColumn.java
index 3c95dc0be..6e77c1a95 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticColumn.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticCounterColumn.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticCounterColumn.java
index b703151f0..a25dddc07 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticCounterColumn.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticCounterColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticWithoutClustering.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticWithoutClustering.java
index 839f03d35..78d534486 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticWithoutClustering.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithStaticWithoutClustering.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongClusteringColumns.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongClusteringColumns.java
index 4523dcfa5..688975843 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongClusteringColumns.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongClusteringColumns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongCompositePartitionKey.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongCompositePartitionKey.java
index 6f55e7c8e..a0212c4b2 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongCompositePartitionKey.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongCompositePartitionKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongComputed.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongComputed.java
index e5f815971..675581421 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongComputed.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongComputed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongDeclaredParamTypeInConstructor.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongDeclaredParamTypeInConstructor.java
index 87a59b303..1fd80983c 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongDeclaredParamTypeInConstructor.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongDeclaredParamTypeInConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongParamTypeInConstructor.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongParamTypeInConstructor.java
index 2553e71f0..79042a2ed 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongParamTypeInConstructor.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestEntityWithWrongParamTypeInConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntity.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntity.java
index b1e16cf73..14950b264 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntity.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntityWithNoMatchingFieldForParamInConstructor.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntityWithNoMatchingFieldForParamInConstructor.java
index 2294f5651..e04fe6079 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntityWithNoMatchingFieldForParamInConstructor.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntityWithNoMatchingFieldForParamInConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntityWithNonPublicFinalField.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntityWithNonPublicFinalField.java
index 23888b712..41f6a4e54 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntityWithNonPublicFinalField.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntityWithNonPublicFinalField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntityWithWrongParamTypeInConstructor.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntityWithWrongParamTypeInConstructor.java
index 4df733661..93c1714d7 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntityWithWrongParamTypeInConstructor.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableEntityWithWrongParamTypeInConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableUDT.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableUDT.java
index 14fe6ab97..334e1f9ef 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableUDT.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestImmutableUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestUDTImplicitFieldParsing.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestUDTImplicitFieldParsing.java
index 486f280c8..2f03028ca 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestUDTImplicitFieldParsing.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/entity/TestUDTImplicitFieldParsing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestEntityForAnnotationTree.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestEntityForAnnotationTree.java
index 2523c1c83..e8aa08c20 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestEntityForAnnotationTree.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestEntityForAnnotationTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestEntityForCodecs.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestEntityForCodecs.java
index 5ec63525a..d3f9c0784 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestEntityForCodecs.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestEntityForCodecs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestEntityForSASI.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestEntityForSASI.java
index a7c6140a0..d495bc1d5 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestEntityForSASI.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestEntityForSASI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestNestedUDT.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestNestedUDT.java
index d3af76ba6..b0840b3a4 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestNestedUDT.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestNestedUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestNonFrozenNestedUDT.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestNonFrozenNestedUDT.java
index 753736ca8..c5f872f67 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestNonFrozenNestedUDT.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestNonFrozenNestedUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDT.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDT.java
index ef00ccd0c..a73d89e15 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDT.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithClusteringColumn.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithClusteringColumn.java
index ce9b8bcdc..f7c0db898 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithClusteringColumn.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithClusteringColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithCounter.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithCounter.java
index 178d2ef8a..b085c9ac0 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithCounter.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithCustomConstructor.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithCustomConstructor.java
index b77a9d887..dcea3a9a3 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithCustomConstructor.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithCustomConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithNonFrozenCollection.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithNonFrozenCollection.java
index f1fe04282..3be66ae51 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithNonFrozenCollection.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithNonFrozenCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithPartitionKey.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithPartitionKey.java
index 9846eaa9d..0651309b6 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithPartitionKey.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithPartitionKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithStaticColumn.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithStaticColumn.java
index 1e78cc94c..7d15f14ee 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithStaticColumn.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field/TestUDTWithStaticColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field_info/TestEntityForFieldInfo.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field_info/TestEntityForFieldInfo.java
index e34c0df76..4380dfc88 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field_info/TestEntityForFieldInfo.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/field_info/TestEntityForFieldInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/strategy/TestEntityWithNestedTypes.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/strategy/TestEntityWithNestedTypes.java
index a991e98b1..139122fcb 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/strategy/TestEntityWithNestedTypes.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/strategy/TestEntityWithNestedTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityAsAbstract.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityAsAbstract.java
index 92b4f391f..39cc40e5f 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityAsAbstract.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityAsAbstract.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityAsFinal.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityAsFinal.java
index 3f0281cbe..f3f5f4e81 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityAsFinal.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityAsFinal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityAsInterface.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityAsInterface.java
index 305d4cd01..0e3b693bc 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityAsInterface.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityAsInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityWithEntityCreatorConstructor.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityWithEntityCreatorConstructor.java
index 960bbf765..f44d232f1 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityWithEntityCreatorConstructor.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityWithEntityCreatorConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityWithNoPublicConstructor.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityWithNoPublicConstructor.java
index f811f8008..e0d5792f3 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityWithNoPublicConstructor.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityWithNoPublicConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityWithTwoCustomConstructors.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityWithTwoCustomConstructors.java
index 4950acfc7..450e6b17e 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityWithTwoCustomConstructors.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestEntityWithTwoCustomConstructors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestImmutableEntity.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestImmutableEntity.java
index dc0ac28e4..d7a44ff31 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestImmutableEntity.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/validator/TestImmutableEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewCounter.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewCounter.java
index 81ab0cacf..0f11e2685 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewCounter.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorByType.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorByType.java
index cc1f0a4dc..4719156c8 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorByType.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorByType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithColumnNotMatchBase.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithColumnNotMatchBase.java
index 178f6e5ab..fff9a6498 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithColumnNotMatchBase.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithColumnNotMatchBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithMissingCollection.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithMissingCollection.java
index 42bb7965d..d39fe8d01 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithMissingCollection.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithMissingCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithMissingPK.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithMissingPK.java
index ed42177a1..306044d2c 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithMissingPK.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithMissingPK.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithMultipleNonPK.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithMultipleNonPK.java
index fa4f251bc..4d2787abd 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithMultipleNonPK.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithMultipleNonPK.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithNonBaseColumn.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithNonBaseColumn.java
index e78a539f9..d1042c2b8 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithNonBaseColumn.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewSensorWithNonBaseColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewStatic.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewStatic.java
index 7c207e503..da0e4cc70 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewStatic.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewStatic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewWithEntityAnnotation.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewWithEntityAnnotation.java
index 0151de23e..740dff3f9 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewWithEntityAnnotation.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/parser/view/TestViewWithEntityAnnotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/types/MyBean.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/types/MyBean.java
index 55c1554cb..05aceda62 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/types/MyBean.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/types/MyBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/types/SimpleIntWrapper.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/types/SimpleIntWrapper.java
index 7c9adeb82..b1de2cb75 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/types/SimpleIntWrapper.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/types/SimpleIntWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/types/SimpleLongWrapper.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/types/SimpleLongWrapper.java
index 19eb69934..666139975 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/types/SimpleLongWrapper.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/sample_classes/types/SimpleLongWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/FrozenNestedTypeStrategyTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/FrozenNestedTypeStrategyTest.java
index b6a3360e2..0a5133bbc 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/FrozenNestedTypeStrategyTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/FrozenNestedTypeStrategyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/naming/CaseSensitiveNamingTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/naming/CaseSensitiveNamingTest.java
index 9ebdd6ecc..e435c2f40 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/naming/CaseSensitiveNamingTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/naming/CaseSensitiveNamingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/naming/LowerCaseNamingTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/naming/LowerCaseNamingTest.java
index ef67c8172..cb7c513d2 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/naming/LowerCaseNamingTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/naming/LowerCaseNamingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/naming/SnakeCaseNamingTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/naming/SnakeCaseNamingTest.java
index ceda77052..b9cda0b10 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/naming/SnakeCaseNamingTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/strategy/naming/SnakeCaseNamingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/types/OverridingOptionalFinalTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/types/OverridingOptionalFinalTest.java
index ab61d91e4..eeb2611cc 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/types/OverridingOptionalFinalTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/types/OverridingOptionalFinalTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/internals/utils/TypeNameHelperTest.java b/achilles-core/src/test/java/info/archinnov/achilles/internals/utils/TypeNameHelperTest.java
index 4999c4261..faf1b1d6c 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/internals/utils/TypeNameHelperTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/internals/utils/TypeNameHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/java/info/archinnov/achilles/type/TypedMapTest.java b/achilles-core/src/test/java/info/archinnov/achilles/type/TypedMapTest.java
index 08475d746..13408e82e 100644
--- a/achilles-core/src/test/java/info/archinnov/achilles/type/TypedMapTest.java
+++ b/achilles-core/src/test/java/info/archinnov/achilles/type/TypedMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-core/src/test/resources/logback.xml b/achilles-core/src/test/resources/logback.xml
index 25733149e..ff9618652 100644
--- a/achilles-core/src/test/resources/logback.xml
+++ b/achilles-core/src/test/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/pom.xml b/achilles-embedded/pom.xml
index 950f8426c..d6f06bedc 100644
--- a/achilles-embedded/pom.xml
+++ b/achilles-embedded/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/main/java/com/datastax/driver/core/CassandraTypeParser.java b/achilles-embedded/src/main/java/com/datastax/driver/core/CassandraTypeParser.java
index a8f73b9b0..bb6043956 100644
--- a/achilles-embedded/src/main/java/com/datastax/driver/core/CassandraTypeParser.java
+++ b/achilles-embedded/src/main/java/com/datastax/driver/core/CassandraTypeParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/AchillesCassandraConfig.java b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/AchillesCassandraConfig.java
index 875d1b273..196b67796 100644
--- a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/AchillesCassandraConfig.java
+++ b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/AchillesCassandraConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/AchillesCassandraDaemon.java b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/AchillesCassandraDaemon.java
index c804b9778..d86b71bd2 100644
--- a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/AchillesCassandraDaemon.java
+++ b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/AchillesCassandraDaemon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/AchillesInitializer.java b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/AchillesInitializer.java
index c53f32c9b..066886140 100644
--- a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/AchillesInitializer.java
+++ b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/AchillesInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraEmbeddedConfigParameters.java b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraEmbeddedConfigParameters.java
index 1bf2a8142..f715ffe73 100644
--- a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraEmbeddedConfigParameters.java
+++ b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraEmbeddedConfigParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraEmbeddedServer.java b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraEmbeddedServer.java
index d2a28427a..e0c67878e 100644
--- a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraEmbeddedServer.java
+++ b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraEmbeddedServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraEmbeddedServerBuilder.java b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraEmbeddedServerBuilder.java
index f216922c9..37b508f60 100644
--- a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraEmbeddedServerBuilder.java
+++ b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraEmbeddedServerBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraShutDownHook.java b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraShutDownHook.java
index 9dcec9764..de24b2258 100644
--- a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraShutDownHook.java
+++ b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/CassandraShutDownHook.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/OrderedShutdownHook.java b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/OrderedShutdownHook.java
index 69fdf0f83..d4f2a8bf4 100644
--- a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/OrderedShutdownHook.java
+++ b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/OrderedShutdownHook.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/PortFinder.java b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/PortFinder.java
index c2e5175e4..e31299f96 100644
--- a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/PortFinder.java
+++ b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/PortFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/ServerStarter.java b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/ServerStarter.java
index a14bea839..15714b83b 100644
--- a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/ServerStarter.java
+++ b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/ServerStarter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/SetUtils.java b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/SetUtils.java
index 995ea3869..dbc3653a3 100644
--- a/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/SetUtils.java
+++ b/achilles-embedded/src/main/java/info/archinnov/achilles/embedded/SetUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/test/java/info/archinnov/achilles/embedded/CassandraEmbeddedServerBuilderTest.java b/achilles-embedded/src/test/java/info/archinnov/achilles/embedded/CassandraEmbeddedServerBuilderTest.java
index c3559327b..862d5e92d 100644
--- a/achilles-embedded/src/test/java/info/archinnov/achilles/embedded/CassandraEmbeddedServerBuilderTest.java
+++ b/achilles-embedded/src/test/java/info/archinnov/achilles/embedded/CassandraEmbeddedServerBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/test/java/info/archinnov/achilles/embedded/PortFinderTest.java b/achilles-embedded/src/test/java/info/archinnov/achilles/embedded/PortFinderTest.java
index 688975b48..03bc5ad88 100644
--- a/achilles-embedded/src/test/java/info/archinnov/achilles/embedded/PortFinderTest.java
+++ b/achilles-embedded/src/test/java/info/archinnov/achilles/embedded/PortFinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-embedded/src/test/resources/logback.xml b/achilles-embedded/src/test/resources/logback.xml
index 25733149e..ff9618652 100644
--- a/achilles-embedded/src/test/resources/logback.xml
+++ b/achilles-embedded/src/test/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/achilles-junit/pom.xml b/achilles-junit/pom.xml
index 4e1d841e8..434f55309 100644
--- a/achilles-junit/pom.xml
+++ b/achilles-junit/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/achilles-junit/src/main/java/info/archinnov/achilles/junit/AchillesTestResource.java b/achilles-junit/src/main/java/info/archinnov/achilles/junit/AchillesTestResource.java
index 49d486e87..aba9e2f62 100644
--- a/achilles-junit/src/main/java/info/archinnov/achilles/junit/AchillesTestResource.java
+++ b/achilles-junit/src/main/java/info/archinnov/achilles/junit/AchillesTestResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-junit/src/main/java/info/archinnov/achilles/junit/AchillesTestResourceBuilder.java b/achilles-junit/src/main/java/info/archinnov/achilles/junit/AchillesTestResourceBuilder.java
index 2aa01b6b3..f612a4e62 100644
--- a/achilles-junit/src/main/java/info/archinnov/achilles/junit/AchillesTestResourceBuilder.java
+++ b/achilles-junit/src/main/java/info/archinnov/achilles/junit/AchillesTestResourceBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-junit/src/test/java/info/archinnov/achilles/junit/AchillesTestResourceTest.java b/achilles-junit/src/test/java/info/archinnov/achilles/junit/AchillesTestResourceTest.java
index c0e85ce21..f67e5c2d3 100644
--- a/achilles-junit/src/test/java/info/archinnov/achilles/junit/AchillesTestResourceTest.java
+++ b/achilles-junit/src/test/java/info/archinnov/achilles/junit/AchillesTestResourceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-junit/src/test/resources/logback.xml b/achilles-junit/src/test/resources/logback.xml
index 25733149e..ff9618652 100644
--- a/achilles-junit/src/test/resources/logback.xml
+++ b/achilles-junit/src/test/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/achilles-model/pom.xml b/achilles-model/pom.xml
index f8806bf89..9869eee47 100644
--- a/achilles-model/pom.xml
+++ b/achilles-model/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/ASCII.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/ASCII.java
index 5ae5cbe4a..7f4e7b398 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/ASCII.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/ASCII.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/ClusteringColumn.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/ClusteringColumn.java
index 0438622ef..fec89b9fe 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/ClusteringColumn.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/ClusteringColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Codec.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Codec.java
index d901a80ec..a9efe10ee 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Codec.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Codec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/CodecRegistry.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/CodecRegistry.java
index bb73ad970..e798532eb 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/CodecRegistry.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/CodecRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Column.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Column.java
index 58b9a6cce..7e51bd33e 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Column.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Column.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/CompileTimeConfig.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/CompileTimeConfig.java
index 946017876..774e33d36 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/CompileTimeConfig.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/CompileTimeConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Computed.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Computed.java
index 82e660eff..fe585c773 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Computed.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Computed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Consistency.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Consistency.java
index 9a2c5240c..7c911b627 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Consistency.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Consistency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Counter.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Counter.java
index 0301ce30b..ca60dd14a 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Counter.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Counter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/DSE_Search.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/DSE_Search.java
index 88983a1a2..564f5fbcf 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/DSE_Search.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/DSE_Search.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/EmptyCollectionIfNull.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/EmptyCollectionIfNull.java
index 7c748998b..0aacf4460 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/EmptyCollectionIfNull.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/EmptyCollectionIfNull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/EntityCreator.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/EntityCreator.java
index 5483329b0..450abcb20 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/EntityCreator.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/EntityCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Enumerated.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Enumerated.java
index 86a759891..05ad30ef6 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Enumerated.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Enumerated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Frozen.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Frozen.java
index 0293b932b..35a3c8cda 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Frozen.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Frozen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/FunctionRegistry.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/FunctionRegistry.java
index 865836a6a..11c195a18 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/FunctionRegistry.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/FunctionRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Immutable.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Immutable.java
index c5b8fb987..20cb5de4b 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Immutable.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Immutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Index.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Index.java
index d16c28681..d37b94149 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Index.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Index.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/JSON.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/JSON.java
index e0a4e1160..a52a38670 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/JSON.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/JSON.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/MaterializedView.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/MaterializedView.java
index 1bc6376d8..b942d8cf3 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/MaterializedView.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/MaterializedView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/PartitionKey.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/PartitionKey.java
index 75d9fb482..9d53838a8 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/PartitionKey.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/PartitionKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/RuntimeCodec.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/RuntimeCodec.java
index 4f089b3a2..dab652284 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/RuntimeCodec.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/RuntimeCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/SASI.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/SASI.java
index 35a382014..4efb242a5 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/SASI.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/SASI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Static.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Static.java
index 7a6505ee4..c9a45008c 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Static.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Static.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Strategy.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Strategy.java
index 2b10c97ef..7c4668633 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Strategy.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Strategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/TTL.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/TTL.java
index 1209cb4b1..25b8404ba 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/TTL.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/TTL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Table.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Table.java
index ae2864e17..25c7c9631 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Table.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Table.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/TimeUUID.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/TimeUUID.java
index 8166745d1..40fb3b39e 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/TimeUUID.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/TimeUUID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Transient.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Transient.java
index 9287f2213..ea19c99ac 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/Transient.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/Transient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/annotations/UDT.java b/achilles-model/src/main/java/info/archinnov/achilles/annotations/UDT.java
index c0b358fc3..774409bc3 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/annotations/UDT.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/annotations/UDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesBeanMappingException.java b/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesBeanMappingException.java
index 8eb2edb7d..3a0df11f8 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesBeanMappingException.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesBeanMappingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesBeanValidationException.java b/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesBeanValidationException.java
index 8b4256080..fa97c7a59 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesBeanValidationException.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesBeanValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesException.java b/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesException.java
index 27ecf8ad7..8cd6ad1bb 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesException.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesInvalidTableException.java b/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesInvalidTableException.java
index fe246bfa3..f56123ad6 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesInvalidTableException.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesInvalidTableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesLightWeightTransactionException.java b/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesLightWeightTransactionException.java
index e7d68c2ee..a9dc4ac54 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesLightWeightTransactionException.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesLightWeightTransactionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesStaleObjectStateException.java b/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesStaleObjectStateException.java
index 10dff6081..bfe538c9d 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesStaleObjectStateException.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesStaleObjectStateException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesTranscodingException.java b/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesTranscodingException.java
index f3ed4715c..799977ebf 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesTranscodingException.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/exception/AchillesTranscodingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/logger/AchillesLoggers.java b/achilles-model/src/main/java/info/archinnov/achilles/logger/AchillesLoggers.java
index 110dfb69d..95fee578b 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/logger/AchillesLoggers.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/logger/AchillesLoggers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/CassandraVersion.java b/achilles-model/src/main/java/info/archinnov/achilles/type/CassandraVersion.java
index 81b3d1d5a..ffaf9bf66 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/CassandraVersion.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/CassandraVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/Empty.java b/achilles-model/src/main/java/info/archinnov/achilles/type/Empty.java
index 32b1ea11e..49c7895fe 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/Empty.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/Empty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/SchemaNameProvider.java b/achilles-model/src/main/java/info/archinnov/achilles/type/SchemaNameProvider.java
index e708c3711..57fd3005e 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/SchemaNameProvider.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/SchemaNameProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/TypedMap.java b/achilles-model/src/main/java/info/archinnov/achilles/type/TypedMap.java
index 439eb1986..3fd96cc52 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/TypedMap.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/TypedMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/codec/Codec.java b/achilles-model/src/main/java/info/archinnov/achilles/type/codec/Codec.java
index a0228b2fc..71a205af1 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/codec/Codec.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/codec/Codec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/codec/CodecSignature.java b/achilles-model/src/main/java/info/archinnov/achilles/type/codec/CodecSignature.java
index f4af875ed..e7a750f62 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/codec/CodecSignature.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/codec/CodecSignature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/factory/BeanFactory.java b/achilles-model/src/main/java/info/archinnov/achilles/type/factory/BeanFactory.java
index b655c634b..6cfc5b4a7 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/factory/BeanFactory.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/factory/BeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/interceptor/Event.java b/achilles-model/src/main/java/info/archinnov/achilles/type/interceptor/Event.java
index 3d982eaa9..fb4e45cca 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/interceptor/Event.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/interceptor/Event.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/interceptor/Interceptor.java b/achilles-model/src/main/java/info/archinnov/achilles/type/interceptor/Interceptor.java
index 7df9c5241..d105649db 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/interceptor/Interceptor.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/interceptor/Interceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/lightweighttransaction/LWTResultListener.java b/achilles-model/src/main/java/info/archinnov/achilles/type/lightweighttransaction/LWTResultListener.java
index 9535adaa2..28e708644 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/lightweighttransaction/LWTResultListener.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/lightweighttransaction/LWTResultListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/strategy/ColumnMappingStrategy.java b/achilles-model/src/main/java/info/archinnov/achilles/type/strategy/ColumnMappingStrategy.java
index dc22e2eb9..77cd6afe5 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/strategy/ColumnMappingStrategy.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/strategy/ColumnMappingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/strategy/InsertStrategy.java b/achilles-model/src/main/java/info/archinnov/achilles/type/strategy/InsertStrategy.java
index 38bd544de..25eb9b4a5 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/strategy/InsertStrategy.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/strategy/InsertStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/strategy/NamingStrategy.java b/achilles-model/src/main/java/info/archinnov/achilles/type/strategy/NamingStrategy.java
index 56252ae7e..e674f5868 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/strategy/NamingStrategy.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/strategy/NamingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple.java b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple.java
index 48b8ee7a8..7d5f24953 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple1.java b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple1.java
index 816cf4b4d..fd20ca8f7 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple1.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple10.java b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple10.java
index a1bcc25e6..e2efc5fd2 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple10.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple10.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple2.java b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple2.java
index 1f14e55e0..313e921bd 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple2.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple3.java b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple3.java
index 8bb7af537..5d2544390 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple3.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple4.java b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple4.java
index 27e84f89d..dda5e9053 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple4.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple4.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple5.java b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple5.java
index b9769f63f..baaa046fe 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple5.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple5.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple6.java b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple6.java
index d6eda80be..36cf5c1e8 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple6.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple6.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple7.java b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple7.java
index 7ac70f80d..28b477309 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple7.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple7.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple8.java b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple8.java
index 9f5aa2fe1..679e46274 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple8.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple8.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple9.java b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple9.java
index 6674b9797..d663bdc0a 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple9.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/tuples/Tuple9.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/validation/Validator.java b/achilles-model/src/main/java/info/archinnov/achilles/validation/Validator.java
index 78cb1d899..8bc05210b 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/validation/Validator.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/validation/Validator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-schema-generator/pom.xml b/achilles-schema-generator/pom.xml
index 5534bb446..b31282199 100644
--- a/achilles-schema-generator/pom.xml
+++ b/achilles-schema-generator/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/achilles-schema-generator/src/main/java/info/archinnov/achilles/schema/ReflectionsHelper.java b/achilles-schema-generator/src/main/java/info/archinnov/achilles/schema/ReflectionsHelper.java
index dd3933ccd..9059489da 100644
--- a/achilles-schema-generator/src/main/java/info/archinnov/achilles/schema/ReflectionsHelper.java
+++ b/achilles-schema-generator/src/main/java/info/archinnov/achilles/schema/ReflectionsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-schema-generator/src/main/java/info/archinnov/achilles/schema/SchemaGenerator.java b/achilles-schema-generator/src/main/java/info/archinnov/achilles/schema/SchemaGenerator.java
index 38f8ff02e..fe0330ab7 100644
--- a/achilles-schema-generator/src/main/java/info/archinnov/achilles/schema/SchemaGenerator.java
+++ b/achilles-schema-generator/src/main/java/info/archinnov/achilles/schema/SchemaGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/achilles-schema-generator/src/main/resources/logback.xml b/achilles-schema-generator/src/main/resources/logback.xml
index fc9fabdfe..be55657c1 100644
--- a/achilles-schema-generator/src/main/resources/logback.xml
+++ b/achilles-schema-generator/src/main/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/contributors/Eclipse/Achilles_CodeStyle_CleanUp.xml b/contributors/Eclipse/Achilles_CodeStyle_CleanUp.xml
index f2b579c7d..da28d8fef 100644
--- a/contributors/Eclipse/Achilles_CodeStyle_CleanUp.xml
+++ b/contributors/Eclipse/Achilles_CodeStyle_CleanUp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/contributors/Eclipse/Achilles_CodeStyle_CodeTemplates.xml b/contributors/Eclipse/Achilles_CodeStyle_CodeTemplates.xml
index 2ac867832..3faee1af6 100644
--- a/contributors/Eclipse/Achilles_CodeStyle_CodeTemplates.xml
+++ b/contributors/Eclipse/Achilles_CodeStyle_CodeTemplates.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/contributors/Eclipse/Achilles_CodeStyle_Formatter.xml b/contributors/Eclipse/Achilles_CodeStyle_Formatter.xml
index 217712108..aa9c2ba9a 100644
--- a/contributors/Eclipse/Achilles_CodeStyle_Formatter.xml
+++ b/contributors/Eclipse/Achilles_CodeStyle_Formatter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/documentation/html/achilles.css b/documentation/html/achilles.css
index 7ccc1102e..00eee9a46 100644
--- a/documentation/html/achilles.css
+++ b/documentation/html/achilles.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/documentation/scripts/generate-doc-mac.sh b/documentation/scripts/generate-doc-mac.sh
index d087addc7..6d844c7f7 100755
--- a/documentation/scripts/generate-doc-mac.sh
+++ b/documentation/scripts/generate-doc-mac.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
 
+#
+# Copyright (C) 2012-2021 DuyHai DOAN
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 #Define some variables
 
 BASEDIR=`pwd`
diff --git a/documentation/scripts/generate-doc.sh b/documentation/scripts/generate-doc.sh
index 56eeb4280..c529d65d5 100755
--- a/documentation/scripts/generate-doc.sh
+++ b/documentation/scripts/generate-doc.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
 
+#
+# Copyright (C) 2012-2021 DuyHai DOAN
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 #Define some variables
 
 BASEDIR=`pwd`
diff --git a/documentation/src/assembly/assembly.xml b/documentation/src/assembly/assembly.xml
index 65495c9dc..9fef6f272 100644
--- a/documentation/src/assembly/assembly.xml
+++ b/documentation/src/assembly/assembly.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/pom.xml b/integration-test-2_1/pom.xml
index 38db06831..fdd962152 100644
--- a/integration-test-2_1/pom.xml
+++ b/integration-test-2_1/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/CodecOnClass.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/CodecOnClass.java
index dca10aa0e..c0dafcdb6 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/CodecOnClass.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/CodecOnClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/EncodingOrdinalCodec.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/EncodingOrdinalCodec.java
index 370f258bc..3dd0de0f8 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/EncodingOrdinalCodec.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/EncodingOrdinalCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/IntToStringCodec.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/IntToStringCodec.java
index 66512f7eb..1b87acfcf 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/IntToStringCodec.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/IntToStringCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/IntWrapperCodec.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/IntWrapperCodec.java
index 9137cb8b4..9946686db 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/IntWrapperCodec.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/IntWrapperCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/ProtocolVersionCodec.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/ProtocolVersionCodec.java
index f475557b0..419d4aefb 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/ProtocolVersionCodec.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/ProtocolVersionCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/StringToLongCodec.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/StringToLongCodec.java
index ae53bc1a3..f42b13cb8 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/StringToLongCodec.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/codecs/StringToLongCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
index 67375c8cc..da33ae5fa 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/config/AnotherCodecRegistry.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/config/AnotherCodecRegistry.java
index c00019fbe..4d0c22621 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/config/AnotherCodecRegistry.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/config/AnotherCodecRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/config/MyCodecRegistry.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/config/MyCodecRegistry.java
index f08a3fa91..c83ae1d4a 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/config/MyCodecRegistry.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/config/MyCodecRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/constraints/UDTValidator.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/constraints/UDTValidator.java
index 22a6914b4..446c3c788 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/constraints/UDTValidator.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/constraints/UDTValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/constraints/ValidUDT.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/constraints/ValidUDT.java
index 996e1f1aa..b979469e1 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/constraints/ValidUDT.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/constraints/ValidUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityAsChild.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityAsChild.java
index 0b11031ca..cfdfa26dc 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityAsChild.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityAsChild.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityAsParent.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityAsParent.java
index a9c0b93cf..6543b2f09 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityAsParent.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityAsParent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityLayer1.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityLayer1.java
index 92d1ee081..e2daa6a43 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityLayer1.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityLayer1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithBeanValidation.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithBeanValidation.java
index db8c3629e..b66167a68 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithBeanValidation.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithBeanValidation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithByteBufferType.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithByteBufferType.java
index 078ed6d4f..df6ba35be 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithByteBufferType.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithByteBufferType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCaseSensitivePK.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCaseSensitivePK.java
index 4652d0820..c50887720 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCaseSensitivePK.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCaseSensitivePK.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithClusteringColumns.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithClusteringColumns.java
index 7590b759c..88bcc9881 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithClusteringColumns.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithClusteringColumns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexCounters.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexCounters.java
index 4f4611659..f16307b68 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexCounters.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexCounters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexIndices.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexIndices.java
index d6c2f9377..7e8352dd0 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexIndices.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexIndices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexTuple.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexTuple.java
index d4a76a8cc..7b078dc3a 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexTuple.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexTuple.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexTypes.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexTypes.java
index 8f3d9c32f..5fbf9c162 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexTypes.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithComplexTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCompositePartitionKey.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCompositePartitionKey.java
index c8e722090..efff5ced6 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCompositePartitionKey.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCompositePartitionKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCounterColumn.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCounterColumn.java
index 55384220f..42ac46a42 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCounterColumn.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCounterColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCustomConstructor.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCustomConstructor.java
index 0c5ee8b47..77c1b13b3 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCustomConstructor.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCustomConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCustomConstructorAndDeclaredFields.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCustomConstructorAndDeclaredFields.java
index cbcf01b88..06f5ebc27 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCustomConstructorAndDeclaredFields.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCustomConstructorAndDeclaredFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithImplicitFieldParsing.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithImplicitFieldParsing.java
index d56e4f67d..b2258e41b 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithImplicitFieldParsing.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithImplicitFieldParsing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithIndexOnClustering.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithIndexOnClustering.java
index cd7a205d4..11fca6dfc 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithIndexOnClustering.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithIndexOnClustering.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithMissingClustering.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithMissingClustering.java
index d3fd6dda2..bdb318baa 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithMissingClustering.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithMissingClustering.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithMissingPartitionKey.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithMissingPartitionKey.java
index 625885384..103913e7c 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithMissingPartitionKey.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithMissingPartitionKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithMissingStaticCol.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithMissingStaticCol.java
index 2f3555b05..80f01841d 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithMissingStaticCol.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithMissingStaticCol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNativeCollections.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNativeCollections.java
index 1c8355d9b..d1550b6be 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNativeCollections.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNativeCollections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNestedUDT.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNestedUDT.java
index 9745b9b10..d393f8d08 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNestedUDT.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNestedUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNonExistingKeyspace.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNonExistingKeyspace.java
index 5e85cdcae..b353552f3 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNonExistingKeyspace.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNonExistingKeyspace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNonExistingTable.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNonExistingTable.java
index 9fc6620ab..6d550c98d 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNonExistingTable.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNonExistingTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithPrimitiveClusteringColumn.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithPrimitiveClusteringColumn.java
index f2d301b7a..7b5b64851 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithPrimitiveClusteringColumn.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithPrimitiveClusteringColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithSimplePartitionKey.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithSimplePartitionKey.java
index d7b84625b..071c8db8b 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithSimplePartitionKey.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithSimplePartitionKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithStaticAnnotations.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithStaticAnnotations.java
index c8b36fac3..e91aa8c82 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithStaticAnnotations.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithStaticAnnotations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithStaticColumn.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithStaticColumn.java
index 3d3dcbb11..da8cd26c0 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithStaticColumn.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithStaticColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithStaticCounterColumn.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithStaticCounterColumn.java
index 0e51561d2..07df46f2a 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithStaticCounterColumn.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithStaticCounterColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithUDTCollectionsPrimitive.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithUDTCollectionsPrimitive.java
index 54edbb5a0..c6ea00b6d 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithUDTCollectionsPrimitive.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithUDTCollectionsPrimitive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithUDTForDynamicKeyspace.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithUDTForDynamicKeyspace.java
index 92638b655..ddd878108 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithUDTForDynamicKeyspace.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithUDTForDynamicKeyspace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithUDTs.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithUDTs.java
index 749231b01..324162c1e 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithUDTs.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/EntityWithUDTs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/ImmutableEntity.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/ImmutableEntity.java
index 35f840a39..52a66cf70 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/ImmutableEntity.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/ImmutableEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/ImmutableUDT.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/ImmutableUDT.java
index 9483b873a..2ce5df407 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/ImmutableUDT.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/ImmutableUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/Layer2.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/Layer2.java
index 11dccbc02..e3db7f61c 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/Layer2.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/Layer2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/Layer3.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/Layer3.java
index ae566197f..3300387a7 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/Layer3.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/Layer3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/SimpleEntity.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/SimpleEntity.java
index 9216bdb7e..f69a9efda 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/SimpleEntity.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/SimpleEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/SimpleUDTWithNoKeyspace.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/SimpleUDTWithNoKeyspace.java
index 3574eeefd..bfcd1c9ec 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/SimpleUDTWithNoKeyspace.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/SimpleUDTWithNoKeyspace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/TestUDT.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/TestUDT.java
index bafa5efbf..08b7e2a47 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/TestUDT.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/TestUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTImplicitFieldParsing.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTImplicitFieldParsing.java
index f0b5b4672..77bd01894 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTImplicitFieldParsing.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTImplicitFieldParsing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithCollectionsPrimitive.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithCollectionsPrimitive.java
index e7861382e..d7509d1fe 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithCollectionsPrimitive.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithCollectionsPrimitive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithCustomConstructor.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithCustomConstructor.java
index 61041e685..1d49f493a 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithCustomConstructor.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithCustomConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithCustomConstructorAndDeclaredFields.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithCustomConstructorAndDeclaredFields.java
index acfbc3a21..1e06320ef 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithCustomConstructorAndDeclaredFields.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithCustomConstructorAndDeclaredFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithNestedUDT.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithNestedUDT.java
index b6e1e3649..a33d50b25 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithNestedUDT.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithNestedUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithNoKeyspace.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithNoKeyspace.java
index 24a34267a..58d1d58bb 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithNoKeyspace.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/entities/UDTWithNoKeyspace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/types/ClassAnnotatedByCodec.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/types/ClassAnnotatedByCodec.java
index df32768cf..ec96151af 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/types/ClassAnnotatedByCodec.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/types/ClassAnnotatedByCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/types/IntWrapper.java b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/types/IntWrapper.java
index aa59c0a1a..0787b015c 100644
--- a/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/types/IntWrapper.java
+++ b/integration-test-2_1/src/main/java/info/archinnov/achilles/internals/types/IntWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/main/resources/logback.xml b/integration-test-2_1/src/main/resources/logback.xml
index b5e983140..210cb2b21 100644
--- a/integration-test-2_1/src/main/resources/logback.xml
+++ b/integration-test-2_1/src/main/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestALLEntityAsChild.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestALLEntityAsChild.java
index c33ee35c5..703356151 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestALLEntityAsChild.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestALLEntityAsChild.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestAsyncCRUDSimpleEntity.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestAsyncCRUDSimpleEntity.java
index f8f1ea567..0fa220b46 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestAsyncCRUDSimpleEntity.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestAsyncCRUDSimpleEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestAsyncDSLSimpleEntity.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestAsyncDSLSimpleEntity.java
index 2476732a2..8510fa957 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestAsyncDSLSimpleEntity.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestAsyncDSLSimpleEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestBeanValidation.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestBeanValidation.java
index eb56db72b..6c559d807 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestBeanValidation.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestBeanValidation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestCRUDSimpleEntity.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestCRUDSimpleEntity.java
index 6bcfdcd57..b3d0a0335 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestCRUDSimpleEntity.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestCRUDSimpleEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestDSLEntityWithClusterings.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestDSLEntityWithClusterings.java
index 61a4d1d47..98ec45f0e 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestDSLEntityWithClusterings.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestDSLEntityWithClusterings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestDSLSimpleEntity.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestDSLSimpleEntity.java
index 7f2ee5a14..9c0ceaf1c 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestDSLSimpleEntity.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestDSLSimpleEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexCounter.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexCounter.java
index 5fd9f51d5..d15eda0d3 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexCounter.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexIndices.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexIndices.java
index e21775002..4ee442492 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexIndices.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexIndices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexTuple.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexTuple.java
index 33fefad79..f7a9c78c1 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexTuple.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexTuple.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexTypes.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexTypes.java
index 76ff8c8f7..9316a5221 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexTypes.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithComplexTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCompositePartitionKey.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCompositePartitionKey.java
index 30a2d3b6a..29ce53092 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCompositePartitionKey.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCompositePartitionKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCounterColumn.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCounterColumn.java
index 0abbbb423..363b13c8c 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCounterColumn.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCounterColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCustomConstructor.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCustomConstructor.java
index ba0dcf1be..f70d7272c 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCustomConstructor.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCustomConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCustomConstructorAndDeclaredFields.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCustomConstructorAndDeclaredFields.java
index 9236cea90..c774582b3 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCustomConstructorAndDeclaredFields.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithCustomConstructorAndDeclaredFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithIndexOnClustering.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithIndexOnClustering.java
index 78ed0eb4a..ac0a40a29 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithIndexOnClustering.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithIndexOnClustering.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithStaticAnnotations.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithStaticAnnotations.java
index e26bf34b3..12bc1ce05 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithStaticAnnotations.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithStaticAnnotations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithStaticColumn.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithStaticColumn.java
index fdaa2e5d7..603e98eb4 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithStaticColumn.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithStaticColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithStaticCounterColumn.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithStaticCounterColumn.java
index 11ca0481a..f18ec90d0 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithStaticCounterColumn.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestEntityWithStaticCounterColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestImmutableEntity.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestImmutableEntity.java
index 9f6671674..4bdc9a863 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestImmutableEntity.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestImmutableEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestInterceptorsSimpleEntity.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestInterceptorsSimpleEntity.java
index bb8924a6b..b60db4501 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestInterceptorsSimpleEntity.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestInterceptorsSimpleEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestNativeQueries.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestNativeQueries.java
index df18bb408..8c2e500e4 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestNativeQueries.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestNativeQueries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestTypedQueries.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestTypedQueries.java
index fdddde88d..305db8f97 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestTypedQueries.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/TestTypedQueries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/ClassLevelTracing.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/ClassLevelTracing.java
index bb6eec361..b4822c54c 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/ClassLevelTracing.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/ClassLevelTracing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/ConsistencyLevelOrderingIT.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/ConsistencyLevelOrderingIT.java
index 5d4b2aed6..3bde86b3b 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/ConsistencyLevelOrderingIT.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/ConsistencyLevelOrderingIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/MultiLayerNestingIT.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/MultiLayerNestingIT.java
index a80380446..d653e6ed1 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/MultiLayerNestingIT.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/MultiLayerNestingIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/NativeCollectionsCodecIT.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/NativeCollectionsCodecIT.java
index 403e539e1..759655858 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/NativeCollectionsCodecIT.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/NativeCollectionsCodecIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/PrimitiveAsClusteringColumnIT.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/PrimitiveAsClusteringColumnIT.java
index 12bed63ad..b2ff121c9 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/PrimitiveAsClusteringColumnIT.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/PrimitiveAsClusteringColumnIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestCopyAllOptionsFromRegularStatementForTypedQuery.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestCopyAllOptionsFromRegularStatementForTypedQuery.java
index 56ea738d0..9304cf02c 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestCopyAllOptionsFromRegularStatementForTypedQuery.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestCopyAllOptionsFromRegularStatementForTypedQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestDSLUpdateWithTTLAndTimestamp.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestDSLUpdateWithTTLAndTimestamp.java
index edb4ae010..83b8164f2 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestDSLUpdateWithTTLAndTimestamp.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestDSLUpdateWithTTLAndTimestamp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestDynamicKeyspaceWithUDT.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestDynamicKeyspaceWithUDT.java
index ecd295a57..1316e6741 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestDynamicKeyspaceWithUDT.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestDynamicKeyspaceWithUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityHavingUDTWithNoKeyspaceIT.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityHavingUDTWithNoKeyspaceIT.java
index 5334679c9..631f9800b 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityHavingUDTWithNoKeyspaceIT.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityHavingUDTWithNoKeyspaceIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithByteBufferTypeIT.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithByteBufferTypeIT.java
index ef701329e..3d92a0348 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithByteBufferTypeIT.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithByteBufferTypeIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithCaseSensitivePKIT.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithCaseSensitivePKIT.java
index 5d93dab6e..d4a270a6d 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithCaseSensitivePKIT.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithCaseSensitivePKIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithNestedUdtIT.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithNestedUdtIT.java
index ab67a78a5..8afe2eec8 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithNestedUdtIT.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithNestedUdtIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithNonExistingKeyspaceIT.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithNonExistingKeyspaceIT.java
index ebe7606d0..7a95ea8fe 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithNonExistingKeyspaceIT.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithNonExistingKeyspaceIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithNonExistingTableIT.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithNonExistingTableIT.java
index 05257b705..daf58f880 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithNonExistingTableIT.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestEntityWithNonExistingTableIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestNotUsePrimitiveArrayCodecs.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestNotUsePrimitiveArrayCodecs.java
index b20f561ec..aefd97672 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestNotUsePrimitiveArrayCodecs.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestNotUsePrimitiveArrayCodecs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestOverridingSchemaNameProvider.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestOverridingSchemaNameProvider.java
index e65074732..325b79f06 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestOverridingSchemaNameProvider.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/TestOverridingSchemaNameProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/ValidateSchemaIT.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/ValidateSchemaIT.java
index 54606b289..0cf85066f 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/ValidateSchemaIT.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/bugs/ValidateSchemaIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/utils/CassandraLogAsserter.java b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/utils/CassandraLogAsserter.java
index 8d4e22194..7966c85de 100644
--- a/integration-test-2_1/src/test/java/info/archinnov/achilles/it/utils/CassandraLogAsserter.java
+++ b/integration-test-2_1/src/test/java/info/archinnov/achilles/it/utils/CassandraLogAsserter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_2/pom.xml b/integration-test-2_2/pom.xml
index 3547e1ecb..710828111 100644
--- a/integration-test-2_2/pom.xml
+++ b/integration-test-2_2/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java b/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
index f7213b23a..f9d1e9c86 100644
--- a/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
+++ b/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/config/MyFunctionRegistry.java b/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/config/MyFunctionRegistry.java
index b4ccbdd59..3d9c0ea48 100644
--- a/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/config/MyFunctionRegistry.java
+++ b/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/config/MyFunctionRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/EntityForJSONCall.java b/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/EntityForJSONCall.java
index c3b164af8..8bac62f71 100644
--- a/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/EntityForJSONCall.java
+++ b/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/EntityForJSONCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/EntityWithIndicesForJSON.java b/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/EntityWithIndicesForJSON.java
index 70dc7ae6c..3784159ea 100644
--- a/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/EntityWithIndicesForJSON.java
+++ b/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/EntityWithIndicesForJSON.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNoKeyspaceUDT.java b/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNoKeyspaceUDT.java
index 2089c5cab..6b3614dbb 100644
--- a/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNoKeyspaceUDT.java
+++ b/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNoKeyspaceUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/NoKeyspaceUDT.java b/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/NoKeyspaceUDT.java
index 93afb620a..220853d6f 100644
--- a/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/NoKeyspaceUDT.java
+++ b/integration-test-2_2/src/main/java/info/archinnov/achilles/internals/entities/NoKeyspaceUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_2/src/main/resources/logback.xml b/integration-test-2_2/src/main/resources/logback.xml
index c81b4e816..36edfc0b1 100644
--- a/integration-test-2_2/src/main/resources/logback.xml
+++ b/integration-test-2_2/src/main/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestDynamicKeyspaceWithUDTJSON.java b/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestDynamicKeyspaceWithUDTJSON.java
index 6af5c5e93..236ed7651 100644
--- a/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestDynamicKeyspaceWithUDTJSON.java
+++ b/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestDynamicKeyspaceWithUDTJSON.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestEntityWithIndicesForJSON.java b/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestEntityWithIndicesForJSON.java
index aa0a670d7..8718289e9 100644
--- a/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestEntityWithIndicesForJSON.java
+++ b/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestEntityWithIndicesForJSON.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestFunctionCallsSimpleEntity.java b/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestFunctionCallsSimpleEntity.java
index e9dea08e0..7f71a308f 100644
--- a/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestFunctionCallsSimpleEntity.java
+++ b/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestFunctionCallsSimpleEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestJSONCall.java b/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestJSONCall.java
index 62505aeed..763532b37 100644
--- a/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestJSONCall.java
+++ b/integration-test-2_2/src/test/java/info/archinnov/achilles/it/TestJSONCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_0/pom.xml b/integration-test-3_0/pom.xml
index 7e0d59124..3f020430f 100644
--- a/integration-test-3_0/pom.xml
+++ b/integration-test-3_0/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java b/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
index fefe372b4..a26a7b744 100644
--- a/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
+++ b/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/entities/EntitySensor.java b/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/entities/EntitySensor.java
index de56d2a66..e0aaf6e4a 100644
--- a/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/entities/EntitySensor.java
+++ b/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/entities/EntitySensor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/entities/MultiClusteringEntity.java b/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/entities/MultiClusteringEntity.java
index 4cbfb6fcf..3c5705a6f 100644
--- a/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/entities/MultiClusteringEntity.java
+++ b/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/entities/MultiClusteringEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/views/ViewSensorByType.java b/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/views/ViewSensorByType.java
index c4b8850f3..029ad9be7 100644
--- a/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/views/ViewSensorByType.java
+++ b/integration-test-3_0/src/main/java/info/archinnov/achilles/internals/views/ViewSensorByType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_0/src/main/resources/logback.xml b/integration-test-3_0/src/main/resources/logback.xml
index c81b4e816..36edfc0b1 100644
--- a/integration-test-3_0/src/main/resources/logback.xml
+++ b/integration-test-3_0/src/main/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-3_0/src/test/java/info/archinnov/achilles/it/TestMultiClusteringEntityIT.java b/integration-test-3_0/src/test/java/info/archinnov/achilles/it/TestMultiClusteringEntityIT.java
index 068e73cda..0c0fa8e77 100644
--- a/integration-test-3_0/src/test/java/info/archinnov/achilles/it/TestMultiClusteringEntityIT.java
+++ b/integration-test-3_0/src/test/java/info/archinnov/achilles/it/TestMultiClusteringEntityIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_0/src/test/java/info/archinnov/achilles/it/TestViewSensorByType.java b/integration-test-3_0/src/test/java/info/archinnov/achilles/it/TestViewSensorByType.java
index 4595c005b..3b77dd54e 100644
--- a/integration-test-3_0/src/test/java/info/archinnov/achilles/it/TestViewSensorByType.java
+++ b/integration-test-3_0/src/test/java/info/archinnov/achilles/it/TestViewSensorByType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_10/pom.xml b/integration-test-3_10/pom.xml
index b6c853b83..62344d849 100644
--- a/integration-test-3_10/pom.xml
+++ b/integration-test-3_10/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java b/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
index 782837762..4f35b07ee 100644
--- a/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
+++ b/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/CaseSensitiveUDT.java b/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/CaseSensitiveUDT.java
index cffe4bf72..94462cddf 100644
--- a/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/CaseSensitiveUDT.java
+++ b/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/CaseSensitiveUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/EntityForGroupBy.java b/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/EntityForGroupBy.java
index fb16d8556..87af093f5 100644
--- a/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/EntityForGroupBy.java
+++ b/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/EntityForGroupBy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCaseSensitiveUdt.java b/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCaseSensitiveUdt.java
index a82334621..830278b01 100644
--- a/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCaseSensitiveUdt.java
+++ b/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/EntityWithCaseSensitiveUdt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/EntityWithDurationType.java b/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/EntityWithDurationType.java
index 93503fb27..30f419710 100644
--- a/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/EntityWithDurationType.java
+++ b/integration-test-3_10/src/main/java/info/archinnov/achilles/internals/entities/EntityWithDurationType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_10/src/test/java/info/archinnov/achilles/it/AbstractTestUtil.java b/integration-test-3_10/src/test/java/info/archinnov/achilles/it/AbstractTestUtil.java
index 56530b5f5..bdc2b25e7 100644
--- a/integration-test-3_10/src/test/java/info/archinnov/achilles/it/AbstractTestUtil.java
+++ b/integration-test-3_10/src/test/java/info/archinnov/achilles/it/AbstractTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestEntityForGroupByIT.java b/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestEntityForGroupByIT.java
index 4c139f196..2b932c7a2 100644
--- a/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestEntityForGroupByIT.java
+++ b/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestEntityForGroupByIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestEntityWithDurationTypeIT.java b/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestEntityWithDurationTypeIT.java
index c7b0dfb7e..7bd5ae31d 100644
--- a/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestEntityWithDurationTypeIT.java
+++ b/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestEntityWithDurationTypeIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestSchemaGenerator.java b/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestSchemaGenerator.java
index 7d937d990..da5c3bc43 100644
--- a/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestSchemaGenerator.java
+++ b/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestSchemaGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestUdtWithCaseSensitiveUDTIT.java b/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestUdtWithCaseSensitiveUDTIT.java
index bcd3afb75..bf1db50fd 100644
--- a/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestUdtWithCaseSensitiveUDTIT.java
+++ b/integration-test-3_10/src/test/java/info/archinnov/achilles/it/TestUdtWithCaseSensitiveUDTIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_2/pom.xml b/integration-test-3_2/pom.xml
index 7c85886cc..d7b604209 100644
--- a/integration-test-3_2/pom.xml
+++ b/integration-test-3_2/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-3_2/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java b/integration-test-3_2/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
index abdcdba2a..2006f65cb 100644
--- a/integration-test-3_2/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
+++ b/integration-test-3_2/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_2/src/main/java/info/archinnov/achilles/internals/config/FunctionsRegistry3_2.java b/integration-test-3_2/src/main/java/info/archinnov/achilles/internals/config/FunctionsRegistry3_2.java
index 1f438c5ea..eb17d7192 100644
--- a/integration-test-3_2/src/main/java/info/archinnov/achilles/internals/config/FunctionsRegistry3_2.java
+++ b/integration-test-3_2/src/main/java/info/archinnov/achilles/internals/config/FunctionsRegistry3_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_2/src/main/java/info/archinnov/achilles/internals/entities/EntityForCastFunctionCall.java b/integration-test-3_2/src/main/java/info/archinnov/achilles/internals/entities/EntityForCastFunctionCall.java
index 9435a3bee..919db50d1 100644
--- a/integration-test-3_2/src/main/java/info/archinnov/achilles/internals/entities/EntityForCastFunctionCall.java
+++ b/integration-test-3_2/src/main/java/info/archinnov/achilles/internals/entities/EntityForCastFunctionCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_2/src/main/resources/logback.xml b/integration-test-3_2/src/main/resources/logback.xml
index c81b4e816..36edfc0b1 100644
--- a/integration-test-3_2/src/main/resources/logback.xml
+++ b/integration-test-3_2/src/main/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-3_2/src/test/java/info/archinnov/achilles/it/TestCastFunctionCallIT.java b/integration-test-3_2/src/test/java/info/archinnov/achilles/it/TestCastFunctionCallIT.java
index 52440cd97..164c3cda4 100644
--- a/integration-test-3_2/src/test/java/info/archinnov/achilles/it/TestCastFunctionCallIT.java
+++ b/integration-test-3_2/src/test/java/info/archinnov/achilles/it/TestCastFunctionCallIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_6/pom.xml b/integration-test-3_6/pom.xml
index 8e34c5c65..bb11ecf3a 100644
--- a/integration-test-3_6/pom.xml
+++ b/integration-test-3_6/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java b/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
index fa00e88b0..7787307ef 100644
--- a/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
+++ b/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/AddressUDT.java b/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/AddressUDT.java
index 8afbe9aa1..a44cd9cb5 100644
--- a/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/AddressUDT.java
+++ b/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/AddressUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/EntityWithClustering.java b/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/EntityWithClustering.java
index 33656fae6..7d7f1c324 100644
--- a/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/EntityWithClustering.java
+++ b/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/EntityWithClustering.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNonFrozenUDT.java b/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNonFrozenUDT.java
index 6dc627687..2e8f00681 100644
--- a/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNonFrozenUDT.java
+++ b/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/EntityWithNonFrozenUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/NonFrozenUDT.java b/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/NonFrozenUDT.java
index 76193bfc1..02dbeb55b 100644
--- a/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/NonFrozenUDT.java
+++ b/integration-test-3_6/src/main/java/info/archinnov/achilles/internals/entities/NonFrozenUDT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_6/src/main/resources/logback.xml b/integration-test-3_6/src/main/resources/logback.xml
index a3c0ee5cc..288630535 100644
--- a/integration-test-3_6/src/main/resources/logback.xml
+++ b/integration-test-3_6/src/main/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-3_6/src/test/java/info/archinnov/achilles/it/TestEntityWithClusteringIT.java b/integration-test-3_6/src/test/java/info/archinnov/achilles/it/TestEntityWithClusteringIT.java
index 2c47f247b..3371cd91b 100644
--- a/integration-test-3_6/src/test/java/info/archinnov/achilles/it/TestEntityWithClusteringIT.java
+++ b/integration-test-3_6/src/test/java/info/archinnov/achilles/it/TestEntityWithClusteringIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_6/src/test/java/info/archinnov/achilles/it/TestEntityWithNonFrozenUDTIT.java b/integration-test-3_6/src/test/java/info/archinnov/achilles/it/TestEntityWithNonFrozenUDTIT.java
index 01defafdc..c907ac498 100644
--- a/integration-test-3_6/src/test/java/info/archinnov/achilles/it/TestEntityWithNonFrozenUDTIT.java
+++ b/integration-test-3_6/src/test/java/info/archinnov/achilles/it/TestEntityWithNonFrozenUDTIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_7/pom.xml b/integration-test-3_7/pom.xml
index e8a1e377f..e8d35a9f8 100644
--- a/integration-test-3_7/pom.xml
+++ b/integration-test-3_7/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-3_7/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java b/integration-test-3_7/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
index 3b94986f2..6d619e685 100644
--- a/integration-test-3_7/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
+++ b/integration-test-3_7/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_7/src/main/java/info/archinnov/achilles/internals/entities/EntityWithSASIIndices.java b/integration-test-3_7/src/main/java/info/archinnov/achilles/internals/entities/EntityWithSASIIndices.java
index 0f9ea7c3c..17db8a286 100644
--- a/integration-test-3_7/src/main/java/info/archinnov/achilles/internals/entities/EntityWithSASIIndices.java
+++ b/integration-test-3_7/src/main/java/info/archinnov/achilles/internals/entities/EntityWithSASIIndices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_7/src/main/resources/logback.xml b/integration-test-3_7/src/main/resources/logback.xml
index a3c0ee5cc..288630535 100644
--- a/integration-test-3_7/src/main/resources/logback.xml
+++ b/integration-test-3_7/src/main/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-3_7/src/test/java/info/archinnov/achilles/it/TestEntityWithSASIIndices.java b/integration-test-3_7/src/test/java/info/archinnov/achilles/it/TestEntityWithSASIIndices.java
index 661aff741..f587a5150 100644
--- a/integration-test-3_7/src/test/java/info/archinnov/achilles/it/TestEntityWithSASIIndices.java
+++ b/integration-test-3_7/src/test/java/info/archinnov/achilles/it/TestEntityWithSASIIndices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_8/pom.xml b/integration-test-3_8/pom.xml
index 7e489e1d1..8fe56695c 100644
--- a/integration-test-3_8/pom.xml
+++ b/integration-test-3_8/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-3_8/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java b/integration-test-3_8/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
index 28184b474..051eeaa24 100644
--- a/integration-test-3_8/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
+++ b/integration-test-3_8/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_8/src/main/java/info/archinnov/achilles/internals/config/FunctionRegistry3_8.java b/integration-test-3_8/src/main/java/info/archinnov/achilles/internals/config/FunctionRegistry3_8.java
index 121d8a652..0c818d125 100644
--- a/integration-test-3_8/src/main/java/info/archinnov/achilles/internals/config/FunctionRegistry3_8.java
+++ b/integration-test-3_8/src/main/java/info/archinnov/achilles/internals/config/FunctionRegistry3_8.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_8/src/main/java/info/archinnov/achilles/internals/entities/EntityForAggregate.java b/integration-test-3_8/src/main/java/info/archinnov/achilles/internals/entities/EntityForAggregate.java
index fa68f852b..63f1e33af 100644
--- a/integration-test-3_8/src/main/java/info/archinnov/achilles/internals/entities/EntityForAggregate.java
+++ b/integration-test-3_8/src/main/java/info/archinnov/achilles/internals/entities/EntityForAggregate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-3_8/src/test/java/info/archinnov/achilles/it/TestFunctionCallsWithLiteralValuesIT.java b/integration-test-3_8/src/test/java/info/archinnov/achilles/it/TestFunctionCallsWithLiteralValuesIT.java
index 116fef7d7..d59ab7f38 100644
--- a/integration-test-3_8/src/test/java/info/archinnov/achilles/it/TestFunctionCallsWithLiteralValuesIT.java
+++ b/integration-test-3_8/src/test/java/info/archinnov/achilles/it/TestFunctionCallsWithLiteralValuesIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-DSE_4-8/pom.xml b/integration-test-DSE_4-8/pom.xml
index d9bc311ba..df3236a2d 100644
--- a/integration-test-DSE_4-8/pom.xml
+++ b/integration-test-DSE_4-8/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-DSE_4-8/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java b/integration-test-DSE_4-8/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
index f7e5a0db7..ed12cb2ce 100644
--- a/integration-test-DSE_4-8/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
+++ b/integration-test-DSE_4-8/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-DSE_4-8/src/main/java/info/archinnov/achilles/internals/entities/EntityWithDSESearch.java b/integration-test-DSE_4-8/src/main/java/info/archinnov/achilles/internals/entities/EntityWithDSESearch.java
index 96a1723b3..b1a42b503 100644
--- a/integration-test-DSE_4-8/src/main/java/info/archinnov/achilles/internals/entities/EntityWithDSESearch.java
+++ b/integration-test-DSE_4-8/src/main/java/info/archinnov/achilles/internals/entities/EntityWithDSESearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-DSE_4-8/src/main/resources/logback.xml b/integration-test-DSE_4-8/src/main/resources/logback.xml
index 3c5345f0a..9f5e2e23b 100644
--- a/integration-test-DSE_4-8/src/main/resources/logback.xml
+++ b/integration-test-DSE_4-8/src/main/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-DSE_4-8/src/test/java/info/archinnov/achilles/it/TestEntityWithDSESearch.java b/integration-test-DSE_4-8/src/test/java/info/archinnov/achilles/it/TestEntityWithDSESearch.java
index a29156361..fd371c660 100644
--- a/integration-test-DSE_4-8/src/test/java/info/archinnov/achilles/it/TestEntityWithDSESearch.java
+++ b/integration-test-DSE_4-8/src/test/java/info/archinnov/achilles/it/TestEntityWithDSESearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-DSE_5-0-0/pom.xml b/integration-test-DSE_5-0-0/pom.xml
index 66c0f25c5..c014421bf 100644
--- a/integration-test-DSE_5-0-0/pom.xml
+++ b/integration-test-DSE_5-0-0/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-DSE_5-0-0/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java b/integration-test-DSE_5-0-0/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
index 04df27f14..3f333cc51 100644
--- a/integration-test-DSE_5-0-0/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
+++ b/integration-test-DSE_5-0-0/src/main/java/info/archinnov/achilles/internals/config/AchillesConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-DSE_5-0-0/src/main/java/info/archinnov/achilles/internals/entities/EntityWithDSESearchJSON.java b/integration-test-DSE_5-0-0/src/main/java/info/archinnov/achilles/internals/entities/EntityWithDSESearchJSON.java
index aa27d3344..199cc8c18 100644
--- a/integration-test-DSE_5-0-0/src/main/java/info/archinnov/achilles/internals/entities/EntityWithDSESearchJSON.java
+++ b/integration-test-DSE_5-0-0/src/main/java/info/archinnov/achilles/internals/entities/EntityWithDSESearchJSON.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/integration-test-DSE_5-0-0/src/main/resources/logback.xml b/integration-test-DSE_5-0-0/src/main/resources/logback.xml
index 3c5345f0a..9f5e2e23b 100644
--- a/integration-test-DSE_5-0-0/src/main/resources/logback.xml
+++ b/integration-test-DSE_5-0-0/src/main/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/integration-test-DSE_5-0-0/src/test/java/info/archinnov/achilles/it/TestEntityWithDSESearchJSON.java b/integration-test-DSE_5-0-0/src/test/java/info/archinnov/achilles/it/TestEntityWithDSESearchJSON.java
index 49dc1a0e4..cf2b08ab8 100644
--- a/integration-test-DSE_5-0-0/src/test/java/info/archinnov/achilles/it/TestEntityWithDSESearchJSON.java
+++ b/integration-test-DSE_5-0-0/src/test/java/info/archinnov/achilles/it/TestEntityWithDSESearchJSON.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019 DuyHai DOAN
+ * Copyright (C) 2012-2021 DuyHai DOAN
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/pom.xml b/pom.xml
index 4e4974b3f..46cc0daa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2012-2019 DuyHai DOAN
+  ~ Copyright (C) 2012-2021 DuyHai DOAN
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.