diff --git a/LICENSE b/LICENSE
index cc26fda..b3196a3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2018-2021 FusionSoft
+Copyright (C) 2018-2022 FusionSoft
 
 Licensed 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 40d8ef9..39b30a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2018-2021 FusionSoft
+  ~ Copyright (C) 2018-2022 FusionSoft
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ You may not use this file except in compliance with the License.
@@ -79,6 +79,7 @@
                     <license>file:${basedir}/LICENSE</license>
                     <excludes>
                         <exclude>checkstyle:.*yaml$</exclude>
+                        <exclude>checkstyle:.*ResultSetOfScalar.java$</exclude>
                         <exclude>findbugs:.*</exclude>
                         <exclude>duplicatefinder:.*</exclude>
                     </excludes>
diff --git a/src/main/java/org/fusionsoft/database/DbdFile.java b/src/main/java/org/fusionsoft/database/DbdFile.java
index 47bff44..2bb5aee 100644
--- a/src/main/java/org/fusionsoft/database/DbdFile.java
+++ b/src/main/java/org/fusionsoft/database/DbdFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/Folder.java b/src/main/java/org/fusionsoft/database/Folder.java
index 45e550d..1fd3fd2 100644
--- a/src/main/java/org/fusionsoft/database/Folder.java
+++ b/src/main/java/org/fusionsoft/database/Folder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/SimpleYamlRepresentative.java b/src/main/java/org/fusionsoft/database/SimpleYamlRepresentative.java
index 682ab77..a736c77 100644
--- a/src/main/java/org/fusionsoft/database/SimpleYamlRepresentative.java
+++ b/src/main/java/org/fusionsoft/database/SimpleYamlRepresentative.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/SnapshotCreateProcedure.java b/src/main/java/org/fusionsoft/database/SnapshotCreateProcedure.java
index d20dd0d..8140408 100644
--- a/src/main/java/org/fusionsoft/database/SnapshotCreateProcedure.java
+++ b/src/main/java/org/fusionsoft/database/SnapshotCreateProcedure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/TextEnumValueOf.java b/src/main/java/org/fusionsoft/database/TextEnumValueOf.java
index a887b84..23dd755 100644
--- a/src/main/java/org/fusionsoft/database/TextEnumValueOf.java
+++ b/src/main/java/org/fusionsoft/database/TextEnumValueOf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/Writable.java b/src/main/java/org/fusionsoft/database/Writable.java
index c51f2f5..304c073 100644
--- a/src/main/java/org/fusionsoft/database/Writable.java
+++ b/src/main/java/org/fusionsoft/database/Writable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/WriteTo.java b/src/main/java/org/fusionsoft/database/WriteTo.java
index 294b66d..b9b7f8a 100644
--- a/src/main/java/org/fusionsoft/database/WriteTo.java
+++ b/src/main/java/org/fusionsoft/database/WriteTo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/YamlRepresentative.java b/src/main/java/org/fusionsoft/database/YamlRepresentative.java
index b92e7a0..796bc4a 100644
--- a/src/main/java/org/fusionsoft/database/YamlRepresentative.java
+++ b/src/main/java/org/fusionsoft/database/YamlRepresentative.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/connection/ConnectionOfDbdServerMapping.java b/src/main/java/org/fusionsoft/database/connection/ConnectionOfDbdServerMapping.java
index 38d78ef..15965e5 100644
--- a/src/main/java/org/fusionsoft/database/connection/ConnectionOfDbdServerMapping.java
+++ b/src/main/java/org/fusionsoft/database/connection/ConnectionOfDbdServerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/connection/package-info.java b/src/main/java/org/fusionsoft/database/connection/package-info.java
index 3d3f03d..8859e92 100644
--- a/src/main/java/org/fusionsoft/database/connection/package-info.java
+++ b/src/main/java/org/fusionsoft/database/connection/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/dbdfile/DbdFileOfMapping.java b/src/main/java/org/fusionsoft/database/dbdfile/DbdFileOfMapping.java
index 6408776..22fb075 100644
--- a/src/main/java/org/fusionsoft/database/dbdfile/DbdFileOfMapping.java
+++ b/src/main/java/org/fusionsoft/database/dbdfile/DbdFileOfMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/dbdfile/DbdFileOfRootMapping.java b/src/main/java/org/fusionsoft/database/dbdfile/DbdFileOfRootMapping.java
index 8728e70..2d07edc 100644
--- a/src/main/java/org/fusionsoft/database/dbdfile/DbdFileOfRootMapping.java
+++ b/src/main/java/org/fusionsoft/database/dbdfile/DbdFileOfRootMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/dbdfile/DbdFileOfSnapshotObjects.java b/src/main/java/org/fusionsoft/database/dbdfile/DbdFileOfSnapshotObjects.java
index b62c97b..cd884f5 100644
--- a/src/main/java/org/fusionsoft/database/dbdfile/DbdFileOfSnapshotObjects.java
+++ b/src/main/java/org/fusionsoft/database/dbdfile/DbdFileOfSnapshotObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/dbdfile/package-info.java b/src/main/java/org/fusionsoft/database/dbdfile/package-info.java
index 26736b2..5176e07 100644
--- a/src/main/java/org/fusionsoft/database/dbdfile/package-info.java
+++ b/src/main/java/org/fusionsoft/database/dbdfile/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/folder/FolderOfScalar.java b/src/main/java/org/fusionsoft/database/folder/FolderOfScalar.java
index a513482..804e879 100644
--- a/src/main/java/org/fusionsoft/database/folder/FolderOfScalar.java
+++ b/src/main/java/org/fusionsoft/database/folder/FolderOfScalar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/folder/package-info.java b/src/main/java/org/fusionsoft/database/folder/package-info.java
new file mode 100644
index 0000000..6e89960
--- /dev/null
+++ b/src/main/java/org/fusionsoft/database/folder/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2018-2022 FusionSoft
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied.
+ *
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+/**
+ * Package for {@link org.fusionsoft.database.Folder} iface implementations.
+ */
+package org.fusionsoft.database.folder;
diff --git a/src/main/java/org/fusionsoft/database/mapping/MappingOfExampleYaml.java b/src/main/java/org/fusionsoft/database/mapping/MappingOfExampleYaml.java
index 81a815e..6cf5fe8 100644
--- a/src/main/java/org/fusionsoft/database/mapping/MappingOfExampleYaml.java
+++ b/src/main/java/org/fusionsoft/database/mapping/MappingOfExampleYaml.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/MappingOfRepresentative.java b/src/main/java/org/fusionsoft/database/mapping/MappingOfRepresentative.java
index 29a060a..861ba27 100644
--- a/src/main/java/org/fusionsoft/database/mapping/MappingOfRepresentative.java
+++ b/src/main/java/org/fusionsoft/database/mapping/MappingOfRepresentative.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdColumnMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdColumnMapping.java
index c4f11b0..04657e2 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdColumnMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdColumnMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdColumnValidation.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdColumnValidation.java
index fceaad3..d589f38 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdColumnValidation.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdColumnValidation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdConstraintMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdConstraintMapping.java
index 531a93b..bc6b483 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdConstraintMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdConstraintMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdDataMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdDataMapping.java
index e1e55c6..7bd8a62 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdDataMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdDataMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdDomainConstraintMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdDomainConstraintMapping.java
index 77864a6..7cbf452 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdDomainConstraintMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdDomainConstraintMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdDomainMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdDomainMapping.java
index 17cdf0f..83e9850 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdDomainMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdDomainMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdEnumMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdEnumMapping.java
index c865140..55a09d1 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdEnumMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdEnumMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdFunctionMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdFunctionMapping.java
index 1b192fc..71b0b55 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdFunctionMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdFunctionMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdIndexMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdIndexMapping.java
index 186d292..bed9b57 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdIndexMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdIndexMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdInfoMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdInfoMapping.java
index 2846c90..96bf02f 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdInfoMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdInfoMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdProcedureMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdProcedureMapping.java
index 167222f..0f17460 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdProcedureMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdProcedureMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdRootMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdRootMapping.java
index fd3c4de..5f67390 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdRootMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdRootMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdRootNodeValidation.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdRootNodeValidation.java
index fed3065..1aacd1d 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdRootNodeValidation.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdRootNodeValidation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdSchemaMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdSchemaMapping.java
index cf6a8d0..9cace19 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdSchemaMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdSchemaMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdSequenceMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdSequenceMapping.java
index c3e2be5..042d5de 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdSequenceMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdSequenceMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdServerEntry.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdServerEntry.java
index 2846db3..ca9edfe 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdServerEntry.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdServerEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdServerMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdServerMapping.java
index b0414df..12b7737 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdServerMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdServerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdServersMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdServersMapping.java
index 698bebe..97093a0 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdServersMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdServersMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTableMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTableMapping.java
index 92d4e06..26a0d44 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTableMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTableMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTriggerMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTriggerMapping.java
index 749bde4..4d735de 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTriggerMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTriggerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTupleAttributeMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTupleAttributeMapping.java
index 19be1f6..134e22c 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTupleAttributeMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTupleAttributeMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTupleMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTupleMapping.java
index 4e12f47..083d5e1 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTupleMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdTupleMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdViewMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdViewMapping.java
index 691a04d..3d94307 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/DbdViewMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/DbdViewMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/TextOfDbdDefaultJsonSchemaRef.java b/src/main/java/org/fusionsoft/database/mapping/dbd/TextOfDbdDefaultJsonSchemaRef.java
index b8ce505..5718d3f 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/TextOfDbdDefaultJsonSchemaRef.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/TextOfDbdDefaultJsonSchemaRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdDataMappingOfEntries.java b/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdDataMappingOfEntries.java
index 61f27a6..31fefdf 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdDataMappingOfEntries.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdDataMappingOfEntries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdDataMappingOfValue.java b/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdDataMappingOfValue.java
index ec3e131..1b4a2c9 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdDataMappingOfValue.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdDataMappingOfValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdRootMappingBuilt.java b/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdRootMappingBuilt.java
index cd6a44a..ffa0b89 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdRootMappingBuilt.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdRootMappingBuilt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdServerMappingWithCredentials.java b/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdServerMappingWithCredentials.java
index 9af60a4..83c1709 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdServerMappingWithCredentials.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdServerMappingWithCredentials.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdTableMappingOfEntries.java b/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdTableMappingOfEntries.java
index 67a0255..7c094d6 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdTableMappingOfEntries.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/built/DbdTableMappingOfEntries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/built/SimpleDbdInfoMapping.java b/src/main/java/org/fusionsoft/database/mapping/dbd/built/SimpleDbdInfoMapping.java
index 58514d1..79907a6 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/built/SimpleDbdInfoMapping.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/built/SimpleDbdInfoMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/built/package-info.java b/src/main/java/org/fusionsoft/database/mapping/dbd/built/package-info.java
index b25a40c..fd25be5 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/built/package-info.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/built/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/DbdInfoMappingOfDbdFile.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/DbdInfoMappingOfDbdFile.java
index 0c008cb..8a7d543 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/DbdInfoMappingOfDbdFile.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/DbdInfoMappingOfDbdFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/DbdServerEntryOfDbdFile.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/DbdServerEntryOfDbdFile.java
index 24da767..3109bf8 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/DbdServerEntryOfDbdFile.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/DbdServerEntryOfDbdFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/DbdServerMappingOfDbdFile.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/DbdServerMappingOfDbdFile.java
index 88abfcd..d7784cb 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/DbdServerMappingOfDbdFile.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/DbdServerMappingOfDbdFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/package-info.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/package-info.java
index 0280c69..c2c7559 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/package-info.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofdbdfile/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdColumnMappingsOfTable.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdColumnMappingsOfTable.java
index fe3440b..0a2211f 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdColumnMappingsOfTable.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdColumnMappingsOfTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdDomainsMappingOfObjects.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdDomainsMappingOfObjects.java
index 57c98f6..a2d7083 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdDomainsMappingOfObjects.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdDomainsMappingOfObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdEnumsMappingOfObjects.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdEnumsMappingOfObjects.java
index 19e20b1..5702eee 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdEnumsMappingOfObjects.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdEnumsMappingOfObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdFunctionsMappingOfObjects.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdFunctionsMappingOfObjects.java
index 42a3cd0..d5783e9 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdFunctionsMappingOfObjects.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdFunctionsMappingOfObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdProceduresMappingOfObjects.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdProceduresMappingOfObjects.java
index c968c2f..b4dfa46 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdProceduresMappingOfObjects.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdProceduresMappingOfObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdRootMappingOfSnapshotObjects.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdRootMappingOfSnapshotObjects.java
index 8a6a729..94a6829 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdRootMappingOfSnapshotObjects.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdRootMappingOfSnapshotObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdSchemaMappingOfObjects.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdSchemaMappingOfObjects.java
index a54cc5a..15aa37e 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdSchemaMappingOfObjects.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdSchemaMappingOfObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdSchemasMappingOfObjects.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdSchemasMappingOfObjects.java
index d1168b2..bc02a94 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdSchemasMappingOfObjects.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdSchemasMappingOfObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdSequencesMappingOfObjects.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdSequencesMappingOfObjects.java
index 84fc2c1..5e405ca 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdSequencesMappingOfObjects.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdSequencesMappingOfObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdTuplesMappingOfObjects.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdTuplesMappingOfObjects.java
index e16fdb2..d4a16bb 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdTuplesMappingOfObjects.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/DbdTuplesMappingOfObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/package-info.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/package-info.java
index 175d98b..36f69f3 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/package-info.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofobjects/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofresultset/DomainConstraintMappingOfResultSet.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofresultset/DomainConstraintMappingOfResultSet.java
index 1530af6..1a44d1b 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofresultset/DomainConstraintMappingOfResultSet.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofresultset/DomainConstraintMappingOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofresultset/TupleAttributeMappingOfResultSet.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofresultset/TupleAttributeMappingOfResultSet.java
index 9e39512..6ba5fc5 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/ofresultset/TupleAttributeMappingOfResultSet.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofresultset/TupleAttributeMappingOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/ofresultset/package-info.java b/src/main/java/org/fusionsoft/database/mapping/dbd/ofresultset/package-info.java
new file mode 100644
index 0000000..a66de5e
--- /dev/null
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/ofresultset/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2018-2022 FusionSoft
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied.
+ *
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+/**
+ * Package for artifacts, can be constructed of {@link java.sql.ResultSet}.
+ */
+package org.fusionsoft.database.mapping.dbd.ofresultset;
diff --git a/src/main/java/org/fusionsoft/database/mapping/dbd/package-info.java b/src/main/java/org/fusionsoft/database/mapping/dbd/package-info.java
index e4a5e6f..9832bdd 100644
--- a/src/main/java/org/fusionsoft/database/mapping/dbd/package-info.java
+++ b/src/main/java/org/fusionsoft/database/mapping/dbd/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/entries/EntriesOfYamlRepresentative.java b/src/main/java/org/fusionsoft/database/mapping/entries/EntriesOfYamlRepresentative.java
index 356861f..31cf036 100644
--- a/src/main/java/org/fusionsoft/database/mapping/entries/EntriesOfYamlRepresentative.java
+++ b/src/main/java/org/fusionsoft/database/mapping/entries/EntriesOfYamlRepresentative.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/entries/MultilineScalarEntry.java b/src/main/java/org/fusionsoft/database/mapping/entries/MultilineScalarEntry.java
index 966f864..371717b 100644
--- a/src/main/java/org/fusionsoft/database/mapping/entries/MultilineScalarEntry.java
+++ b/src/main/java/org/fusionsoft/database/mapping/entries/MultilineScalarEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/entries/ScalarEntry.java b/src/main/java/org/fusionsoft/database/mapping/entries/ScalarEntry.java
index 1748a0b..5711428 100644
--- a/src/main/java/org/fusionsoft/database/mapping/entries/ScalarEntry.java
+++ b/src/main/java/org/fusionsoft/database/mapping/entries/ScalarEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/entries/ScalarEntryOfResultSet.java b/src/main/java/org/fusionsoft/database/mapping/entries/ScalarEntryOfResultSet.java
index 0af63be..be7f4c8 100644
--- a/src/main/java/org/fusionsoft/database/mapping/entries/ScalarEntryOfResultSet.java
+++ b/src/main/java/org/fusionsoft/database/mapping/entries/ScalarEntryOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/entries/UnwrapEntriesOfObjects.java b/src/main/java/org/fusionsoft/database/mapping/entries/UnwrapEntriesOfObjects.java
index d309a24..a573adc 100644
--- a/src/main/java/org/fusionsoft/database/mapping/entries/UnwrapEntriesOfObjects.java
+++ b/src/main/java/org/fusionsoft/database/mapping/entries/UnwrapEntriesOfObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/entries/package-info.java b/src/main/java/org/fusionsoft/database/mapping/entries/package-info.java
index 9e00ced..8cbb5bf 100644
--- a/src/main/java/org/fusionsoft/database/mapping/entries/package-info.java
+++ b/src/main/java/org/fusionsoft/database/mapping/entries/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdColumnFields.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdColumnFields.java
index b4a1899..b4babbf 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdColumnFields.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdColumnFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdConstraintFields.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdConstraintFields.java
index ba35188..452bccf 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdConstraintFields.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdConstraintFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdDomainConstraintFields.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdDomainConstraintFields.java
index eae2213..665d52c 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdDomainConstraintFields.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdDomainConstraintFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdDomainFields.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdDomainFields.java
index 78f2ff4..9619145 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdDomainFields.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdDomainFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdEnumField.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdEnumField.java
index 35d4e79..d83f673 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdEnumField.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdEnumField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdFunctionFields.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdFunctionFields.java
index e4be769..2303934 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdFunctionFields.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdFunctionFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdIndexFields.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdIndexFields.java
index eecc3d8..4735e8d 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdIndexFields.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdIndexFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdInfoFields.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdInfoFields.java
index 72307b4..e5f134c 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdInfoFields.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdInfoFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdRootFields.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdRootFields.java
index b80cae3..5ffe89d 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdRootFields.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdRootFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdSchemaFields.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdSchemaFields.java
index aa8719f..6ad67f8 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdSchemaFields.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdSchemaFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdSequenceFields.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdSequenceFields.java
index d1d2ebf..54353e3 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdSequenceFields.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdSequenceFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdServerFields.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdServerFields.java
index f695ed7..a062a23 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdServerFields.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdServerFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdTableFields.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdTableFields.java
index 5e4018b..5c810e9 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdTableFields.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdTableFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdTriggerFields.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdTriggerFields.java
index e99e334..b1f51c1 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdTriggerFields.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdTriggerFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdTupleAttributeField.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdTupleAttributeField.java
index 4177bb2..57db59c 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdTupleAttributeField.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdTupleAttributeField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdTupleField.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdTupleField.java
index 5cd93c8..53fe905 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdTupleField.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdTupleField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/DbdViewFields.java b/src/main/java/org/fusionsoft/database/mapping/fields/DbdViewFields.java
index 53b5f6f..87e6e54 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/DbdViewFields.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/DbdViewFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/fields/package-info.java b/src/main/java/org/fusionsoft/database/mapping/fields/package-info.java
index b517a80..e19af7a 100644
--- a/src/main/java/org/fusionsoft/database/mapping/fields/package-info.java
+++ b/src/main/java/org/fusionsoft/database/mapping/fields/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/package-info.java b/src/main/java/org/fusionsoft/database/mapping/package-info.java
index ad6e799..259a9b0 100644
--- a/src/main/java/org/fusionsoft/database/mapping/package-info.java
+++ b/src/main/java/org/fusionsoft/database/mapping/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/mapping/value/package-info.java b/src/main/java/org/fusionsoft/database/mapping/value/package-info.java
new file mode 100644
index 0000000..a774684
--- /dev/null
+++ b/src/main/java/org/fusionsoft/database/mapping/value/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2018-2022 FusionSoft
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied.
+ *
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+/**
+ * Package for values enumerations of specific fields from mappings.
+ */
+package org.fusionsoft.database.mapping.value;
diff --git a/src/main/java/org/fusionsoft/database/package-info.java b/src/main/java/org/fusionsoft/database/package-info.java
index 55aed73..0852a94 100644
--- a/src/main/java/org/fusionsoft/database/package-info.java
+++ b/src/main/java/org/fusionsoft/database/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/AstronomicalTime.java b/src/main/java/org/fusionsoft/database/snapshot/AstronomicalTime.java
index e308569..924b9ff 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/AstronomicalTime.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/AstronomicalTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/CreatingSnapshotFolder.java b/src/main/java/org/fusionsoft/database/snapshot/CreatingSnapshotFolder.java
index 000d9bb..3237fb8 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/CreatingSnapshotFolder.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/CreatingSnapshotFolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/DbObject.java b/src/main/java/org/fusionsoft/database/snapshot/DbObject.java
index bb1e479..8e568e6 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/DbObject.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/DbObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/Dbms.java b/src/main/java/org/fusionsoft/database/snapshot/Dbms.java
index 3d24324..707f3a0 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/Dbms.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/Dbms.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/HashTextOf.java b/src/main/java/org/fusionsoft/database/snapshot/HashTextOf.java
index 9a99cd7..d805438 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/HashTextOf.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/HashTextOf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/ObjectSignature.java b/src/main/java/org/fusionsoft/database/snapshot/ObjectSignature.java
index 6b9a25b..09cdcb6 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/ObjectSignature.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/ObjectSignature.java
@@ -48,6 +48,6 @@ public interface ObjectSignature extends Text {
      * @param other The other {@link ObjectSignature}.
      * @return The boolean.
      */
-    boolean equals(ObjectSignature other);
+    boolean equalsTo(ObjectSignature other);
 
 }
