diff --git a/Model/CoverimageDuplicator.php b/Model/CoverimageDuplicator.php
deleted file mode 100755
index 037ee96..0000000
--- a/Model/CoverimageDuplicator.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Kanboard\Plugin\Coverimage\Model;
-
-use Kanboard\Model\TaskDuplicationModel;
-
-/**
- * CoverimageDuplicator Model
- * Extends Task Duplication Model to duplicate metadata
- *
- * @package  Kanboard\Plugin\Coverimage\Model
- */
-class CoverimageDuplicator extends TaskDuplicationModel
-{
-    /**
-     * Extended taskDuplicatorModel
-     *
-     */
-    public function duplicate($task_id)
-    {
-        // add duplicated task functions after duplicated
-        $new_task_id = parent::duplicate($task_id);
-        
-        $file = $this->coverimageModel->getCoverimage($task_id);
-        $file_id = $this->taskFileModel->create($new_task_id, $file['name'], $file['path'], $file['size']);
-        $this->coverimageModel->setCoverimage($new_task_id, $file_id);
-
-        return $new_task_id;
-        
-    }
-
-}
diff --git a/Model/CoverimageProjectDuplicator.php b/Model/CoverimageProjectDuplicator.php
deleted file mode 100755
index e806d0e..0000000
--- a/Model/CoverimageProjectDuplicator.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Kanboard\Plugin\Coverimage\Model;
-
-use Kanboard\Model\TaskProjectDuplicationModel;
-use Kanboard\Model\TaskFileModel;
-use Kanboard\Plugin\Coverimage\Model\CoverimageModel;
-
-/**
- * CoverimageDuplicator Model
- * Extends Task Duplication Model to duplicate metadata
- *
- * @package  Kanboard\Plugin\Coverimage\Model
- */
-class CoverimageProjectDuplicator extends TaskProjectDuplicationModel
-{
-    /**
-     * Extended taskProjectDuplicationModel
-     *
-     */
-    public function duplicateToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
-    {
-        // add duplicated task functions after duplicated
-        $new_task_id = parent::duplicateToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
-        
-        $file = $this->coverimageModel->getCoverimage($task_id);
-        $file_id = $this->taskFileModel->create($new_task_id, $file['name'], $file['path'], $file['size']);
-        $this->coverimageModel->setCoverimage($new_task_id, $file_id);
-        
-        return $new_task_id;
-        
-    }
-
-}
diff --git a/Plugin.php b/Plugin.php
index c5485f6..4eaa428 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -4,10 +4,6 @@
 
 use Kanboard\Core\Plugin\Base;
 use Kanboard\Core\Translator;
-use Kanboard\Model\TaskDuplicationModel;
-use Kanboard\Model\TaskProjectDuplicationModel;
-use Kanboard\Plugin\Coverimage\Model\CoverimageDuplicator;
-use Kanboard\Plugin\Coverimage\Model\CoverimageProjectDuplicator;
 use Kanboard\Core\Security\Role;
 
 class Plugin extends Base
@@ -33,12 +29,13 @@ public function initialize()
         //Permissions for public file view   
         $this->applicationAccessMap->add('FileViewerController', array('thumbnail'), Role::APP_PUBLIC);
 
-        //Model extensions
-        $this->container['taskDuplicationModel'] = $this->container->factory(function ($c) {
-            return new CoverimageDuplicator($c);
-        });
-        $this->container['taskProjectDuplicationModel'] = $this->container->factory(function ($c) {
-            return new CoverimageProjectDuplicator($c);
+        $this->hook->on('model:task:duplication:aftersave', function ($ids) {            
+            $target_task_id = $ids['target_task_id'];
+            $source_task_id = $ids['source_task_id'];
+            
+            $file = $this->coverimageModel->getCoverimage($source_task_id);
+            $file_id = $this->taskFileModel->create($target_task_id, $file['name'], $file['path'], $file['size']);
+            $this->coverimageModel->setCoverimage($target_task_id, $file_id);
         });
 
     }