diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
index 9718cf013..3444a57a6 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
@@ -12,13 +12,14 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
+use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 
 class WorkflowEntityDeletionVoter extends Voter
 {
     /**
-     * @param \Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface[] $handlers
+     * @param EntityWorkflowHandlerInterface[] $handlers
      */
     public function __construct(private $handlers, private readonly EntityWorkflowRepository $entityWorkflowRepository) {}
 
@@ -30,7 +31,7 @@ class WorkflowEntityDeletionVoter extends Voter
 
         foreach ($this->handlers as $handler) {
             if ($handler->isObjectSupported($subject)
-                && \in_array($attribute, $handler->getDeletionRoles($subject), true)) {
+                && \in_array($attribute, $handler->getDeletionRoles(), true)) {
                 return true;
             }
         }
diff --git a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
index e79982e1c..edd1120a7 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
@@ -14,6 +14,9 @@ namespace Chill\MainBundle\Workflow;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 
+/**
+ * @template T of object
+ */
 interface EntityWorkflowHandlerInterface
 {
     /**
@@ -25,6 +28,9 @@ interface EntityWorkflowHandlerInterface
 
     public function getEntityTitle(EntityWorkflow $entityWorkflow, array $options = []): string;
 
+    /**
+     * @return T|null
+     */
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?object;
 
     public function getRelatedObjects(object $object): array;
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
index a041b3c37..113d5f5c8 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
@@ -20,9 +20,16 @@ use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkEvalu
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkEvaluationVoter;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowHandlerInterface
+/**
+ * @implements EntityWorkflowHandlerInterface<AccompanyingPeriodWorkEvaluation>
+ */
+readonly class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowHandlerInterface
 {
-    public function __construct(private readonly AccompanyingPeriodWorkEvaluationRepository $repository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly TranslatorInterface $translator) {}
+    public function __construct(
+        private AccompanyingPeriodWorkEvaluationRepository $repository,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+        private TranslatorInterface $translator
+    ) {}
 
     public function getDeletionRoles(): array
     {
@@ -53,9 +60,6 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
         return $this->repository->find($entityWorkflow->getRelatedEntityId());
     }
 
-    /**
-     * @param AccompanyingPeriodWorkEvaluation $object
-     */
     public function getRelatedObjects(object $object): array
     {
         $relateds = [];
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
index ce146a887..837ee2aac 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
@@ -21,9 +21,16 @@ use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepos
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInterface
+/**
+ * @implements EntityWorkflowHandlerInterface<AccompanyingPeriodWork>
+ */
+readonly class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInterface
 {
-    public function __construct(private readonly AccompanyingPeriodWorkRepository $repository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly TranslatorInterface $translator) {}
+    public function __construct(
+        private AccompanyingPeriodWorkRepository $repository,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+        private TranslatorInterface $translator
+    ) {}
 
     public function getDeletionRoles(): array
     {
@@ -55,9 +62,6 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
         return $this->repository->find($entityWorkflow->getRelatedEntityId());
     }
 
-    /**
-     * @param AccompanyingPeriodWork $object
-     */
     public function getRelatedObjects(object $object): array
     {
         $relateds = [];