diff --git a/Models/Checklist.php b/Models/Checklist.php
index 77aa6ff..bb31686 100644
--- a/Models/Checklist.php
+++ b/Models/Checklist.php
@@ -40,6 +40,11 @@ class Checklist
 
     public array $tasks = [];
 
+    /**
+     * Constructor.
+     *
+     * @since 1.0.0
+     */
     public function __construct()
     {
         $this->createdAt = new \DateTimeImmutable();
diff --git a/Models/ChecklistMapper.php b/Models/ChecklistMapper.php
index 8e9c05a..6516ac1 100644
--- a/Models/ChecklistMapper.php
+++ b/Models/ChecklistMapper.php
@@ -25,7 +25,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @link    https://jingga.app
  * @since   1.0.0
  *
- * @template T of BaseStringL11n
+ * @template T of Checklist
  * @extends DataMapperFactory<T>
  */
 final class ChecklistMapper extends DataMapperFactory
diff --git a/Models/ChecklistTemplate.php b/Models/ChecklistTemplate.php
index d1c22dc..5b3d444 100644
--- a/Models/ChecklistTemplate.php
+++ b/Models/ChecklistTemplate.php
@@ -49,6 +49,11 @@ class ChecklistTemplate
      */
     public array $tasks = [];
 
+    /**
+     * Constructor.
+     *
+     * @since 1.0.0
+     */
     public function __construct()
     {
         $this->start = new \DateTime();
diff --git a/Models/ChecklistTemplateMapper.php b/Models/ChecklistTemplateMapper.php
index 9b789b6..b3af8a1 100644
--- a/Models/ChecklistTemplateMapper.php
+++ b/Models/ChecklistTemplateMapper.php
@@ -25,7 +25,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @link    https://jingga.app
  * @since   1.0.0
  *
- * @template T of BaseStringL11n
+ * @template T of ChecklistTemplate
  * @extends DataMapperFactory<T>
  */
 final class ChecklistTemplateMapper extends DataMapperFactory
diff --git a/Models/ChecklistTemplateTaskMapper.php b/Models/ChecklistTemplateTaskMapper.php
index 355edf6..ba05ec8 100644
--- a/Models/ChecklistTemplateTaskMapper.php
+++ b/Models/ChecklistTemplateTaskMapper.php
@@ -25,7 +25,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @link    https://jingga.app
  * @since   1.0.0
  *
- * @template T of BaseStringL11n
+ * @template T of ChecklistTemplateTask
  * @extends DataMapperFactory<T>
  */
 final class ChecklistTemplateTaskMapper extends DataMapperFactory
diff --git a/Models/NullChecklistTemplateTask.php b/Models/NullChecklistTemplateTask.php
index 3600ad1..63a229a 100644
--- a/Models/NullChecklistTemplateTask.php
+++ b/Models/NullChecklistTemplateTask.php
@@ -22,7 +22,7 @@ namespace Modules\Checklist\Models;
  * @link    https://jingga.app
  * @since   1.0.0
  */
-final class NullChecklistTask extends ChecklistTask
+final class NullChecklistTemplateTask extends ChecklistTemplateTask
 {
     /**
      * Constructor
diff --git a/Theme/Backend/checklist-view.tpl.php b/Theme/Backend/checklist-view.tpl.php
index 19267c3..5fa57d9 100644
--- a/Theme/Backend/checklist-view.tpl.php
+++ b/Theme/Backend/checklist-view.tpl.php
@@ -13,7 +13,6 @@
 declare(strict_types=1);
 
 use Modules\Tasks\Models\TaskPriority;
-use phpOMS\Stdlib\Base\SmartDateTime;
 
 /**
  * @var \phpOMS\Views\View $this