diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index d577fd911..ad570a8a4 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -240,9 +240,6 @@ class ActivityContext implements
         return $options['mainPerson'] || $options['person1'] || $options['person2'];
     }
 
-    /**
-     * @param Activity $entity
-     */
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $storedObject->setTitle($this->translatableStringHelper->localize($template->getName()));
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
index f1951978c..e10ee3da4 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
@@ -53,8 +53,6 @@ class ListActivitiesByAccompanyingPeriodContext implements
 
     private PersonRepository $personRepository;
 
-    private Security $security;
-
     private SocialActionRepository $socialActionRepository;
 
     private SocialIssueRepository $socialIssueRepository;
@@ -75,7 +73,6 @@ class ListActivitiesByAccompanyingPeriodContext implements
         ThirdPartyRepository $thirdPartyRepository,
         TranslatableStringHelperInterface $translatableStringHelper,
         UserRepository $userRepository,
-        Security $security
     ) {
         $this->accompanyingPeriodContext = $accompanyingPeriodContext;
         $this->activityACLAwareRepository = $activityACLAwareRepository;
@@ -86,7 +83,6 @@ class ListActivitiesByAccompanyingPeriodContext implements
         $this->thirdPartyRepository = $thirdPartyRepository;
         $this->translatableStringHelper = $translatableStringHelper;
         $this->userRepository = $userRepository;
-        $this->security = $security;
     }
 
     public function adminFormReverseTransform(array $data): array
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
index f5b244027..cabb7dcce 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
@@ -31,8 +31,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use function count;
 
-/**
- */
 final class CalendarContext implements CalendarContextInterface
 {
     private BaseContextData $baseContextData;
@@ -150,10 +148,8 @@ final class CalendarContext implements CalendarContextInterface
     }
 
     /**
-     * param array{mainPerson?: Person, thirdParty?: ThirdParty, title: string} $contextGenerationData
-     * @param mixed $entity
      */
-    public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
+    public function getData(DocGeneratorTemplate $template, mixed $entity, array $contextGenerationData = []): array
     {
         $options = $this->getOptions($template);
 
@@ -274,9 +270,6 @@ final class CalendarContext implements CalendarContextInterface
         return $denormalized;
     }
 
-    /**
-     * param array{mainPerson?: Person, thirdParty?: ThirdParty, title: string} $contextGenerationData
-     */
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $options = $this->getOptions($template);
@@ -287,9 +280,6 @@ final class CalendarContext implements CalendarContextInterface
         $this->entityManager->persist($doc);
     }
 
-    /**
-     * return array{askMainPerson: bool, mainPersonLabel: ?string, askThirdParty: bool, thirdPartyLabel: ?string, trackDateTime: bool} $options
-     */
     private function getOptions(DocGeneratorTemplate $template): array
     {
         return $template->getOptions();
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
index 4ae85d33a..527203003 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Service\DocGenerator;
 
 use Chill\CalendarBundle\Entity\Calendar;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextInterface;
 use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
 use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
@@ -19,37 +20,9 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * @template-extends DocGeneratorContextWithPublicFormInterface<Calendar>
+ * @extends DocGeneratorContextWithPublicFormInterface<Calendar>
+ * @extends DocGeneratorContextWithAdminFormInterface<Calendar>
  */
 interface CalendarContextInterface extends DocGeneratorContextWithPublicFormInterface, DocGeneratorContextWithAdminFormInterface
 {
-    public function adminFormReverseTransform(array $data): array;
-
-    public function adminFormTransform(array $data): array;
-
-    public function buildAdminForm(FormBuilderInterface $builder): void;
-
-    public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void;
-
-    public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array;
-
-    public function getDescription(): string;
-
-    public function getEntityClass(): string;
-
-    public function getFormData(DocGeneratorTemplate $template, $entity): array;
-
-    public static function getKey(): string;
-
-    public function getName(): string;
-
-    public function hasAdminForm(): bool;
-
-    public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool;
-
-    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array;
-
-    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array;
-
-    public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void;
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php
index 4707bf398..732d4b796 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php
@@ -13,6 +13,10 @@ namespace Chill\DocGeneratorBundle\Context;
 
 use Symfony\Component\Form\FormBuilderInterface;
 
+/**
+ * @template T of object
+ * @extends DocGeneratorContextInterface<T>
+ */
 interface DocGeneratorContextWithAdminFormInterface extends DocGeneratorContextInterface
 {
     public function adminFormReverseTransform(array $data): array;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
index a60a35123..496524206 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
@@ -15,7 +15,8 @@ use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * @template T
+ * @template T of object
+ * @extends DocGeneratorContextInterface<T>
  */
 interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContextInterface
 {