diff --git a/src/main/java/org/fusionsoft/database/snapshot/SnapshotCatalogName.java b/src/main/java/org/fusionsoft/database/snapshot/SnapshotCatalogName.java
index 1911f80..ef29896 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/SnapshotCatalogName.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/SnapshotCatalogName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/data/RowOfArray.java b/src/main/java/org/fusionsoft/database/snapshot/data/RowOfArray.java
index b8d0c15..dc1c551 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/data/RowOfArray.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/data/RowOfArray.java
@@ -24,7 +24,7 @@ public class RowOfArray implements Row {
     /**
      * The label encapsulated.
      */
-    private final String label;
+    private final String text;
 
     /**
      * The array encapsulated.
@@ -36,8 +36,9 @@ public class RowOfArray implements Row {
      * @param label The label {@link String} to be encapsulated.
      * @param array The array of {@link String} to be encapsulated.
      */
-    public RowOfArray(final String label, final String[] array) {
-        this.label = label;
+    @SuppressWarnings("PMD.ArrayIsStoredDirectly")
+    public RowOfArray(final String label, final String... array) {
+        this.text = label;
         this.array = array;
     }
 
@@ -48,7 +49,7 @@ public final String textOf(final Column column) {
 
     @Override
     public final String label() {
-        return this.label;
+        return this.text;
     }
 
 }
diff --git a/src/main/java/org/fusionsoft/database/snapshot/data/RowsOfTable.java b/src/main/java/org/fusionsoft/database/snapshot/data/RowsOfTable.java
index 8d24a20..2ca3c99 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/data/RowsOfTable.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/data/RowsOfTable.java
@@ -44,6 +44,7 @@ public class RowsOfTable extends IterableAutoCloseable<Row> {
      * @param rset The {@link ResultSet} to be encapsulated.
      * @param iterator The {@link Scalar} of {@link Iterator} of {@link Row} to be encapsulated.
      */
+    @SuppressWarnings("PMD.UnusedFormalParameter")
     private RowsOfTable(
         final Statement stmt,
         final ResultSet rset,
diff --git a/src/main/java/org/fusionsoft/database/snapshot/data/ValueFormatDate.java b/src/main/java/org/fusionsoft/database/snapshot/data/ValueFormatDate.java
index 798cb1b..f930b49 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/data/ValueFormatDate.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/data/ValueFormatDate.java
@@ -18,9 +18,10 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import org.cactoos.Text;
+import org.fusionsoft.lib.exception.NotImplemented;
 
 /**
- * The type of that can be constructed of.
+ * The {@link ValueFormat} of date.
  * @since 0.1
  */
 public class ValueFormatDate implements ValueFormat {
@@ -35,16 +36,17 @@ public final void passInPrepareStatement(
         final PreparedStatement stmt,
         final int ordinal, final Text text
     ) {
+        throw new NotImplemented();
     }
 
     @Override
     public final String ofResultSet(final ResultSet rset, final int ordinal) {
-        return null;
+        throw new NotImplemented();
     }
 
     @Override
     public final String ofResultSet(final ResultSet rset, final String key) {
-        return null;
+        throw new NotImplemented();
     }
 
 }
diff --git a/src/main/java/org/fusionsoft/database/snapshot/data/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/data/package-info.java
new file mode 100644
index 0000000..631a0d0
--- /dev/null
+++ b/src/main/java/org/fusionsoft/database/snapshot/data/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2018-2022 FusionSoft
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied.
+ *
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+/**
+ * Package for classes of fetching table's data.
+ */
+package org.fusionsoft.database.snapshot.data;
diff --git a/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsOfConnection.java b/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsOfConnection.java
index d5b262c..3d73410 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsOfConnection.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsOfConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsOfScalar.java b/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsOfScalar.java
index 3c5eaa1..79f21a6 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsOfScalar.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsOfScalar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsOfText.java b/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsOfText.java
index 82a9a6f..5331082 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsOfText.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsOfText.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsVersionOfConnection.java b/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsVersionOfConnection.java
index 33275ed..8189047 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsVersionOfConnection.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/dbms/DbmsVersionOfConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/dbms/MsSqlDbms.java b/src/main/java/org/fusionsoft/database/snapshot/dbms/MsSqlDbms.java
index 03b7cf2..52448b5 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/dbms/MsSqlDbms.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/dbms/MsSqlDbms.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/dbms/MySqlDbms.java b/src/main/java/org/fusionsoft/database/snapshot/dbms/MySqlDbms.java
index d48718a..03782f0 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/dbms/MySqlDbms.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/dbms/MySqlDbms.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/dbms/OracleDbms.java b/src/main/java/org/fusionsoft/database/snapshot/dbms/OracleDbms.java
index 5c4c11a..703af4b 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/dbms/OracleDbms.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/dbms/OracleDbms.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/dbms/PostgresDbms.java b/src/main/java/org/fusionsoft/database/snapshot/dbms/PostgresDbms.java
index 1b4874c..2810e75 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/dbms/PostgresDbms.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/dbms/PostgresDbms.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/dbms/SimpleDbms.java b/src/main/java/org/fusionsoft/database/snapshot/dbms/SimpleDbms.java
index 92a93c4..0fd85a1 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/dbms/SimpleDbms.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/dbms/SimpleDbms.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/dbms/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/dbms/package-info.java
index a85f2e4..a63a930 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/dbms/package-info.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/dbms/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ObjectsFiltered.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ObjectsFiltered.java
index 041c454..bd8d538 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ObjectsFiltered.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ObjectsFiltered.java
@@ -23,8 +23,8 @@
 
 /**
  * The type of DbObjects that was filtered by some predicate.
- * @since 0.1
  * @param <T> The subtype of {@link YamlNode} parameter.
+ * @since 0.1
  */
 public class ObjectsFiltered<T extends YamlNode> extends ObjectsEnvelope<T> {
 
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ObjectsOfScalar.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ObjectsOfScalar.java
index 5c418a1..9a7767d 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ObjectsOfScalar.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ObjectsOfScalar.java
@@ -22,8 +22,8 @@
 
 /**
  * The Objects of scalar.
- * @since 0.1
  * @param <T> The subtype of {@link YamlNode} parameter.
+ * @since 0.1
  */
 public class ObjectsOfScalar<T extends YamlNode> extends ObjectsEnvelope<T> {
 
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/SimpleDbObject.java b/src/main/java/org/fusionsoft/database/snapshot/objects/SimpleDbObject.java
index 78de758..49b4a68 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/SimpleDbObject.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/SimpleDbObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/SimpleDbObjectOfEntries.java b/src/main/java/org/fusionsoft/database/snapshot/objects/SimpleDbObjectOfEntries.java
index 29ec0a5..a12d7d5 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/SimpleDbObjectOfEntries.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/SimpleDbObjectOfEntries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/filtered/DataTablesOfObjects.java b/src/main/java/org/fusionsoft/database/snapshot/objects/filtered/DataTablesOfObjects.java
index ad7ab69..b187e1d 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/filtered/DataTablesOfObjects.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/filtered/DataTablesOfObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/filtered/ObjectsWithParent.java b/src/main/java/org/fusionsoft/database/snapshot/objects/filtered/ObjectsWithParent.java
index 1e12be6..5cabfd9 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/filtered/ObjectsWithParent.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/filtered/ObjectsWithParent.java
@@ -36,7 +36,7 @@ public class ObjectsWithParent<T extends YamlNode> extends ObjectsFiltered<T> {
      */
     public ObjectsWithParent(final DbObject<?> parent, final Objects<T> objects) {
         super(
-            obj -> obj.signature().name().parent().equals(
+            obj -> obj.signature().name().parent().equalsTo(
                 parent.signature().name()
             ),
             objects
@@ -50,7 +50,7 @@ public ObjectsWithParent(final DbObject<?> parent, final Objects<T> objects) {
      */
     public ObjectsWithParent(final ObjectName name, final Objects<T> objects) {
         super(
-            obj -> obj.signature().name().parent().equals(name),
+            obj -> obj.signature().name().parent().equalsTo(name),
             objects
         );
     }
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/filtered/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/objects/filtered/package-info.java
index ae36470..de1c261 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/filtered/package-info.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/filtered/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ConstraintOfDbdMapping.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ConstraintOfDbdMapping.java
index c89f5ee..1fde34a 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ConstraintOfDbdMapping.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ConstraintOfDbdMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/IndexOfDbdMapping.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/IndexOfDbdMapping.java
index b7a324e..c0a997d 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/IndexOfDbdMapping.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/IndexOfDbdMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdFile.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdFile.java
index 737941d..a939950 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdFile.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdIndexesMapping.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdIndexesMapping.java
index d549b59..72e3fb2 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdIndexesMapping.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdIndexesMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
@@ -30,6 +30,12 @@
  */
 public class ObjectsOfDbdIndexesMapping extends ObjectsEnvelope<DbdIndexMapping> {
 
+    /**
+     * Instantiates a new Objects of dbd indexes mapping.
+     * @param mapping The root's {@link YamlMapping} to be encapsulated.
+     * @param key The key's {@link Text} to be encapsulated.
+     * @param table The table's {@link ObjectName} to be encapsulated.
+     */
     public ObjectsOfDbdIndexesMapping(
         final YamlMapping mapping,
         final Text key,
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdRootMapping.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdRootMapping.java
index 7003f4f..077cce0 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdRootMapping.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdRootMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdSchemaMapping.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdSchemaMapping.java
index 3a89b87..8bbb7d1 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdSchemaMapping.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdSchemaMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdSchemasMapping.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdSchemasMapping.java
index c10c551..e3b6da6 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdSchemasMapping.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdSchemasMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdTableMapping.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdTableMapping.java
index caea63d..4a683b7 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdTableMapping.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdTableMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdTablesMapping.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdTablesMapping.java
index f7d82f3..85642ab 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdTablesMapping.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfDbdTablesMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfServerFromDbd.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfServerFromDbd.java
index 02ccd8a..fbe4f34 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfServerFromDbd.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/ObjectsOfServerFromDbd.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/package-info.java
index 2399df3..6111eb3 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/package-info.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbd/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromMssql.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromMssql.java
index 37d67be..e4c3125 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromMssql.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromMssql.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromMySql.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromMySql.java
index 8b835b9..1896c19 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromMySql.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromMySql.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromOracle.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromOracle.java
index 43f4bcb..aa59757 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromOracle.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromOracle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromPostgres.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromPostgres.java
index e5a9f3d..4569bb1 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromPostgres.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromPostgres.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromServer.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromServer.java
index 5532799..da975a5 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromServer.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsOfConnectionJoined.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsOfConnectionJoined.java
index f0caacb..5b04764 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsOfConnectionJoined.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsOfConnectionJoined.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/package-info.java
index 07519ab..b5e5f2a 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/package-info.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgConstraints.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgConstraints.java
index 2b467fd..ddcd55b 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgConstraints.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgConstraints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgDomains.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgDomains.java
index 872f4e8..0756d7c 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgDomains.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgDomains.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgEnums.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgEnums.java
index ce63c96..2b897dc 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgEnums.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgEnums.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgFunctions.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgFunctions.java
index b0d1713..3259f5e 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgFunctions.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgFunctions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgIndexes.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgIndexes.java
index 0309dcf..b0ad347 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgIndexes.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgIndexes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgProcedures.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgProcedures.java
index a647247..6eae966 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgProcedures.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgProcedures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgSchemas.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgSchemas.java
index cfa36bb..d7703e2 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgSchemas.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgSchemas.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgSequences.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgSequences.java
index 304bde7..34f8cbf 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgSequences.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgSequences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTableSpace.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTableSpace.java
index 19b57cb..bb2c04e 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTableSpace.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTableSpace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTables.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTables.java
index f21d3ad..323bed6 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTables.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTables.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTriggers.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTriggers.java
index d2ce22b..1be69af 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTriggers.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTriggers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTuples.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTuples.java
index 5c5253c..da7c1ae 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTuples.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgTuples.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgViews.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgViews.java
index 501c954..aa54bcd 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgViews.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgViews.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/package-info.java
index 4da23fc..7d1bb51 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/package-info.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/ConstraintOfResultSet.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/ConstraintOfResultSet.java
index a8eee51..1c2c84f 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/ConstraintOfResultSet.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/ConstraintOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/DomainOfResultSet.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/DomainOfResultSet.java
index f4ef29d..d430ab3 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/DomainOfResultSet.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/DomainOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/FunctionOfResultSet.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/FunctionOfResultSet.java
index e9bb1e8..93a1688 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/FunctionOfResultSet.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/FunctionOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/IndexOfResultSet.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/IndexOfResultSet.java
index 689a631..3fd72c1 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/IndexOfResultSet.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/IndexOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/ProcedureOfResultSet.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/ProcedureOfResultSet.java
index ac2112f..3f4bc41 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/ProcedureOfResultSet.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/ProcedureOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/SequenceOfResultSet.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/SequenceOfResultSet.java
index 66aa6ab..641f954 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/SequenceOfResultSet.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/SequenceOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/TableOfResultSet.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/TableOfResultSet.java
index b3d28ad..2dd1468 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/TableOfResultSet.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/TableOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/TriggerOfResultSet.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/TriggerOfResultSet.java
index 5e75df8..d16c2af 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/TriggerOfResultSet.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/TriggerOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/TupleOfResultSet.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/TupleOfResultSet.java
index 606f000..822efd3 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/TupleOfResultSet.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/TupleOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/ViewOfResultSet.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/ViewOfResultSet.java
index 1cfe8ba..e369912 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/ViewOfResultSet.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/ViewOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/package-info.java
index e3b43cb..0aad480 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/package-info.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/pg/PgSchemaOfResultSet.java b/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/pg/PgSchemaOfResultSet.java
deleted file mode 100644
index f3b2f4b..0000000
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/ofresultset/pg/PgSchemaOfResultSet.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2018-2021 FusionSoft
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * You may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied.
- *
- * See the License for the specific language governing permissions
- * and limitations under the License.
- */
-package org.fusionsoft.database.snapshot.objects.ofresultset.pg;
-
-import java.sql.ResultSet;
-import org.fusionsoft.database.snapshot.objects.ofresultset.SchemaOfResultSet;
-import org.fusionsoft.database.snapshot.query.pg.PgSchemasQuery;
-
-/**
- * The type of {@link org.fusionsoft.database.snapshot.DbObject}
- *  that can be constructed of {@link ResultSet}.
- * @since 0.1
- */
-public class PgSchemaOfResultSet extends SchemaOfResultSet {
-
-    /**
-     * Instantiates a new Naive db object.
-     * @param rset The ResultSet to be encapsulated.
-     */
-    public PgSchemaOfResultSet(final ResultSet rset) {
-        super(
-            rset,
-            new PgSchemasQuery()
-        );
-    }
-
-}
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/objects/package-info.java
index c1f7422..4fec126 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/package-info.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/JoinedAndPredicate.java b/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/JoinedAndPredicate.java
index 873ee47..d734e2e 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/JoinedAndPredicate.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/JoinedAndPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectHasDataNodePredicate.java b/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectHasDataNodePredicate.java
index f4ef32c..7fc1c1b 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectHasDataNodePredicate.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectHasDataNodePredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectHasTypePredicate.java b/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectHasTypePredicate.java
index d31277a..d19f30c 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectHasTypePredicate.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectHasTypePredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectMentionedInDbdFilePredicate.java b/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectMentionedInDbdFilePredicate.java
index aa024f5..ba22b21 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectMentionedInDbdFilePredicate.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectMentionedInDbdFilePredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectMentionedInPredicate.java b/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectMentionedInPredicate.java
index 54902ca..777bea0 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectMentionedInPredicate.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/ObjectMentionedInPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/package-info.java
index bfb361a..b986095 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/package-info.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/predicate/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/ObjectName.java b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/ObjectName.java
index e82cd3b..854f42d 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/ObjectName.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/ObjectName.java
@@ -23,6 +23,10 @@
  */
 public interface ObjectName extends Text {
 
+    /**
+     * As string.
+     * @return The string.
+     */
     String asString();
 
     /**
@@ -42,6 +46,6 @@ public interface ObjectName extends Text {
      * @param other The another {@link ObjectName}.
      * @return The boolean.
      */
-    boolean equals(ObjectName other);
+    boolean equalsTo(ObjectName other);
 
 }
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/ObjectType.java b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/ObjectType.java
index 823df99..6d4c965 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/ObjectType.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/ObjectType.java
@@ -32,6 +32,10 @@ public interface ObjectType<T extends YamlNode> extends Text {
      */
     T node(YamlNode mapping);
 
+    /**
+     * As string.
+     * @return The string.
+     */
     String asString();
 
 }
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/SimpleObjectSignature.java b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/SimpleObjectSignature.java
index a93ae31..9d36ddb 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/SimpleObjectSignature.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/SimpleObjectSignature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.fusionsoft.database.snapshot.objects.signature;
 
 import java.text.MessageFormat;
+import java.util.Objects;
 import org.cactoos.text.UncheckedText;
 import org.fusionsoft.database.snapshot.ObjectSignature;
 
@@ -65,8 +66,22 @@ public final String asString() {
     }
 
     @Override
-    public boolean equals(final ObjectSignature other) {
+    public final boolean equals(final Object other) {
+        boolean equ = false;
+        if (other instanceof ObjectSignature) {
+            equ = this.equalsTo((ObjectSignature) other);
+        }
+        return equ;
+    }
+
+    @Override
+    public final boolean equalsTo(final ObjectSignature other) {
         return this.asString().equals(other.asString());
     }
 
+    @Override
+    public final int hashCode() {
+        return Objects.hash(this.asString());
+    }
+
 }
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/ObjectNameOfScalar.java b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/ObjectNameOfScalar.java
index 8e7714c..b395949 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/ObjectNameOfScalar.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/ObjectNameOfScalar.java
@@ -15,6 +15,7 @@
  */
 package org.fusionsoft.database.snapshot.objects.signature.name;
 
+import java.util.Objects;
 import org.cactoos.Scalar;
 import org.cactoos.Text;
 import org.cactoos.scalar.Unchecked;
@@ -33,7 +34,7 @@ public class ObjectNameOfScalar implements ObjectName {
 
     /**
      * Instantiates a new Object name of scalar.
-     * @param scalar The {@link Scalar<ObjectName>} to be encapsulated.
+     * @param scalar The {@link Scalar} of {@link ObjectName} to be encapsulated.
      */
     public ObjectNameOfScalar(final Scalar<ObjectName> scalar) {
         this.scalar = new Unchecked<>(scalar);
@@ -55,8 +56,22 @@ public final Text first() {
     }
 
     @Override
-    public final boolean equals(final ObjectName other) {
-        return this.scalar.value().equals(other);
+    public final boolean equalsTo(final ObjectName other) {
+        return this.scalar.value().equalsTo(other);
+    }
+
+    @Override
+    public final boolean equals(final Object obj) {
+        boolean equ = false;
+        if (obj instanceof ObjectName) {
+            equ = this.equalsTo((ObjectName) obj);
+        }
+        return equ;
+    }
+
+    @Override
+    public final int hashCode() {
+        return Objects.hash(this.asString());
     }
 
 }
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/SimpleObjectName.java b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/SimpleObjectName.java
index ae7eea4..1b476e7 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/SimpleObjectName.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/SimpleObjectName.java
@@ -15,6 +15,7 @@
  */
 package org.fusionsoft.database.snapshot.objects.signature.name;
 
+import java.util.Objects;
 import org.cactoos.Text;
 import org.cactoos.iterable.HeadOf;
 import org.cactoos.iterable.IterableOf;
@@ -66,7 +67,7 @@ public SimpleObjectName(final Iterable<Text> names) {
      * @param names The names to be joined.
      */
     public SimpleObjectName(final Text... names) {
-        this(new IterableOf<Text>(names));
+        this(new IterableOf<>(names));
     }
 
     /**
@@ -90,16 +91,6 @@ public final Text first() {
         );
     }
 
-    @Override
-    public final boolean equals(final ObjectName other) {
-        return this.asString().equals(other.asString());
-    }
-
-    @Override
-    public final String asString() {
-        return this.text.asString();
-    }
-
     /**
      * Parent name of object.
      * @return The parent name.
@@ -116,4 +107,28 @@ public final SimpleObjectName parent() {
         );
     }
 
+    @Override
+    public final String asString() {
+        return this.text.asString();
+    }
+
+    @Override
+    public final boolean equalsTo(final ObjectName other) {
+        return this.asString().equals(other.asString());
+    }
+
+    @Override
+    public final boolean equals(final Object obj) {
+        boolean equ = false;
+        if (obj instanceof ObjectName) {
+            equ = this.equalsTo((ObjectName) obj);
+        }
+        return equ;
+    }
+
+    @Override
+    public final int hashCode() {
+        return Objects.hash(this.asString());
+    }
+
 }
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/SimpleObjectNameDelimiter.java b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/SimpleObjectNameDelimiter.java
index 3e27fbd..8c84780 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/SimpleObjectNameDelimiter.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/SimpleObjectNameDelimiter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/SimpleObjectNameOfResultSet.java b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/SimpleObjectNameOfResultSet.java
index c35a0d8..fa277ac 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/SimpleObjectNameOfResultSet.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/SimpleObjectNameOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/package-info.java
new file mode 100644
index 0000000..3d25479
--- /dev/null
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/name/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2018-2022 FusionSoft
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied.
+ *
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+/**
+ * Package for {@link org.fusionsoft.database.snapshot.objects.signature.ObjectName}
+ *  implementations.
+ */
+package org.fusionsoft.database.snapshot.objects.signature.name;
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/package-info.java
index 228640a..9467193 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/package-info.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/type/SimpleObjectType.java b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/type/SimpleObjectType.java
index 9129141..d29039b 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/type/SimpleObjectType.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/type/SimpleObjectType.java
@@ -48,12 +48,12 @@ public SimpleObjectType(final Func<? super YamlNode, T> ctor, final String text)
     }
 
     @Override
-    public T node(final YamlNode node) {
+    public final T node(final YamlNode node) {
         return this.ctor.apply(node);
     }
 
     @Override
-    public String asString() {
+    public final String asString() {
         return this.text;
     }
 
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/type/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/type/package-info.java
new file mode 100644
index 0000000..91a205b
--- /dev/null
+++ b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/type/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2018-2022 FusionSoft
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied.
+ *
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+/**
+ * Package for {@link org.fusionsoft.database.snapshot.objects.signature.ObjectType}
+ *  iface implementations.
+ */
+package org.fusionsoft.database.snapshot.objects.signature.type;
diff --git a/src/main/java/org/fusionsoft/database/snapshot/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/package-info.java
index 84cf9dd..a6f37e7 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/package-info.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/BasicQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/BasicQuery.java
index 8c9e943..1c12190 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/BasicQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/BasicQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/MessageFormatQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/MessageFormatQuery.java
index 2674b08..30f4e4a 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/MessageFormatQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/MessageFormatQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/Query.java b/src/main/java/org/fusionsoft/database/snapshot/query/Query.java
index 5b39c73..72c4614 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/Query.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/Query.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/QueryOfScalar.java b/src/main/java/org/fusionsoft/database/snapshot/query/QueryOfScalar.java
index 865f465..4013ad8 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/QueryOfScalar.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/QueryOfScalar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/query/package-info.java
index deff07c..f2b21b9 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/package-info.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/DbdProcedureFields.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/DbdProcedureFields.java
index e1b7f5a..533c9a4 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/DbdProcedureFields.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/DbdProcedureFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgColumnsQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgColumnsQuery.java
index 9ee1aac..a048d2a 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgColumnsQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgColumnsQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
  * @checkstyle StringLiteralsConcatenationCheck (100 lines)
  * @checkstyle BracketsStructureCheck (100 lines)
  */
+@SuppressWarnings("PMD.AvoidDuplicateLiterals")
 public class PgColumnsQuery extends PgMessageFormatQuery<DbdColumnFields> {
 
     /**
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgConstraintsQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgConstraintsQuery.java
index 1eb2214..90897de 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgConstraintsQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgConstraintsQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgDomainsQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgDomainsQuery.java
index f042c09..4ad8815 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgDomainsQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgDomainsQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgEnumsQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgEnumsQuery.java
index c6e31b4..9382f86 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgEnumsQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgEnumsQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgEscapeSymbol.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgEscapeSymbol.java
index e56eba6..708b170 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgEscapeSymbol.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgEscapeSymbol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgFunctionsQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgFunctionsQuery.java
index cbc1a22..b6a7570 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgFunctionsQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgFunctionsQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgMessageFormatQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgMessageFormatQuery.java
index 67b66bf..d9b1d49 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgMessageFormatQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgMessageFormatQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgProceduresQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgProceduresQuery.java
index 87e6c26..fd54020 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgProceduresQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgProceduresQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgSchemasQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgSchemasQuery.java
index 5bde0aa..d269cf1 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgSchemasQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgSchemasQuery.java
@@ -28,13 +28,16 @@ public class PgSchemasQuery extends PgMessageFormatQuery<DbdSchemaFields> {
      */
     public PgSchemasQuery() {
         super(
-            "select nspname AS {0}, usename AS {1}\n"
-            + " from pg_namespace,pg_user\n"
-            + " where nspname!='pg_toast' and nspname!='pg_temp_1'\n"
-            + " and nspname!='pg_toast_temp_1' and nspname!='pg_catalog'\n"
-            + " and nspname!='information_schema' and nspname!='pgagent'\n"
-            + " and nspname!='pg_temp_3' and nspname!='pg_toast_temp_3'\n"
-            + " and usesysid = nspowner\n",
+            String.join(
+                "",
+                "select nspname AS {0}, usename AS {1}\n",
+                " from pg_namespace,pg_user\n",
+                " where nspname!='pg_toast' and nspname!='pg_temp_1'\n",
+                " and nspname!='pg_toast_temp_1' and nspname!='pg_catalog'\n",
+                " and nspname!='information_schema' and nspname!='pgagent'\n",
+                " and nspname!='pg_temp_3' and nspname!='pg_toast_temp_3'\n",
+                " and usesysid = nspowner\n"
+            ),
             DbdSchemaFields.SCHEMA,
             DbdSchemaFields.OWNER
         );
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgSequencesQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgSequencesQuery.java
index f81f972..bdb0509 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgSequencesQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgSequencesQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTablesQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTablesQuery.java
index 7ba1b65..9ade288 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTablesQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTablesQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTriggersQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTriggersQuery.java
index a93fc09..6798ae9 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTriggersQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTriggersQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTupleAttributesQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTupleAttributesQuery.java
index dcbffed..bef7d31 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTupleAttributesQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTupleAttributesQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTuplesQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTuplesQuery.java
index 7e7f34a..1010aa7 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTuplesQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgTuplesQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgViewsQuery.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgViewsQuery.java
index 12e2b51..67a41d7 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgViewsQuery.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/PgViewsQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/query/pg/package-info.java b/src/main/java/org/fusionsoft/database/snapshot/query/pg/package-info.java
index 2cf7691..177d57f 100644
--- a/src/main/java/org/fusionsoft/database/snapshot/query/pg/package-info.java
+++ b/src/main/java/org/fusionsoft/database/snapshot/query/pg/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/writable/EmptyWritable.java b/src/main/java/org/fusionsoft/database/writable/EmptyWritable.java
index c626484..6091689 100644
--- a/src/main/java/org/fusionsoft/database/writable/EmptyWritable.java
+++ b/src/main/java/org/fusionsoft/database/writable/EmptyWritable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/writable/JoinedWritable.java b/src/main/java/org/fusionsoft/database/writable/JoinedWritable.java
index 584980d..29b91a0 100644
--- a/src/main/java/org/fusionsoft/database/writable/JoinedWritable.java
+++ b/src/main/java/org/fusionsoft/database/writable/JoinedWritable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/writable/OperationalTableDataFiles.java b/src/main/java/org/fusionsoft/database/writable/OperationalTableDataFiles.java
index e113443..a6b1807 100644
--- a/src/main/java/org/fusionsoft/database/writable/OperationalTableDataFiles.java
+++ b/src/main/java/org/fusionsoft/database/writable/OperationalTableDataFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/writable/SnapshotDbdDocument.java b/src/main/java/org/fusionsoft/database/writable/SnapshotDbdDocument.java
index 2210ce4..602ac2b 100644
--- a/src/main/java/org/fusionsoft/database/writable/SnapshotDbdDocument.java
+++ b/src/main/java/org/fusionsoft/database/writable/SnapshotDbdDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/writable/SnapshotInfoDocument.java b/src/main/java/org/fusionsoft/database/writable/SnapshotInfoDocument.java
index 4a121b3..a9935bb 100644
--- a/src/main/java/org/fusionsoft/database/writable/SnapshotInfoDocument.java
+++ b/src/main/java/org/fusionsoft/database/writable/SnapshotInfoDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/writable/SnapshotWritable.java b/src/main/java/org/fusionsoft/database/writable/SnapshotWritable.java
index 2bbe08c..7cef595 100644
--- a/src/main/java/org/fusionsoft/database/writable/SnapshotWritable.java
+++ b/src/main/java/org/fusionsoft/database/writable/SnapshotWritable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/database/writable/package-info.java b/src/main/java/org/fusionsoft/database/writable/package-info.java
index 7506d98..031e37b 100644
--- a/src/main/java/org/fusionsoft/database/writable/package-info.java
+++ b/src/main/java/org/fusionsoft/database/writable/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/ci/credentials/Credentials.java b/src/main/java/org/fusionsoft/lib/ci/credentials/Credentials.java
index d2ff0a8..0c8e17d 100644
--- a/src/main/java/org/fusionsoft/lib/ci/credentials/Credentials.java
+++ b/src/main/java/org/fusionsoft/lib/ci/credentials/Credentials.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/ci/credentials/CredentialsFromFile.java b/src/main/java/org/fusionsoft/lib/ci/credentials/CredentialsFromFile.java
index fdf44e2..7acbc91 100644
--- a/src/main/java/org/fusionsoft/lib/ci/credentials/CredentialsFromFile.java
+++ b/src/main/java/org/fusionsoft/lib/ci/credentials/CredentialsFromFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/ci/credentials/CredentialsFromProperties.java b/src/main/java/org/fusionsoft/lib/ci/credentials/CredentialsFromProperties.java
index 6351cea..f12af3d 100644
--- a/src/main/java/org/fusionsoft/lib/ci/credentials/CredentialsFromProperties.java
+++ b/src/main/java/org/fusionsoft/lib/ci/credentials/CredentialsFromProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/ci/credentials/CredentialsOfScalar.java b/src/main/java/org/fusionsoft/lib/ci/credentials/CredentialsOfScalar.java
index 833b1c1..360a3c4 100644
--- a/src/main/java/org/fusionsoft/lib/ci/credentials/CredentialsOfScalar.java
+++ b/src/main/java/org/fusionsoft/lib/ci/credentials/CredentialsOfScalar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/ci/credentials/SimpleCredentials.java b/src/main/java/org/fusionsoft/lib/ci/credentials/SimpleCredentials.java
index c80b929..002e1f0 100644
--- a/src/main/java/org/fusionsoft/lib/ci/credentials/SimpleCredentials.java
+++ b/src/main/java/org/fusionsoft/lib/ci/credentials/SimpleCredentials.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/ci/credentials/package-info.java b/src/main/java/org/fusionsoft/lib/ci/credentials/package-info.java
index bf4c806..59608d5 100644
--- a/src/main/java/org/fusionsoft/lib/ci/credentials/package-info.java
+++ b/src/main/java/org/fusionsoft/lib/ci/credentials/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/collection/IterableAutoCloseable.java b/src/main/java/org/fusionsoft/lib/collection/IterableAutoCloseable.java
index 0e35fd2..52fb04b 100644
--- a/src/main/java/org/fusionsoft/lib/collection/IterableAutoCloseable.java
+++ b/src/main/java/org/fusionsoft/lib/collection/IterableAutoCloseable.java
@@ -49,7 +49,7 @@ public IterableAutoCloseable(final Iterable<T> iterable, final AutoCloseable...
     }
 
     @Override
-    public void close() throws Exception {
+    public final void close() throws Exception {
         this.closeable.close();
     }
 
diff --git a/src/main/java/org/fusionsoft/lib/collection/JoinedAutoCloseable.java b/src/main/java/org/fusionsoft/lib/collection/JoinedAutoCloseable.java
index 9a5fdc9..47a4ad0 100644
--- a/src/main/java/org/fusionsoft/lib/collection/JoinedAutoCloseable.java
+++ b/src/main/java/org/fusionsoft/lib/collection/JoinedAutoCloseable.java
@@ -30,18 +30,18 @@ public class JoinedAutoCloseable implements AutoCloseable {
 
     /**
      * Instantiates a new Joined auto closeable.
-     * @param iterable The {@link Iterable} of {@link AutoCloseable} to be encapsulated.
+     * @param values The {@link AutoCloseable} array to be encapsulated.
      */
-    public JoinedAutoCloseable(final Iterable<AutoCloseable> iterable) {
-        this.iterable = iterable;
+    public JoinedAutoCloseable(final AutoCloseable... values) {
+        this(new IterableOf<>(values));
     }
 
     /**
      * Instantiates a new Joined auto closeable.
-     * @param values The {@link AutoCloseable} array to be encapsulated.
+     * @param iterable The {@link Iterable} of {@link AutoCloseable} to be encapsulated.
      */
-    public JoinedAutoCloseable(final AutoCloseable... values) {
-        this(new IterableOf<>(values));
+    public JoinedAutoCloseable(final Iterable<AutoCloseable> iterable) {
+        this.iterable = iterable;
     }
 
     @Override
diff --git a/src/main/java/org/fusionsoft/lib/collection/ListOfConnection.java b/src/main/java/org/fusionsoft/lib/collection/ListOfConnection.java
index 0411eb2..7130571 100644
--- a/src/main/java/org/fusionsoft/lib/collection/ListOfConnection.java
+++ b/src/main/java/org/fusionsoft/lib/collection/ListOfConnection.java
@@ -35,6 +35,7 @@ public class ListOfConnection<T> extends ListOfResultSet<T> {
      * @param connection The {@link Connection} to be encapsulated.
      * @param query The Query of {@link F} to be encapsulated.
      * @param func The unwrap {@link BiFunc} to be used.
+     * @param <F> the text enum type of fields outcomes to be used.
      */
     public <F extends Text> ListOfConnection(
         final Connection connection,
diff --git a/src/main/java/org/fusionsoft/lib/collection/ListOfResultSet.java b/src/main/java/org/fusionsoft/lib/collection/ListOfResultSet.java
index c8bcd44..b236c53 100644
--- a/src/main/java/org/fusionsoft/lib/collection/ListOfResultSet.java
+++ b/src/main/java/org/fusionsoft/lib/collection/ListOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/collection/MapHasKeys.java b/src/main/java/org/fusionsoft/lib/collection/MapHasKeys.java
index 47dbefb..83d5a44 100644
--- a/src/main/java/org/fusionsoft/lib/collection/MapHasKeys.java
+++ b/src/main/java/org/fusionsoft/lib/collection/MapHasKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/collection/Single.java b/src/main/java/org/fusionsoft/lib/collection/Single.java
index e553479..09a35b8 100644
--- a/src/main/java/org/fusionsoft/lib/collection/Single.java
+++ b/src/main/java/org/fusionsoft/lib/collection/Single.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/collection/SingleOrEmptyFallback.java b/src/main/java/org/fusionsoft/lib/collection/SingleOrEmptyFallback.java
index 1ed38c1..4124656 100644
--- a/src/main/java/org/fusionsoft/lib/collection/SingleOrEmptyFallback.java
+++ b/src/main/java/org/fusionsoft/lib/collection/SingleOrEmptyFallback.java
@@ -25,7 +25,7 @@
 public class SingleOrEmptyFallback<T> implements Scalar<T> {
 
     /**
-     * The Iterable<? extends T> encapsulated.
+     * The Iterable encapsulated.
      */
     private final Iterable<? extends T> iterable;
 
@@ -45,11 +45,11 @@ public SingleOrEmptyFallback(final Iterable<? extends T> iterable, final T fallb
     }
 
     @Override
-    public T value() {
-        T value = fallback;
+    public final T value() {
+        T value = this.fallback;
         if (this.iterable.iterator().hasNext()) {
             value = new Single<>(this.iterable).value();
-        } ;
+        }
         return value;
     }
 
diff --git a/src/main/java/org/fusionsoft/lib/collection/StrictMap.java b/src/main/java/org/fusionsoft/lib/collection/StrictMap.java
index 9a18abf..ff5bedd 100644
--- a/src/main/java/org/fusionsoft/lib/collection/StrictMap.java
+++ b/src/main/java/org/fusionsoft/lib/collection/StrictMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/collection/ValidatedIterable.java b/src/main/java/org/fusionsoft/lib/collection/ValidatedIterable.java
index a1d75ed..50471ae 100644
--- a/src/main/java/org/fusionsoft/lib/collection/ValidatedIterable.java
+++ b/src/main/java/org/fusionsoft/lib/collection/ValidatedIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/collection/ValidatedMap.java b/src/main/java/org/fusionsoft/lib/collection/ValidatedMap.java
index 79cb3bf..f6e01ed 100644
--- a/src/main/java/org/fusionsoft/lib/collection/ValidatedMap.java
+++ b/src/main/java/org/fusionsoft/lib/collection/ValidatedMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/collection/package-info.java b/src/main/java/org/fusionsoft/lib/collection/package-info.java
index f774bfc..7795249 100644
--- a/src/main/java/org/fusionsoft/lib/collection/package-info.java
+++ b/src/main/java/org/fusionsoft/lib/collection/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/connection/ConnectionEnvelope.java b/src/main/java/org/fusionsoft/lib/connection/ConnectionEnvelope.java
index 45ceffd..6cfe1bc 100644
--- a/src/main/java/org/fusionsoft/lib/connection/ConnectionEnvelope.java
+++ b/src/main/java/org/fusionsoft/lib/connection/ConnectionEnvelope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/connection/ConnectionOfScalar.java b/src/main/java/org/fusionsoft/lib/connection/ConnectionOfScalar.java
index f9d06da..3b22cb5 100644
--- a/src/main/java/org/fusionsoft/lib/connection/ConnectionOfScalar.java
+++ b/src/main/java/org/fusionsoft/lib/connection/ConnectionOfScalar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/connection/NotImplementedConnection.java b/src/main/java/org/fusionsoft/lib/connection/NotImplementedConnection.java
index 0e97e43..8f3ef05 100644
--- a/src/main/java/org/fusionsoft/lib/connection/NotImplementedConnection.java
+++ b/src/main/java/org/fusionsoft/lib/connection/NotImplementedConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/connection/ResultSetOfScalar.java b/src/main/java/org/fusionsoft/lib/connection/ResultSetOfScalar.java
index a823e84..07d2ced 100644
--- a/src/main/java/org/fusionsoft/lib/connection/ResultSetOfScalar.java
+++ b/src/main/java/org/fusionsoft/lib/connection/ResultSetOfScalar.java
@@ -41,13 +41,16 @@
 import org.cactoos.scalar.Unchecked;
 
 /**
- * {@link ResultSet} implementation of {@link Scalar}
+ * {@link ResultSet} implementation of {@link Scalar}.
  * @since 0.1
  * @checkstyle ParameterNameCheck (4000 lines)
  * @checkstyle LineLengthCheck (4000 lines)
  * @checkstyle ParameterNumberCheck (4000 lines)
- * @checkstyle (4000 lines)
+ * @checkstyle JavadocStyleCheck (4000 lines)
+ * @checkstyle MethodCountCheck (4000 lines)
+ * @checkstyle MissingDeprecatedCheck (4000 lines)
  */
+@SuppressWarnings("PMD")
 public class ResultSetOfScalar implements ResultSet {
 
     /**
diff --git a/src/main/java/org/fusionsoft/lib/connection/StatementEnvelope.java b/src/main/java/org/fusionsoft/lib/connection/StatementEnvelope.java
index 7720c73..2935cc5 100644
--- a/src/main/java/org/fusionsoft/lib/connection/StatementEnvelope.java
+++ b/src/main/java/org/fusionsoft/lib/connection/StatementEnvelope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/connection/StatementOfScalar.java b/src/main/java/org/fusionsoft/lib/connection/StatementOfScalar.java
index e3e5aa2..22ca545 100644
--- a/src/main/java/org/fusionsoft/lib/connection/StatementOfScalar.java
+++ b/src/main/java/org/fusionsoft/lib/connection/StatementOfScalar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/connection/package-info.java b/src/main/java/org/fusionsoft/lib/connection/package-info.java
index 7d76bbc..09d9084 100644
--- a/src/main/java/org/fusionsoft/lib/connection/package-info.java
+++ b/src/main/java/org/fusionsoft/lib/connection/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/exception/JoinedRuntimeException.java b/src/main/java/org/fusionsoft/lib/exception/JoinedRuntimeException.java
index 560fa69..8c0ba13 100644
--- a/src/main/java/org/fusionsoft/lib/exception/JoinedRuntimeException.java
+++ b/src/main/java/org/fusionsoft/lib/exception/JoinedRuntimeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/exception/NotImplemented.java b/src/main/java/org/fusionsoft/lib/exception/NotImplemented.java
index c6eff4e..384138c 100644
--- a/src/main/java/org/fusionsoft/lib/exception/NotImplemented.java
+++ b/src/main/java/org/fusionsoft/lib/exception/NotImplemented.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/exception/TextOfMap.java b/src/main/java/org/fusionsoft/lib/exception/TextOfMap.java
index bc8ca4f..3e3ab76 100644
--- a/src/main/java/org/fusionsoft/lib/exception/TextOfMap.java
+++ b/src/main/java/org/fusionsoft/lib/exception/TextOfMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/exception/ValidationException.java b/src/main/java/org/fusionsoft/lib/exception/ValidationException.java
index 2824887..9840833 100644
--- a/src/main/java/org/fusionsoft/lib/exception/ValidationException.java
+++ b/src/main/java/org/fusionsoft/lib/exception/ValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/exception/ValueNotFoundException.java b/src/main/java/org/fusionsoft/lib/exception/ValueNotFoundException.java
index 1252d5a..b672db0 100644
--- a/src/main/java/org/fusionsoft/lib/exception/ValueNotFoundException.java
+++ b/src/main/java/org/fusionsoft/lib/exception/ValueNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/exception/package-info.java b/src/main/java/org/fusionsoft/lib/exception/package-info.java
index 2673bf9..58129c8 100644
--- a/src/main/java/org/fusionsoft/lib/exception/package-info.java
+++ b/src/main/java/org/fusionsoft/lib/exception/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/functional/RunnableWithException.java b/src/main/java/org/fusionsoft/lib/functional/RunnableWithException.java
index 5eb419d..93f2656 100644
--- a/src/main/java/org/fusionsoft/lib/functional/RunnableWithException.java
+++ b/src/main/java/org/fusionsoft/lib/functional/RunnableWithException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/functional/package-info.java b/src/main/java/org/fusionsoft/lib/functional/package-info.java
index e6e3e25..f93c755 100644
--- a/src/main/java/org/fusionsoft/lib/functional/package-info.java
+++ b/src/main/java/org/fusionsoft/lib/functional/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/input/ConsolePrinting.java b/src/main/java/org/fusionsoft/lib/input/ConsolePrinting.java
index e0418e5..230afd5 100644
--- a/src/main/java/org/fusionsoft/lib/input/ConsolePrinting.java
+++ b/src/main/java/org/fusionsoft/lib/input/ConsolePrinting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/input/InputPrintsToConsole.java b/src/main/java/org/fusionsoft/lib/input/InputPrintsToConsole.java
index c6ac8f3..393f347 100644
--- a/src/main/java/org/fusionsoft/lib/input/InputPrintsToConsole.java
+++ b/src/main/java/org/fusionsoft/lib/input/InputPrintsToConsole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/input/ManualConsoleInput.java b/src/main/java/org/fusionsoft/lib/input/ManualConsoleInput.java
index 58c6b1d..11b8502 100644
--- a/src/main/java/org/fusionsoft/lib/input/ManualConsoleInput.java
+++ b/src/main/java/org/fusionsoft/lib/input/ManualConsoleInput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/input/ReaderReadLineInput.java b/src/main/java/org/fusionsoft/lib/input/ReaderReadLineInput.java
index 596b513..c62cd54 100644
--- a/src/main/java/org/fusionsoft/lib/input/ReaderReadLineInput.java
+++ b/src/main/java/org/fusionsoft/lib/input/ReaderReadLineInput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/input/package-info.java b/src/main/java/org/fusionsoft/lib/input/package-info.java
index 3b02f78..2d91fbe 100644
--- a/src/main/java/org/fusionsoft/lib/input/package-info.java
+++ b/src/main/java/org/fusionsoft/lib/input/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/path/CurrentWorkingDirectory.java b/src/main/java/org/fusionsoft/lib/path/CurrentWorkingDirectory.java
index d43b480..68c4e1a 100644
--- a/src/main/java/org/fusionsoft/lib/path/CurrentWorkingDirectory.java
+++ b/src/main/java/org/fusionsoft/lib/path/CurrentWorkingDirectory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/path/TempFilePath.java b/src/main/java/org/fusionsoft/lib/path/TempFilePath.java
index 9aec0fb..8880b0b 100644
--- a/src/main/java/org/fusionsoft/lib/path/TempFilePath.java
+++ b/src/main/java/org/fusionsoft/lib/path/TempFilePath.java
@@ -24,6 +24,7 @@
 /**
  * The scalar of temp file random {@link Path}, resolved from some root {@link Path}.
  * @since 0.1
+ * @checkstyle MagicNumberCheck (100 lines)
  */
 public class TempFilePath implements Scalar<Path> {
 
@@ -74,7 +75,7 @@ public TempFilePath(final Path inside, final CharSequence prefix) {
     }
 
     @Override
-    public Path value() {
+    public final Path value() {
         return this.scalar.value();
     }
 
diff --git a/src/main/java/org/fusionsoft/lib/path/TempFolder.java b/src/main/java/org/fusionsoft/lib/path/TempFolder.java
index c0078d7..9bc3448 100644
--- a/src/main/java/org/fusionsoft/lib/path/TempFolder.java
+++ b/src/main/java/org/fusionsoft/lib/path/TempFolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
@@ -18,12 +18,24 @@
 import java.nio.file.Path;
 import org.cactoos.Scalar;
 
+/**
+ * The type of that can be constructed of.
+ * @since 0.1
+ */
 public class TempFolder extends AutoDeletingPath {
 
+    /**
+     * Instantiates a new Temp folder.
+     * @param inside The {@link Path} to be encapsulated.
+     */
     public TempFolder(final Path inside) {
         this(() -> inside);
     }
 
+    /**
+     * Instantiates a new Temp folder.
+     * @param inside The {@link Scalar} to be encapsulated.
+     */
     public TempFolder(final Scalar<Path> inside) {
         super(
             new TempFilePath(
diff --git a/src/main/java/org/fusionsoft/lib/path/package-info.java b/src/main/java/org/fusionsoft/lib/path/package-info.java
index e944a72..fc4b54d 100644
--- a/src/main/java/org/fusionsoft/lib/path/package-info.java
+++ b/src/main/java/org/fusionsoft/lib/path/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/text/EscapedText.java b/src/main/java/org/fusionsoft/lib/text/EscapedText.java
index 9cc9a2b..1670f69 100644
--- a/src/main/java/org/fusionsoft/lib/text/EscapedText.java
+++ b/src/main/java/org/fusionsoft/lib/text/EscapedText.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/text/JsonEmptyText.java b/src/main/java/org/fusionsoft/lib/text/JsonEmptyText.java
index 5f5d592..96a356e 100644
--- a/src/main/java/org/fusionsoft/lib/text/JsonEmptyText.java
+++ b/src/main/java/org/fusionsoft/lib/text/JsonEmptyText.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/text/JsonUndefinedText.java b/src/main/java/org/fusionsoft/lib/text/JsonUndefinedText.java
index bb5dbb4..68567db 100644
--- a/src/main/java/org/fusionsoft/lib/text/JsonUndefinedText.java
+++ b/src/main/java/org/fusionsoft/lib/text/JsonUndefinedText.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/text/RegexpPatternLiteralEscaped.java b/src/main/java/org/fusionsoft/lib/text/RegexpPatternLiteralEscaped.java
index 527d80e..f2dea52 100644
--- a/src/main/java/org/fusionsoft/lib/text/RegexpPatternLiteralEscaped.java
+++ b/src/main/java/org/fusionsoft/lib/text/RegexpPatternLiteralEscaped.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/text/TextOfNullableScalar.java b/src/main/java/org/fusionsoft/lib/text/TextOfNullableScalar.java
index 02d3725..23903bc 100644
--- a/src/main/java/org/fusionsoft/lib/text/TextOfNullableScalar.java
+++ b/src/main/java/org/fusionsoft/lib/text/TextOfNullableScalar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/text/TextOfResultSet.java b/src/main/java/org/fusionsoft/lib/text/TextOfResultSet.java
index 1f3b982..737c0b4 100644
--- a/src/main/java/org/fusionsoft/lib/text/TextOfResultSet.java
+++ b/src/main/java/org/fusionsoft/lib/text/TextOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/text/package-info.java b/src/main/java/org/fusionsoft/lib/text/package-info.java
index 3c789a1..c1387a6 100644
--- a/src/main/java/org/fusionsoft/lib/text/package-info.java
+++ b/src/main/java/org/fusionsoft/lib/text/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/EntriesOfYamlMapping.java b/src/main/java/org/fusionsoft/lib/yaml/EntriesOfYamlMapping.java
index 12e6a24..9e8246c 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/EntriesOfYamlMapping.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/EntriesOfYamlMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/FileExtension.java b/src/main/java/org/fusionsoft/lib/yaml/FileExtension.java
index 017f34f..46ebbe8 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/FileExtension.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/FileExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
@@ -17,10 +17,14 @@
 
 import org.cactoos.Text;
 
+/**
+ * The {@link Text} of yaml file extension 'yaml'.
+ * @since 0.1
+ */
 public class FileExtension implements Text {
 
     @Override
-    public String asString() {
+    public final String asString() {
         return "yaml";
     }
 
diff --git a/src/main/java/org/fusionsoft/lib/yaml/MappingEmpty.java b/src/main/java/org/fusionsoft/lib/yaml/MappingEmpty.java
index c30be84..2fe2f34 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/MappingEmpty.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/MappingEmpty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/MappingMerged.java b/src/main/java/org/fusionsoft/lib/yaml/MappingMerged.java
index e523bef..aac649e 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/MappingMerged.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/MappingMerged.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/MappingOfResource.java b/src/main/java/org/fusionsoft/lib/yaml/MappingOfResource.java
index 6e797b1..9ad82c9 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/MappingOfResource.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/MappingOfResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/MappingWithEntries.java b/src/main/java/org/fusionsoft/lib/yaml/MappingWithEntries.java
index c720f1a..c9c13b0 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/MappingWithEntries.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/MappingWithEntries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/MappingWithKeys.java b/src/main/java/org/fusionsoft/lib/yaml/MappingWithKeys.java
index c6f88f3..bfb2594 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/MappingWithKeys.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/MappingWithKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalars.java b/src/main/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalars.java
index ac636bc..f5b8352 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalars.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalars.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalarsNested.java b/src/main/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalarsNested.java
index 8ef5617..c46682a 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalarsNested.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalarsNested.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/NodeEntriesOfYamlMapping.java b/src/main/java/org/fusionsoft/lib/yaml/NodeEntriesOfYamlMapping.java
index 0631c12..900fce1 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/NodeEntriesOfYamlMapping.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/NodeEntriesOfYamlMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlInputEnvelope.java b/src/main/java/org/fusionsoft/lib/yaml/YamlInputEnvelope.java
index 27cfd39..b6c4733 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlInputEnvelope.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlInputEnvelope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlInputOf.java b/src/main/java/org/fusionsoft/lib/yaml/YamlInputOf.java
index abebc19..69905e6 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlInputOf.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlInputOf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlMappingEnvelope.java b/src/main/java/org/fusionsoft/lib/yaml/YamlMappingEnvelope.java
index b4af951..50874a7 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlMappingEnvelope.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlMappingEnvelope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlMappingHasKeys.java b/src/main/java/org/fusionsoft/lib/yaml/YamlMappingHasKeys.java
index 7150687..0907fa4 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlMappingHasKeys.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlMappingHasKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOf.java b/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOf.java
index 5792642..cfef345 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOf.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOfEntries.java b/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOfEntries.java
index 5a2515a..293783b 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOfEntries.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOfEntries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
@@ -38,17 +38,19 @@ public YamlMappingOfEntries(
         final Iterable<? extends Map.Entry<? extends Text, ? extends YamlNode>> entries
     ) {
         super(
-            new Sticky<>(() -> {
-                YamlMappingBuilder yaml = Yaml.createYamlMappingBuilder();
-                for (final Map.Entry<? extends Text, ? extends YamlNode> entry : entries) {
-                    yaml = yaml.add(
-                        entry.getKey().asString(),
-                        entry.getValue()
-                    );
+            new Sticky<>(
+                () -> {
+                    YamlMappingBuilder yaml = Yaml.createYamlMappingBuilder();
+                    for (final Map.Entry<? extends Text, ? extends YamlNode> entry : entries) {
+                        yaml = yaml.add(
+                            entry.getKey().asString(),
+                            entry.getValue()
+                        );
+                    }
+                    return yaml.build();
                 }
-                return yaml.build();
-            }
-            ));
+            )
+        );
     }
 
     /**
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOfPath.java b/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOfPath.java
index f8ecf18..3f04d41 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOfPath.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOfPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOfScalar.java b/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOfScalar.java
index e7e06ba..d6bb62d 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOfScalar.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOfScalar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOrEmptyWhenNoValueNotFound.java b/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOrEmptyWhenNoValueNotFound.java
index 29679c9..3e3b8d3 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOrEmptyWhenNoValueNotFound.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlMappingOrEmptyWhenNoValueNotFound.java
@@ -37,7 +37,8 @@ public YamlMappingOrEmptyWhenNoValueNotFound(final YamlMapping mapping) {
             new ScalarWithFallback<>(
                 new ScalarOf<>(
                     () -> {
-                        mapping.keys(); return mapping;
+                        mapping.keys();
+                        return mapping;
                     }
                 ),
                 new Fallback.From<>(
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlNodeOfPath.java b/src/main/java/org/fusionsoft/lib/yaml/YamlNodeOfPath.java
index 411f9d5..c0eab3e 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlNodeOfPath.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlNodeOfPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlNodeOfScalar.java b/src/main/java/org/fusionsoft/lib/yaml/YamlNodeOfScalar.java
index ec7f25a..3f4ba38 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlNodeOfScalar.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlNodeOfScalar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlNodeValidated.java b/src/main/java/org/fusionsoft/lib/yaml/YamlNodeValidated.java
index a59847f..dd039fa 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlNodeValidated.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlNodeValidated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlPlainScalarOf.java b/src/main/java/org/fusionsoft/lib/yaml/YamlPlainScalarOf.java
index a741cb5..7365dd7 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlPlainScalarOf.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlPlainScalarOf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlScalarSequenceOfResultSet.java b/src/main/java/org/fusionsoft/lib/yaml/YamlScalarSequenceOfResultSet.java
index d1e24bb..f37e869 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlScalarSequenceOfResultSet.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlScalarSequenceOfResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/YamlSequenceOfNodes.java b/src/main/java/org/fusionsoft/lib/yaml/YamlSequenceOfNodes.java
index 1b9f811..254faec 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/YamlSequenceOfNodes.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/YamlSequenceOfNodes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/artefacts/FirstNotEmptyTextOf.java b/src/main/java/org/fusionsoft/lib/yaml/artefacts/FirstNotEmptyTextOf.java
index c2f362f..38baa9b 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/artefacts/FirstNotEmptyTextOf.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/artefacts/FirstNotEmptyTextOf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/artefacts/IterableOfClassFromYamlNode.java b/src/main/java/org/fusionsoft/lib/yaml/artefacts/IterableOfClassFromYamlNode.java
index 252f421..724f91d 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/artefacts/IterableOfClassFromYamlNode.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/artefacts/IterableOfClassFromYamlNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/artefacts/KeysFromYamlNode.java b/src/main/java/org/fusionsoft/lib/yaml/artefacts/KeysFromYamlNode.java
index dddeeee..781aee4 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/artefacts/KeysFromYamlNode.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/artefacts/KeysFromYamlNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/artefacts/MappingFromMappingIgnoreKeys.java b/src/main/java/org/fusionsoft/lib/yaml/artefacts/MappingFromMappingIgnoreKeys.java
index 2e80e22..67620d2 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/artefacts/MappingFromMappingIgnoreKeys.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/artefacts/MappingFromMappingIgnoreKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/artefacts/MappingFromMappingKeys.java b/src/main/java/org/fusionsoft/lib/yaml/artefacts/MappingFromMappingKeys.java
index ab13fd6..565fbba 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/artefacts/MappingFromMappingKeys.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/artefacts/MappingFromMappingKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/artefacts/MaybeEmptyTextOfYamlMapping.java b/src/main/java/org/fusionsoft/lib/yaml/artefacts/MaybeEmptyTextOfYamlMapping.java
index 574262e..8bead57 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/artefacts/MaybeEmptyTextOfYamlMapping.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/artefacts/MaybeEmptyTextOfYamlMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/artefacts/RegexpOfFlowYamlSequenceValues.java b/src/main/java/org/fusionsoft/lib/yaml/artefacts/RegexpOfFlowYamlSequenceValues.java
index 4f9aaf4..e443573 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/artefacts/RegexpOfFlowYamlSequenceValues.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/artefacts/RegexpOfFlowYamlSequenceValues.java
@@ -17,6 +17,8 @@
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.cactoos.Func;
+import org.cactoos.func.UncheckedFunc;
 import org.cactoos.scalar.Sticky;
 import org.cactoos.scalar.Ternary;
 import org.cactoos.scalar.Unchecked;
@@ -32,6 +34,11 @@ public class RegexpOfFlowYamlSequenceValues {
      */
     private final Unchecked<Pattern> scalar;
 
+    /**
+     * The {@link Func} to extract string value from matcher.
+     */
+    private final UncheckedFunc<Matcher, String> func;
+
     /**
      * Instantiates a new Regexp of flow yaml sequence values.
      */
@@ -43,6 +50,13 @@ public RegexpOfFlowYamlSequenceValues() {
                 )
             )
         );
+        this.func = new UncheckedFunc<>(
+            matcher -> new Ternary<>(
+                () -> matcher.group(1) == null,
+                () -> matcher.group(2),
+                () -> matcher.group(1)
+            ).value()
+        );
     }
 
     /**
@@ -50,7 +64,7 @@ public RegexpOfFlowYamlSequenceValues() {
      * @return The pattern.
      */
     public final Pattern pattern() {
-        return scalar.value();
+        return this.scalar.value();
     }
 
     /**
@@ -59,13 +73,7 @@ public final Pattern pattern() {
      * @return The string.
      */
     public final String extract(final Matcher matcher) {
-        return new Unchecked<>(
-            new Ternary<>(
-                () -> matcher.group(1) == null,
-                () -> matcher.group(2),
-                () -> matcher.group(1)
-            )
-        ).value();
+        return this.func.apply(matcher);
     }
 
 }
diff --git a/src/main/java/org/fusionsoft/lib/yaml/artefacts/StringSetOfYamlSequence.java b/src/main/java/org/fusionsoft/lib/yaml/artefacts/StringSetOfYamlSequence.java
index 74781c0..430fe25 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/artefacts/StringSetOfYamlSequence.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/artefacts/StringSetOfYamlSequence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/artefacts/TextOfMappingValue.java b/src/main/java/org/fusionsoft/lib/yaml/artefacts/TextOfMappingValue.java
index d1cfcdf..b387e7c 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/artefacts/TextOfMappingValue.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/artefacts/TextOfMappingValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/artefacts/TextOfScalarNode.java b/src/main/java/org/fusionsoft/lib/yaml/artefacts/TextOfScalarNode.java
index fd80ab9..aa1ecf6 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/artefacts/TextOfScalarNode.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/artefacts/TextOfScalarNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/artefacts/TextOfYamlNode.java b/src/main/java/org/fusionsoft/lib/yaml/artefacts/TextOfYamlNode.java
index 223a47a..3127e9b 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/artefacts/TextOfYamlNode.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/artefacts/TextOfYamlNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/artefacts/package-info.java b/src/main/java/org/fusionsoft/lib/yaml/artefacts/package-info.java
index c9332ba..246515a 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/artefacts/package-info.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/artefacts/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/main/java/org/fusionsoft/lib/yaml/package-info.java b/src/main/java/org/fusionsoft/lib/yaml/package-info.java
index 37a5f4a..cb8ef68 100644
--- a/src/main/java/org/fusionsoft/lib/yaml/package-info.java
+++ b/src/main/java/org/fusionsoft/lib/yaml/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/ci/UrlOfPgGitLabDatabaseV11.java b/src/test/java/org/fusionsoft/database/ci/UrlOfPgGitLabDatabaseV11.java
index 93458ed..4328d62 100644
--- a/src/test/java/org/fusionsoft/database/ci/UrlOfPgGitLabDatabaseV11.java
+++ b/src/test/java/org/fusionsoft/database/ci/UrlOfPgGitLabDatabaseV11.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromGitMvnDProps.java b/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromGitMvnDProps.java
index ea8b09d..db5e118 100644
--- a/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromGitMvnDProps.java
+++ b/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromGitMvnDProps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromGitSecretFile.java b/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromGitSecretFile.java
index f1f107b..c9ce428 100644
--- a/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromGitSecretFile.java
+++ b/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromGitSecretFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromPgMvnDProps.java b/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromPgMvnDProps.java
index d803abc..15dcb7a 100644
--- a/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromPgMvnDProps.java
+++ b/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromPgMvnDProps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromPgSecretFile.java b/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromPgSecretFile.java
index 868ae5d..48bca4c 100644
--- a/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromPgSecretFile.java
+++ b/src/test/java/org/fusionsoft/database/ci/credentials/CredsFromPgSecretFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/ci/credentials/CredsOfGitTestRepo.java b/src/test/java/org/fusionsoft/database/ci/credentials/CredsOfGitTestRepo.java
index 7d9d077..8046321 100644
--- a/src/test/java/org/fusionsoft/database/ci/credentials/CredsOfGitTestRepo.java
+++ b/src/test/java/org/fusionsoft/database/ci/credentials/CredsOfGitTestRepo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/ci/credentials/CredsOfPgTestDatabase.java b/src/test/java/org/fusionsoft/database/ci/credentials/CredsOfPgTestDatabase.java
index 5b55107..38156bb 100644
--- a/src/test/java/org/fusionsoft/database/ci/credentials/CredsOfPgTestDatabase.java
+++ b/src/test/java/org/fusionsoft/database/ci/credentials/CredsOfPgTestDatabase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/ci/credentials/package-info.java b/src/test/java/org/fusionsoft/database/ci/credentials/package-info.java
index 07a0dfe..a73aa31 100644
--- a/src/test/java/org/fusionsoft/database/ci/credentials/package-info.java
+++ b/src/test/java/org/fusionsoft/database/ci/credentials/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/ci/package-info.java b/src/test/java/org/fusionsoft/database/ci/package-info.java
index f6fe155..42b0442 100644
--- a/src/test/java/org/fusionsoft/database/ci/package-info.java
+++ b/src/test/java/org/fusionsoft/database/ci/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/mapping/dbd/built/DbdRootMappingBuiltTest.java b/src/test/java/org/fusionsoft/database/mapping/dbd/built/DbdRootMappingBuiltTest.java
index dd56cfb..9a031f4 100644
--- a/src/test/java/org/fusionsoft/database/mapping/dbd/built/DbdRootMappingBuiltTest.java
+++ b/src/test/java/org/fusionsoft/database/mapping/dbd/built/DbdRootMappingBuiltTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/mapping/dbd/built/DbdSchemasMappingOfObjectsTest.java b/src/test/java/org/fusionsoft/database/mapping/dbd/built/DbdSchemasMappingOfObjectsTest.java
index b5cb4d0..266e65a 100644
--- a/src/test/java/org/fusionsoft/database/mapping/dbd/built/DbdSchemasMappingOfObjectsTest.java
+++ b/src/test/java/org/fusionsoft/database/mapping/dbd/built/DbdSchemasMappingOfObjectsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/mapping/dbd/built/package-info.java b/src/test/java/org/fusionsoft/database/mapping/dbd/built/package-info.java
index f5e58b6..dbb2177 100644
--- a/src/test/java/org/fusionsoft/database/mapping/dbd/built/package-info.java
+++ b/src/test/java/org/fusionsoft/database/mapping/dbd/built/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/data/RowsDataEntriesOfConnectionTest.java b/src/test/java/org/fusionsoft/database/snapshot/data/RowsDataEntriesOfConnectionTest.java
index 2f72935..3f0c657 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/data/RowsDataEntriesOfConnectionTest.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/data/RowsDataEntriesOfConnectionTest.java
@@ -39,6 +39,7 @@ class RowsDataEntriesOfConnectionTest {
      */
     @Test
     @Disabled
+    @SuppressWarnings("PMD.SystemPrintln")
     public void show() {
         final ConnectionOfDbdServerMapping connection = new ConnectionOfDbdServerMapping(
             new DbdServerMappingWithCredentials(
diff --git a/src/test/java/org/fusionsoft/database/snapshot/data/SeparateDataFilesOfTablesWritableTest.java b/src/test/java/org/fusionsoft/database/snapshot/data/SeparateDataFilesOfTablesWritableTest.java
index 6a618a1..3d862ec 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/data/SeparateDataFilesOfTablesWritableTest.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/data/SeparateDataFilesOfTablesWritableTest.java
@@ -16,6 +16,7 @@
 package org.fusionsoft.database.snapshot.data;
 
 import java.sql.Connection;
+import java.sql.SQLException;
 import org.cactoos.scalar.NumberOf;
 import org.cactoos.scalar.Sticky;
 import org.fusionsoft.database.Folder;
@@ -44,7 +45,7 @@ class SeparateDataFilesOfTablesWritableTest {
      * Writes big files fast.
      */
     @Test
-    public void writesBigFilesFast() {
+    public void writesBigFilesFast() throws SQLException {
         final Folder folder = new FolderOfScalar(
             new Sticky<>(
                 new TempFolder(
@@ -52,26 +53,29 @@ public void writesBigFilesFast() {
                 )
             )
         );
-        final Connection connection = new ConnectionOfDbdServerMapping(
-            new DbdServerMappingWithCredentials(
-                new UrlOfPgGitLabDatabaseV11("pagilla"),
-                new CredsOfPgTestDatabase()
-            )
-        );
-        new SeparateDataFilesOfTablesWritable(
-            connection,
-            new ObjectsWithType<>(
-                new ObjectTypeTable(),
-                new ObjectsFromServer(
-                    connection
+        try (
+            Connection connection = new ConnectionOfDbdServerMapping(
+                new DbdServerMappingWithCredentials(
+                    new UrlOfPgGitLabDatabaseV11("pagilla"),
+                    new CredsOfPgTestDatabase()
                 )
             )
-        ).writeTo(folder);
-        new Assertion<>(
-            "the biggest data file has expected size",
-            folder.path().resolve("public.million.data.yaml").toFile().length(),
-            new IsNumber(new NumberOf("236778131"))
-        ).affirm();
+        ) {
+            new SeparateDataFilesOfTablesWritable(
+                connection,
+                new ObjectsWithType<>(
+                    new ObjectTypeTable(),
+                    new ObjectsFromServer(
+                        connection
+                    )
+                )
+            ).writeTo(folder);
+            new Assertion<>(
+                "the biggest data file has expected size",
+                folder.path().resolve("public.million.data.yaml").toFile().length(),
+                new IsNumber(new NumberOf("236778131"))
+            ).affirm();
+        }
     }
 
 }
diff --git a/src/test/java/org/fusionsoft/database/snapshot/data/package-info.java b/src/test/java/org/fusionsoft/database/snapshot/data/package-info.java
new file mode 100644
index 0000000..ac6243d
--- /dev/null
+++ b/src/test/java/org/fusionsoft/database/snapshot/data/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2018-2022 FusionSoft
+ *
+ * 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.
+ */
+/**
+ * Tests for {@link org.fusionsoft.database.snapshot.data} package.
+ */
+package org.fusionsoft.database.snapshot.data;
diff --git a/src/test/java/org/fusionsoft/database/snapshot/dbms/DbmsVersionOfConnectionTest.java b/src/test/java/org/fusionsoft/database/snapshot/dbms/DbmsVersionOfConnectionTest.java
index 8246f84..e57a545 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/dbms/DbmsVersionOfConnectionTest.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/dbms/DbmsVersionOfConnectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/dbms/package-info.java b/src/test/java/org/fusionsoft/database/snapshot/dbms/package-info.java
index f304500..fa3a633 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/dbms/package-info.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/dbms/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/objects/DefaultObjectNameOfValuesTest.java b/src/test/java/org/fusionsoft/database/snapshot/objects/DefaultObjectNameOfValuesTest.java
index a43d225..7694636 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/objects/DefaultObjectNameOfValuesTest.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/objects/DefaultObjectNameOfValuesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/objects/FullObjectNameTest.java b/src/test/java/org/fusionsoft/database/snapshot/objects/FullObjectNameTest.java
index 901ec6b..885c741 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/objects/FullObjectNameTest.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/objects/FullObjectNameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
@@ -27,14 +27,14 @@
  * The tests for {@link SimpleObjectName}.
  * @since 0.1
  */
+@SuppressWarnings("PMD.AvoidDuplicateLiterals")
 class FullObjectNameTest {
 
     /**
      * Represents single word from single argument.
-     * @throws Exception When can't.
      */
     @Test
-    public void singleWordFromSingle() throws Exception {
+    public void singleWordFromSingle() {
         final String name = "name";
         Assertions.assertEquals(
             name,
diff --git a/src/test/java/org/fusionsoft/database/snapshot/objects/ObjectsOfDbdRootMappingTest.java b/src/test/java/org/fusionsoft/database/snapshot/objects/ObjectsOfDbdRootMappingTest.java
index 6664b74..27077ee 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/objects/ObjectsOfDbdRootMappingTest.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/objects/ObjectsOfDbdRootMappingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
  * The test for {@link ObjectsOfDbdRootMapping} class.
  * @since 0.1
  * @checkstyle MagicNumberCheck (100 lines)
+ * @checkstyle ClassDataAbstractionCouplingCheck (100 lines)
  */
 class ObjectsOfDbdRootMappingTest {
 
diff --git a/src/test/java/org/fusionsoft/database/snapshot/objects/ObjectsWithTypeTest.java b/src/test/java/org/fusionsoft/database/snapshot/objects/ObjectsWithTypeTest.java
index 94b0ff3..621d073 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/objects/ObjectsWithTypeTest.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/objects/ObjectsWithTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/objects/filtered/ObjectsWithParentTest.java b/src/test/java/org/fusionsoft/database/snapshot/objects/filtered/ObjectsWithParentTest.java
index 4b62e67..abf3cc0 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/objects/filtered/ObjectsWithParentTest.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/objects/filtered/ObjectsWithParentTest.java
@@ -47,6 +47,7 @@ class ObjectsWithParentTest {
     @Test
     public void works() throws Exception {
         final int size = 3;
+        final String schema = "public";
         final Func<Iterable<String>, DbObject<YamlMapping>> func = iterable -> new SimpleDbObject<>(
             new MappingEmpty(),
             new SimpleObjectSignature(
@@ -64,13 +65,13 @@ public void works() throws Exception {
             new SetOf<>(
                 new ObjectsWithParent<>(
                     func.apply(
-                        new IterableOf<String>("public")
+                        new IterableOf<String>(schema)
                     ),
                     new DefaultObjects(
                         new IterableOf<DbObject<?>>(
-                            func.apply(new IterableOf<String>("public", "1")),
-                            func.apply(new IterableOf<String>("public", "2")),
-                            func.apply(new IterableOf<String>("public", "3"))
+                            func.apply(new IterableOf<String>(schema, "1")),
+                            func.apply(new IterableOf<String>(schema, "2")),
+                            func.apply(new IterableOf<String>(schema, "3"))
                         )
                     )
                 )
diff --git a/src/test/java/org/fusionsoft/database/snapshot/objects/filtered/package-info.java b/src/test/java/org/fusionsoft/database/snapshot/objects/filtered/package-info.java
index 7b60c69..5de8d09 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/objects/filtered/package-info.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/objects/filtered/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromServerTest.java b/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromServerTest.java
index 259b09d..348a685 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromServerTest.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromServerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/package-info.java b/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/package-info.java
index 2f70169..274fddb 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/package-info.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgConstraintsTest.java b/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgConstraintsTest.java
index fd26b4f..825c920 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgConstraintsTest.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgConstraintsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgSequencesTest.java b/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgSequencesTest.java
index 3172e0b..b4c9bae 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgSequencesTest.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/PgSequencesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/package-info.java b/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/package-info.java
index 7abb792..bac67fb 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/package-info.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/pg/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/objects/package-info.java b/src/test/java/org/fusionsoft/database/snapshot/objects/package-info.java
index 426fc35..86c5aa3 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/objects/package-info.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/objects/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/query/pg/PgConstraintsQueryTest.java b/src/test/java/org/fusionsoft/database/snapshot/query/pg/PgConstraintsQueryTest.java
index f9de380..81457a3 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/query/pg/PgConstraintsQueryTest.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/query/pg/PgConstraintsQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/query/pg/PgDomainsQueryTest.java b/src/test/java/org/fusionsoft/database/snapshot/query/pg/PgDomainsQueryTest.java
index 7448509..a933a1d 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/query/pg/PgDomainsQueryTest.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/query/pg/PgDomainsQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/query/pg/PgSequencesQueryTest.java b/src/test/java/org/fusionsoft/database/snapshot/query/pg/PgSequencesQueryTest.java
index 64be84e..2164d52 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/query/pg/PgSequencesQueryTest.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/query/pg/PgSequencesQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/database/snapshot/query/pg/package-info.java b/src/test/java/org/fusionsoft/database/snapshot/query/pg/package-info.java
index 6e29ecc..8773598 100644
--- a/src/test/java/org/fusionsoft/database/snapshot/query/pg/package-info.java
+++ b/src/test/java/org/fusionsoft/database/snapshot/query/pg/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/lib/collection/StrictMapTest.java b/src/test/java/org/fusionsoft/lib/collection/StrictMapTest.java
index 6ed0498..2ec3c50 100644
--- a/src/test/java/org/fusionsoft/lib/collection/StrictMapTest.java
+++ b/src/test/java/org/fusionsoft/lib/collection/StrictMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/lib/collection/package-info.java b/src/test/java/org/fusionsoft/lib/collection/package-info.java
index 20321f0..29dedad 100644
--- a/src/test/java/org/fusionsoft/lib/collection/package-info.java
+++ b/src/test/java/org/fusionsoft/lib/collection/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/lib/input/InputPrintsToConsoleTest.java b/src/test/java/org/fusionsoft/lib/input/InputPrintsToConsoleTest.java
index 6d74700..bb5d9e0 100644
--- a/src/test/java/org/fusionsoft/lib/input/InputPrintsToConsoleTest.java
+++ b/src/test/java/org/fusionsoft/lib/input/InputPrintsToConsoleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/lib/input/package-info.java b/src/test/java/org/fusionsoft/lib/input/package-info.java
index 5632693..b280723 100644
--- a/src/test/java/org/fusionsoft/lib/input/package-info.java
+++ b/src/test/java/org/fusionsoft/lib/input/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/lib/yaml/MappingMergedTest.java b/src/test/java/org/fusionsoft/lib/yaml/MappingMergedTest.java
index 12cbabb..a5123d0 100644
--- a/src/test/java/org/fusionsoft/lib/yaml/MappingMergedTest.java
+++ b/src/test/java/org/fusionsoft/lib/yaml/MappingMergedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalarsNestedTest.java b/src/test/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalarsNestedTest.java
index feb22c9..524166d 100644
--- a/src/test/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalarsNestedTest.java
+++ b/src/test/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalarsNestedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalarsTest.java b/src/test/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalarsTest.java
index 239d488..2d87b1b 100644
--- a/src/test/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalarsTest.java
+++ b/src/test/java/org/fusionsoft/lib/yaml/MappingWithoutNullScalarsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/lib/yaml/artefacts/TextIterableOfFlowYamlSequenceTest.java b/src/test/java/org/fusionsoft/lib/yaml/artefacts/TextIterableOfFlowYamlSequenceTest.java
index 627f9ed..d33a595 100644
--- a/src/test/java/org/fusionsoft/lib/yaml/artefacts/TextIterableOfFlowYamlSequenceTest.java
+++ b/src/test/java/org/fusionsoft/lib/yaml/artefacts/TextIterableOfFlowYamlSequenceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 /**
  * Tests for {@link TextIterableOfFlowYamlSequence} tests.
  * @since 0.1
+ * @checkstyle ClassDataAbstractionCouplingCheck (100 lines)
  */
 @SuppressWarnings("PMD")
 class TextIterableOfFlowYamlSequenceTest {
diff --git a/src/test/java/org/fusionsoft/lib/yaml/artefacts/package-info.java b/src/test/java/org/fusionsoft/lib/yaml/artefacts/package-info.java
index efe6eb0..eea0c53 100644
--- a/src/test/java/org/fusionsoft/lib/yaml/artefacts/package-info.java
+++ b/src/test/java/org/fusionsoft/lib/yaml/artefacts/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.
diff --git a/src/test/java/org/fusionsoft/lib/yaml/package-info.java b/src/test/java/org/fusionsoft/lib/yaml/package-info.java
index e7c8c29..212a4e7 100644
--- a/src/test/java/org/fusionsoft/lib/yaml/package-info.java
+++ b/src/test/java/org/fusionsoft/lib/yaml/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 FusionSoft
+ * Copyright (C) 2018-2022 FusionSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * You may not use this file except in compliance with the License.