diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema
index f7c7ea36371d4704919b9bdb7e9cfd336907f9eb..0ffe82de9bc8ffc52fb4b1ace4924175cf67e526 100644
--- a/contrib/openldap/core-fd.schema
+++ b/contrib/openldap/core-fd.schema
@@ -307,8 +307,7 @@ attributetype ( 1.3.6.1.4.1.38414.62.1.56 NAME 'fdTasksGranularMailBCC'
 attributetype ( 1.3.6.1.4.1.38414.62.1.26 NAME 'fdTasksGranularRef'
   DESC 'Fusion Directory - Reference towards a CN (E.g Mail Template)'
   EQUALITY caseExactMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE )
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
 ## Any tasks requiring to store DN (Such as lifeCycle). ##
 
diff --git a/plugins/configuration/tasks/class_tasks.inc b/plugins/configuration/tasks/class_tasks.inc
index 49f510baddb137cab80769aa15e1a4d106c1cb9e..d95aae6bdb1fcd637c8c24d1c8ff3408adca8a86 100644
--- a/plugins/configuration/tasks/class_tasks.inc
+++ b/plugins/configuration/tasks/class_tasks.inc
@@ -112,7 +112,7 @@ class tasks extends simplePlugin
   {
     // Verification if the bool of activation is ticked and activate the last exec accordingly.
     if ($this->fdSubTasksActivation === TRUE) {
-      $currentDateTime       = gmdate("Y-m-d h:i:sa", time());
+      $currentDateTime       = date("Y-m-d H:i:s");
       $this->fdTasksLastExec = $currentDateTime;
     }
     return parent::save();
@@ -204,6 +204,8 @@ class tasks extends simplePlugin
             $prepData['tasksGranular'] = [
               "fdTasksGranularDN"   => $dn,
               "fdTasksGranularType" => $taskType,
+              // Verification as 'ref' could potentially not be present depending on the logic of the main task.
+              "fdTasksGranularRef"  => !empty($attrs['ref'][$dn]) ? array_values($attrs['ref'][$dn]) : [],
             ];
             break;
         }
diff --git a/plugins/configuration/tasks/class_tasksGranular.inc b/plugins/configuration/tasks/class_tasksGranular.inc
index 445e3ab04b9be5a21c7f57f333bb02bf57dc3f33..8dfbdd777394e3e201d3343f0fe802f43a49b3b7 100644
--- a/plugins/configuration/tasks/class_tasksGranular.inc
+++ b/plugins/configuration/tasks/class_tasksGranular.inc
@@ -25,15 +25,15 @@ class tasksGranular extends simplePlugin
   static function plInfo (): array
   {
     return [
-      'plShortName'   => _('Tasks Granular'),
-      'plDescription' => _('Granular tasks management allowing details reports'),
-      'plObjectClass' => ['fdTasksGranular'],
-      'plFilter'      => '(objectClass=fdTasksGranular)',
-      'plPriority'    => 41,
-      'plObjectType'  => ['tasksGranular' => [
-        'name'        => _('TasksGranular'),
-        'ou'          => get_ou('tasksRDN'),
-        'icon'        => 'geticon.php?context=applications&icon=tasks&size=16',
+      'plShortName'    => _('Tasks Granular'),
+      'plDescription'  => _('Granular tasks management allowing details reports'),
+      'plObjectClass'  => ['fdTasksGranular'],
+      'plFilter'       => '(objectClass=fdTasksGranular)',
+      'plPriority'     => 41,
+      'plObjectType'   => ['tasksGranular' => [
+        'name' => _('TasksGranular'),
+        'ou'   => get_ou('tasksRDN'),
+        'icon' => 'geticon.php?context=applications&icon=tasks&size=16',
       ]],
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     ];
@@ -59,23 +59,23 @@ class tasksGranular extends simplePlugin
           new HiddenAttribute('fdTasksGranularStatus', TRUE, '1', '', 'Status', 'Status of the task'),
           new HiddenAttribute('fdTasksGranularMaster', TRUE, '', '', 'Master CN', 'Name of the Master task'),
           new HiddenAttribute('fdTasksGranularType', TRUE, '', '', 'Type', 'Type of the task'),
-          new HiddenAttribute('fdTasksGranularRef', FALSE, '', '', 'Type', 'Reference towards a required CN (mail template E.g'),
+          new HiddenArrayAttribute('fdTasksGranularRef', FALSE, '', '', 'Type', 'Reference towards a required CN (mail template E.g'),
           new DateTimeAttribute(
             _('Schedule'), '',
             'fdTasksGranularSchedule', FALSE
           ),
-          // Below attribute are for tasks of type lifeCycle
-          new StringAttribute(
-            _('lifeCycleDN'), _('DN list filled by tasks lifeCycle'),
+          // Below attribute are for tasks of type lifeCycle and other tasks added as plugin
+          new StringAttribute( // Attribute is mostly used to store important DN requiring processing by Orchestrator.
+            _('Related DN'), _('DN list filled by main tasks'),
             'fdTasksGranularDN', FALSE
           ),
           // Below attributes are for tasks of type Mail
           new MailAttribute(
-             _('Email'),
-             _('Email address to which messages will be sent'), 'fdTasksGranularMail', FALSE),
+            _('Email'),
+            _('Email address to which messages will be sent'), 'fdTasksGranularMail', FALSE),
           new MailAttribute(
-             _('Email'),
-             _('Email address from which emails will be sent'), 'fdTasksGranularMailFrom', FALSE),
+            _('Email'),
+            _('Email address from which emails will be sent'), 'fdTasksGranularMailFrom', FALSE),
           new MailAttribute(
             _('Email'),
             _('BCC Email address'), 'fdTasksGranularMailBCC', FALSE),