diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index adee40de2..05d75a9bc 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -120,12 +120,12 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     private ?int $id = null;
 
     /**
-     * @var ArrayCollection<int, Invite>
+     * @var \Doctrine\Common\Collections\Collection<int, \Chill\CalendarBundle\Entity\Invite>&Selectable
      */
     #[Serializer\Groups(['read', 'docgen:read'])]
     #[ORM\OneToMany(mappedBy: 'calendar', targetEntity: Invite::class, cascade: ['persist', 'remove', 'merge', 'detach'], orphanRemoval: true)]
     #[ORM\JoinTable(name: 'chill_calendar.calendar_to_invites')]
-    private ArrayCollection $invites;
+    private Collection&Selectable $invites;
 
     #[Serializer\Groups(['read', 'docgen:read'])]
     #[Assert\NotNull(message: 'calendar.A location is required')]
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index ce7a9935b..0c8c87553 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -83,10 +83,10 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
     private ?Location $mainLocation = null;
 
     /**
-     * @var ArrayCollection<int, UserScopeHistory>
+     * @var \Doctrine\Common\Collections\Collection<int, \Chill\MainBundle\Entity\User\UserScopeHistory>&Selectable
      */
     #[ORM\OneToMany(mappedBy: 'user', targetEntity: UserScopeHistory::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
-    private ArrayCollection $scopeHistories;
+    private Collection&Selectable $scopeHistories;
 
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 255)]
     private string $password = '';
@@ -98,10 +98,10 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
     private ?string $salt = null;
 
     /**
-     * @var ArrayCollection<int, UserJobHistory>
+     * @var \Doctrine\Common\Collections\Collection<int, \Chill\MainBundle\Entity\User\UserJobHistory>&Selectable
      */
     #[ORM\OneToMany(mappedBy: 'user', targetEntity: UserJobHistory::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
-    private ArrayCollection $jobHistories;
+    private Collection&Selectable $jobHistories;
 
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 80)]
     private string $username = '';
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
index 68b1f1b51..460db387d 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
@@ -21,7 +21,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Order;
 use Doctrine\ORM\Mapping as ORM;
-use Exception;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
 
@@ -278,7 +277,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
     }
 
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     public function getStepsChained(): array
     {
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index c9bf05fdb..85b80faf8 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -135,10 +135,10 @@ class AccompanyingPeriod implements
     private ?Location $administrativeLocation = null;
 
     /**
-     * @var ArrayCollection<int, Calendar>
+     * @var \Doctrine\Common\Collections\Collection<int, \Chill\CalendarBundle\Entity\Calendar>&Selectable
      */
     #[ORM\OneToMany(mappedBy: 'accompanyingPeriod', targetEntity: Calendar::class)]
-    private ArrayCollection $calendars;
+    private Collection&Selectable $calendars;
 
     #[Groups(['read', 'write', 'docgen:read'])]
     #[Assert\NotBlank(groups: [AccompanyingPeriod::STEP_CLOSED])]
@@ -153,7 +153,7 @@ class AccompanyingPeriod implements
     private ?ClosingMotive $closingMotive = null;
 
     /**
-     * @var Collection<(int|string), Comment>
+     * @var \Doctrine\Common\Collections\Collection<int, \Chill\PersonBundle\Entity\AccompanyingPeriod\Comment>
      */
     #[Assert\NotBlank(groups: [AccompanyingPeriod::STEP_DRAFT])]
     #[ORM\OneToMany(mappedBy: 'accompanyingPeriod', targetEntity: Comment::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
@@ -246,7 +246,7 @@ class AccompanyingPeriod implements
     private ?ThirdParty $requestorThirdParty = null;
 
     /**
-     * @var Collection<int, Resource>
+     * @var Collection<int, AccompanyingPeriod\Resource>
      */
     #[Groups(['read', 'docgen:read'])]
     #[ORM\OneToMany(targetEntity: AccompanyingPeriod\Resource::class, mappedBy: 'accompanyingPeriod', cascade: ['persist', 'remove'], orphanRemoval: true)]
@@ -427,7 +427,7 @@ class AccompanyingPeriod implements
         return $this;
     }
 
-    public function addResource(Resource $resource): self
+    public function addResource(AccompanyingPeriod\Resource $resource): self
     {
         $resource->setAccompanyingPeriod($this);
         $this->resources[] = $resource;
@@ -592,7 +592,7 @@ class AccompanyingPeriod implements
     }
 
     /**
-     * @return ReadableCollection<(int|string), Comment>
+     * @return ReadableCollection<int, Comment>
      */
     #[Groups(['read'])]
     public function getComments(): ReadableCollection
@@ -897,6 +897,9 @@ class AccompanyingPeriod implements
         return $this->requestorThirdParty;
     }
 
+    /**
+     * @return Collection<int, AccompanyingPeriod\Resource>
+     */
     public function getResources(): Collection
     {
         return $this->resources;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
index 719baddaf..6ecc0366d 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
@@ -48,12 +48,12 @@ class Household implements HasCentersInterface
     private CommentEmbeddable $commentMembers;
 
     /**
-     * @var ArrayCollection<int, HouseholdComposition>
+     * @var \Doctrine\Common\Collections\Collection<int, \Chill\PersonBundle\Entity\Household\HouseholdComposition>&Selectable
      */
     #[Assert\Valid(groups: ['household_composition'], traverse: true)]
     #[ORM\OneToMany(mappedBy: 'household', targetEntity: HouseholdComposition::class, cascade: ['persist'], orphanRemoval: true)]
     #[ORM\OrderBy(['startDate' => Criteria::DESC])]
-    private ArrayCollection $compositions;
+    private Collection&Selectable $compositions;
 
     #[Serializer\Groups(['read', 'docgen:read'])]
     #[ORM\Id]
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 5d4486179..b9b3e5bf4 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -39,6 +39,7 @@ use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
+use Doctrine\Common\Collections\Selectable;
 use Doctrine\ORM\Mapping as ORM;
 use libphonenumber\PhoneNumber;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
@@ -153,10 +154,10 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private ?PersonCenterCurrent $centerCurrent = null;
 
     /**
-     * @var ArrayCollection<int, PersonCenterHistory>
+     * @var \Doctrine\Common\Collections\Collection<int, \Chill\PersonBundle\Entity\Person\PersonCenterHistory>&Selectable
      */
     #[ORM\OneToMany(mappedBy: 'person', targetEntity: PersonCenterHistory::class, cascade: ['persist', 'remove'])]
-    private ArrayCollection $centerHistory;
+    private Collection&Selectable $centerHistory;
 
     /**
      * Array where customfield's data are stored.
@@ -1440,7 +1441,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setCenterHistory(Collection $centerHistory): Person
+    public function setCenterHistory(Collection&Selectable $centerHistory): Person
     {
         $this->centerHistory = $centerHistory;