diff --git a/src/FusionDirectory/Audit/AuditLib.php b/src/FusionDirectory/Audit/AuditLib.php
index e74379a2282308a11075ab59e6ee44324a960506..f6e86e35d9448c49fc28c8db829329888702f414 100644
--- a/src/FusionDirectory/Audit/AuditLib.php
+++ b/src/FusionDirectory/Audit/AuditLib.php
@@ -11,14 +11,21 @@ use FusionDirectory\Ldap;
 class AuditLib
 {
 
-  private string $subTaskDN, $subTaskCN;
-  private int                $auditRetention;
-  // Usage of CLI bool is to make sure we use proper method in case of direct CLI call. (Instead of Orchestrator).
-  private array     $auditList;
-  private Ldap\Link $ldapBind;
-  private object    $gateway;
-
-  public function __construct (int $auditRetention, array $auditList, $gateway = NULL, string $subTaskDN = NULL, string $subTaskCN = NULL, $ldapBind = NULL)
+  private int        $auditRetention;
+  private ?string    $subTaskDN;
+  private ?string    $subTaskCN;
+  private array      $auditList;
+  private ?Ldap\Link $ldapBind;
+  private ?object    $gateway;
+
+  public function __construct (
+    int $auditRetention,
+    array $auditList,
+    ?object $gateway = NULL,
+    ?string $subTaskDN = NULL,
+    ?string $subTaskCN = NULL,
+    ?Ldap\Link $ldapBind = NULL
+  )
   {
     $this->auditRetention = $auditRetention;
     $this->subTaskDN      = $subTaskDN;