diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
index 8288f5c74..dd3ba3b6a 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
@@ -12,8 +12,12 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
 use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
@@ -89,7 +93,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
     {
         $reasonRef = LoadActivityReason::$references[array_rand(LoadActivityReason::$references)];
 
-        return $this->getReference($reasonRef, null);
+        return $this->getReference($reasonRef, ActivityReason::class);
     }
 
     /**
@@ -99,7 +103,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
     {
         $typeRef = LoadActivityType::$references[array_rand(LoadActivityType::$references)];
 
-        return $this->getReference($typeRef, null);
+        return $this->getReference($typeRef, ActivityType::class);
     }
 
     /**
@@ -109,7 +113,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
     {
         $scopeRef = LoadScopes::$references[array_rand(LoadScopes::$references)];
 
-        return $this->getReference($scopeRef, null);
+        return $this->getReference($scopeRef, Scope::class);
     }
 
     /**
@@ -119,6 +123,6 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
     {
         $userRef = array_rand(LoadUsers::$refs);
 
-        return $this->getReference($userRef, null);
+        return $this->getReference($userRef, User::class);
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
index 513a786a8..f39b922ba 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Entity\ActivityReasonCategory;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
@@ -56,7 +57,7 @@ class LoadActivityReason extends AbstractFixture implements OrderedFixtureInterf
             $activityReason = (new ActivityReason())
                 ->setName($r['name'])
                 ->setActive(true)
-                ->setCategory($this->getReference($r['category'], null));
+                ->setCategory($this->getReference($r['category'], ActivityReasonCategory::class));
             $manager->persist($activityReason);
             $reference = 'activity_reason_'.$r['name']['en'];
             $this->addReference($reference, $activityReason);
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
index 7af12764e..ee1dcb510 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\ActivityBundle\Entity\ActivityTypeCategory;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
@@ -57,7 +58,7 @@ class LoadActivityType extends Fixture implements OrderedFixtureInterface
             echo 'Creating activity type : '.$t['name']['fr'].' (cat:'.$t['category']." \n";
             $activityType = (new ActivityType())
                 ->setName($t['name'])
-                ->setCategory($this->getReference('activity_type_cat_'.$t['category'], null))
+                ->setCategory($this->getReference('activity_type_cat_'.$t['category'], ActivityTypeCategory::class))
                 ->setSocialIssuesVisible(1)
                 ->setSocialActionsVisible(1);
             $manager->persist($activityType);
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
index 0dbeb4aaf..fcff80f62 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
@@ -15,7 +15,9 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
 use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\Entity\PermissionsGroup;
 use Chill\MainBundle\Entity\RoleScope;
+use Chill\MainBundle\Entity\Scope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
@@ -34,10 +36,10 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
     public function load(ObjectManager $manager): void
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
-            $permissionsGroup = $this->getReference($permissionsGroupRef, null);
+            $permissionsGroup = $this->getReference($permissionsGroupRef, PermissionsGroup::class);
 
             foreach (LoadScopes::$references as $scopeRef) {
-                $scope = $this->getReference($scopeRef, null);
+                $scope = $this->getReference($scopeRef, Scope::class);
                 // create permission group
                 switch ($permissionsGroup->getName()) {
                     case 'social':
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
index e3b6359fe..a60398507 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\AsideActivityBundle\DataFixtures\ORM;
 
 use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
 use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
 use Chill\MainBundle\Repository\UserRepository;
 use Doctrine\Bundle\FixturesBundle\Fixture;
@@ -43,7 +44,7 @@ class LoadAsideActivity extends Fixture implements DependentFixtureInterface
                 ->setUpdatedAt(new \DateTimeImmutable('now'))
                 ->setUpdatedBy($user)
                 ->setType(
-                    $this->getReference('aside_activity_category_0', null)
+                    $this->getReference('aside_activity_category_0', AsideActivityCategory::class)
                 )
                 ->setDate((new \DateTimeImmutable('today'))
                     ->sub(new \DateInterval('P'.\random_int(1, 100).'D')));
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php
index 66430208b..471f9a81a 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php
@@ -37,7 +37,7 @@ class LoadCalendarACL extends Fixture implements OrderedFixtureInterface
 
         foreach (LoadPermissionsGroup::$refs as $permissionGroupRef) {
             /** @var PermissionsGroup $group */
-            $group = $this->getReference($permissionGroupRef, null);
+            $group = $this->getReference($permissionGroupRef, PermissionsGroup::class);
 
             foreach ($roleScopes as $scope) {
                 $group->addRoleScope($scope);
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
index e869737c6..f2cd6e032 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
@@ -63,6 +63,6 @@ class LoadInvite extends Fixture implements FixtureGroupInterface
     {
         $userRef = array_rand(LoadUsers::$refs);
 
-        return $this->getReference($userRef, null);
+        return $this->getReference($userRef, User::class);
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
index cbb8c60e8..df52b848b 100644
--- a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
+++ b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
@@ -14,7 +14,9 @@ namespace Chill\DocStoreBundle\DataFixtures\ORM;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
 use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\Entity\PermissionsGroup;
 use Chill\MainBundle\Entity\RoleScope;
+use Chill\MainBundle\Entity\Scope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
@@ -32,11 +34,11 @@ class LoadDocumentACL extends AbstractFixture implements OrderedFixtureInterface
     public function load(ObjectManager $manager): void
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
-            $permissionsGroup = $this->getReference($permissionsGroupRef, null);
+            $permissionsGroup = $this->getReference($permissionsGroupRef, PermissionsGroup::class);
             printf("processing permission group %s \n", $permissionsGroup->getName());
 
             foreach (LoadScopes::$references as $scopeRef) {
-                $scope = $this->getReference($scopeRef, null);
+                $scope = $this->getReference($scopeRef, Scope::class);
                 printf("processing scope %s \n", $scope->getName()['en']);
                 // create permission group
                 switch ($permissionsGroup->getName()) {
diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php
index fbd3b5443..94167f6b8 100644
--- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php
+++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php
@@ -12,9 +12,11 @@ declare(strict_types=1);
 namespace Chill\EventBundle\DataFixtures\ORM;
 
 use Chill\EventBundle\Entity\Event;
+use Chill\EventBundle\Entity\EventType;
 use Chill\EventBundle\Entity\Participation;
 use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Scope;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
@@ -44,12 +46,12 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa
             $event = (new Event())
                 ->setDate($this->faker->dateTimeBetween('-2 years', '+6 months'))
                 ->setName($this->faker->words(random_int(2, 4), true))
-                ->setType($this->getReference(LoadEventTypes::$refs[array_rand(LoadEventTypes::$refs)], null))
+                ->setType($this->getReference(LoadEventTypes::$refs[array_rand(LoadEventTypes::$refs)], EventType::class))
                 ->setCenter($center)
                 ->setCircle(
                     $this->getReference(
                         LoadScopes::$references[array_rand(LoadScopes::$references)],
-                        null
+                        Scope::class
                     )
                 );
             $manager->persist($event);
diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
index 52dbecee8..1619b3b38 100644
--- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
+++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
@@ -13,7 +13,9 @@ namespace Chill\EventBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
 use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\Entity\PermissionsGroup;
 use Chill\MainBundle\Entity\RoleScope;
+use Chill\MainBundle\Entity\Scope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
@@ -31,10 +33,10 @@ class LoadRolesACL extends AbstractFixture implements OrderedFixtureInterface
     public function load(ObjectManager $manager): void
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
-            $permissionsGroup = $this->getReference($permissionsGroupRef, null);
+            $permissionsGroup = $this->getReference($permissionsGroupRef, PermissionsGroup::class);
 
             foreach (LoadScopes::$references as $scopeRef) {
-                $scope = $this->getReference($scopeRef, null);
+                $scope = $this->getReference($scopeRef, Scope::class);
                 // create permission group
                 switch ($permissionsGroup->getName()) {
                     case 'social':
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
index 096c52d2a..6df6a7a51 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
@@ -24,20 +24,20 @@ trait LoadAbstractNotificationsTrait
         return;
 
         foreach ($this->notifs as $notif) {
-            $entityId = $this->getReference($notif['entityRef'], null)->getId();
+            $entityId = $this->getReference($notif['entityRef'], Notification::class)->getId();
 
             echo 'Adding notification for '.$notif['entityClass'].'(entity id:'.$entityId.")\n";
 
             $newNotif = (new Notification())
                 ->setMessage($notif['message'])
-                ->setSender($this->getReference($notif['sender'], null))
+                ->setSender($this->getReference($notif['sender'], Notification::class))
                 ->setRelatedEntityClass($notif['entityClass'])
                 ->setRelatedEntityId($entityId)
                 ->setDate(new \DateTimeImmutable('now'))
                 ->setRead([]);
 
             foreach ($notif['addressees'] as $addressee) {
-                $newNotif->addAddressee($this->getReference($addressee, null));
+                $newNotif->addAddressee($this->getReference($addressee, Notification::class));
             }
 
             $manager->persist($newNotif);
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
index 2d09412f9..1c71e17cb 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
@@ -13,6 +13,7 @@ namespace Chill\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Doctrine\Model\Point;
 use Chill\MainBundle\Entity\AddressReference;
+use Chill\MainBundle\Entity\PostalCode;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
@@ -70,7 +71,7 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
         $ar->setPoint($this->getRandomPoint());
         $ar->setPostcode($this->getReference(
             LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)],
-            null
+            PostalCode::class
         ));
 
         $ar->setMunicipalityCode($ar->getPostcode()->getCode());
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
index b4fbb7bb8..8c9d37ec0 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
@@ -11,7 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\GroupCenter;
+use Chill\MainBundle\Entity\PermissionsGroup;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
@@ -30,8 +32,8 @@ class LoadGroupCenters extends AbstractFixture implements OrderedFixtureInterfac
         foreach (LoadCenters::$refs as $centerRef) {
             foreach (LoadPermissionsGroup::$refs as $permissionGroupRef) {
                 $GroupCenter = new GroupCenter();
-                $GroupCenter->setCenter($this->getReference($centerRef, null));
-                $GroupCenter->setPermissionsGroup($this->getReference($permissionGroupRef, null));
+                $GroupCenter->setCenter($this->getReference($centerRef, Center::class));
+                $GroupCenter->setPermissionsGroup($this->getReference($permissionGroupRef, PermissionsGroup::class));
 
                 $manager->persist($GroupCenter);
 
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php
index 2ef682259..3bc39a438 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Entity\PermissionsGroup;
+use Chill\MainBundle\Entity\RoleScope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
@@ -59,7 +60,7 @@ class LoadPermissionsGroup extends AbstractFixture implements OrderedFixtureInte
             $permissionGroup->setName($new['name']);
 
             foreach ($new['role_scopes'] as $roleScopeRef) {
-                $permissionGroup->addRoleScope($this->getReference($roleScopeRef, null));
+                $permissionGroup->addRoleScope($this->getReference($roleScopeRef, RoleScope::class));
             }
 
             $manager->persist($permissionGroup);
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
index 68f220d74..b1cebbaab 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
@@ -365,7 +365,7 @@ class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface
             $manager->persist($c);
             $ref = 'postal_code_'.$code[0];
 
-            if (!$this->hasReference($ref, null)) {
+            if (!$this->hasReference($ref, PostalCode::class)) {
                 $this->addReference($ref, $c);
                 self::$refs[] = $ref;
             }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
index aff69c695..a74ec9c64 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Entity\RoleScope;
+use Chill\MainBundle\Entity\Scope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
@@ -55,8 +56,8 @@ class LoadRoleScopes extends AbstractFixture implements OrderedFixtureInterface
             foreach (LoadScopes::$references as $scopeReference) {
                 $roleScope = new RoleScope();
                 $roleScope->setRole($key)
-                    ->setScope($this->getReference($scopeReference, null));
-                $reference = 'role_scope_'.$key.'_'.$this->getReference($scopeReference, null)->getName()['en'];
+                    ->setScope($this->getReference($scopeReference, Scope::class));
+                $reference = 'role_scope_'.$key.'_'.$this->getReference($scopeReference, Scope::class)->getName()['en'];
                 echo "Creating {$reference} \n";
                 $this->addReference($reference, $roleScope);
                 $manager->persist($roleScope);
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
index aa25593b3..3afdefbab 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\Entity\GroupCenter;
 use Chill\MainBundle\Entity\User;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
@@ -80,7 +81,7 @@ class LoadUsers extends AbstractFixture implements ContainerAwareInterface, Orde
                 ->setEmail(sprintf('%s@chill.social', \str_replace(' ', '', (string) $username)));
 
             foreach ($params['groupCenterRefs'] as $groupCenterRef) {
-                $user->addGroupCenter($this->getReference($groupCenterRef, null));
+                $user->addGroupCenter($this->getReference($groupCenterRef, GroupCenter::class));
             }
 
             echo 'Creating user '.$username."... \n";
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
index 1f2282082..60df2fd5f 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
@@ -64,9 +65,9 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture
                     ->setStartDate(new \DateTimeImmutable('today'))
                     ->addPerson($period->getPersons()->first())
                     ->setCreatedAt(new \DateTimeImmutable())
-                    ->setCreatedBy($this->getReference('center a_social', null))
+                    ->setCreatedBy($this->getReference('center a_social', User::class))
                     ->setUpdatedAt(new \DateTimeImmutable())
-                    ->setUpdatedBy($this->getReference('center a_social', null));
+                    ->setUpdatedBy($this->getReference('center a_social', User::class));
                 $manager->persist($work);
 
                 if ($action->getEvaluations()->count() > 0) {
@@ -91,9 +92,9 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture
                     ->setStartDate(new \DateTimeImmutable('today'))
                     ->addPerson($period->getPersons()->first())
                     ->setCreatedAt(new \DateTimeImmutable())
-                    ->setCreatedBy($this->getReference('center a_social', null))
+                    ->setCreatedBy($this->getReference('center a_social', User::class))
                     ->setUpdatedAt(new \DateTimeImmutable())
-                    ->setUpdatedBy($this->getReference('center a_social', null));
+                    ->setUpdatedBy($this->getReference('center a_social', User::class));
                 $manager->persist($work);
                 $ev = new AccompanyingPeriod\AccompanyingPeriodWorkEvaluation();
                 $ev->setAccompanyingPeriodWork($work)
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
index a3543870f..fdefa5dc8 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Household\MembersEditorFactory;
@@ -127,7 +128,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
             foreach ($this->getRandomPersons(1, 3) as $person) {
                 $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W'));
-                $position = $this->getReference(LoadHouseholdPosition::ADULT, null);
+                $position = $this->getReference(LoadHouseholdPosition::ADULT, Position::class);
 
                 $movement->addMovement($date, $person, $position, 0 === $k, 'self generated');
                 ++$k;
@@ -136,7 +137,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
             // load children
             foreach ($this->getRandomPersons(0, 3) as $person) {
                 $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W'));
-                $position = $this->getReference(LoadHouseholdPosition::CHILD, null);
+                $position = $this->getReference(LoadHouseholdPosition::CHILD, Position::class);
 
                 $movement->addMovement($date, $person, $position, 0 === $k, 'self generated');
                 ++$k;
@@ -145,7 +146,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
             // load children out
             foreach ($this->getRandomPersons(0, 2) as $person) {
                 $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W'));
-                $position = $this->getReference(LoadHouseholdPosition::CHILD_OUT, null);
+                $position = $this->getReference(LoadHouseholdPosition::CHILD_OUT, Position::class);
 
                 $movement->addMovement($date, $person, $position, 0 === $k, 'self generated');
                 ++$k;
@@ -161,7 +162,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
     {
         $ref = LoadPostalCodes::$refs[\array_rand(LoadPostalCodes::$refs)];
 
-        return $this->getReference($ref, null);
+        return $this->getReference($ref, PostalCode::class);
     }
 
     private function getRandomPersons(int $min, int $max): array
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
index 9a1d2bc54..d5299af14 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
@@ -358,8 +358,8 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
 
         if (\random_int(0, 10) > 3) {
             // always add social scope:
-            $accompanyingPeriod->addScope($this->getReference('scope_social', null));
-            $origin = $this->getReference(LoadAccompanyingPeriodOrigin::ACCOMPANYING_PERIOD_ORIGIN, null);
+            $accompanyingPeriod->addScope($this->getReference('scope_social', Scope::class));
+            $origin = $this->getReference(LoadAccompanyingPeriodOrigin::ACCOMPANYING_PERIOD_ORIGIN, AccompanyingPeriod\Origin::class);
             $accompanyingPeriod->setOrigin($origin);
             $accompanyingPeriod->setIntensity('regular');
             $accompanyingPeriod->setAddressLocation($this->createAddress());
@@ -472,7 +472,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
     {
         $ref = LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)];
 
-        return $this->getReference($ref, null);
+        return $this->getReference($ref, PostalCode::class);
     }
 
     private function getRandomSocialIssue(): SocialIssue
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
index 7b46d7c06..767923bb6 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
@@ -12,7 +12,9 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
+use Chill\MainBundle\Entity\PermissionsGroup;
 use Chill\MainBundle\Entity\RoleScope;
+use Chill\MainBundle\Entity\Scope;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\Common\DataFixtures\AbstractFixture;
@@ -33,8 +35,8 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
     public function load(ObjectManager $manager): void
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
-            $permissionsGroup = $this->getReference($permissionsGroupRef, null);
-            $scopeSocial = $this->getReference('scope_social', null);
+            $permissionsGroup = $this->getReference($permissionsGroupRef, PermissionsGroup::class);
+            $scopeSocial = $this->getReference('scope_social', Scope::class);
 
             // create permission group
             switch ($permissionsGroup->getName()) {
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
index eeb42164a..dcbb3a4c3 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\DataFixtures\ORM;
 use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\DataFixtures\Helper\PersonRandomHelper;
+use Chill\PersonBundle\Entity\Relationships\Relation;
 use Chill\PersonBundle\Entity\Relationships\Relationship;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
@@ -46,7 +47,7 @@ class LoadRelationships extends Fixture implements DependentFixtureInterface
                 ->setFromPerson($this->getRandomPerson($this->em))
                 ->setToPerson($this->getRandomPerson($this->em))
                 ->setRelation($this->getReference(LoadRelations::RELATION_KEY.
-                    random_int(0, \count(LoadRelations::RELATIONS) - 1), null))
+                    random_int(0, \count(LoadRelations::RELATIONS) - 1), Relation::class))
                 ->setReverse((bool) random_int(0, 1))
                 ->setCreatedBy($user)
                 ->setUpdatedBy($user)
@@ -74,6 +75,6 @@ class LoadRelationships extends Fixture implements DependentFixtureInterface
     {
         $userRef = array_rand(LoadUsers::$refs);
 
-        return $this->getReference($userRef, null);
+        return $this->getReference($userRef, User::class);
     }
 }
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php
index f8493f4c8..707133890 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\ReportBundle\DataFixtures\ORM;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
+use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
@@ -74,7 +75,7 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface
                 ->setOptions($cFType['options'])
                 ->setName(['fr' => "CustomField {$i}"])
                 ->setOrdering(random_int(0, 1000) / 1000)
-                ->setCustomFieldsGroup($this->getReference('cf_group_report_'.random_int(0, 3), null));
+                ->setCustomFieldsGroup($this->getReference('cf_group_report_'.random_int(0, 3), CustomFieldsGroup::class));
 
             $manager->persist($customField);
         }
@@ -87,7 +88,7 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface
     private function createExpectedFields(ObjectManager $manager)
     {
         // report logement
-        $reportLogement = $this->getReference('cf_group_report_logement', null);
+        $reportLogement = $this->getReference('cf_group_report_logement', CustomFieldsGroup::class);
 
         $houseTitle = (new CustomField())
             ->setSlug('house_title')
@@ -143,7 +144,7 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface
         $manager->persist($descriptionLogement);
 
         // report problems
-        $reportEducation = $this->getReference('cf_group_report_education', null);
+        $reportEducation = $this->getReference('cf_group_report_education', CustomFieldsGroup::class);
 
         $title = (new CustomField())
             ->setSlug('title')
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
index 6776ece5d..cb375d30f 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
@@ -13,7 +13,9 @@ namespace Chill\ReportBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
 use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\Entity\PermissionsGroup;
 use Chill\MainBundle\Entity\RoleScope;
+use Chill\MainBundle\Entity\Scope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
@@ -32,11 +34,11 @@ class LoadReportACL extends AbstractFixture implements OrderedFixtureInterface
     public function load(ObjectManager $manager): void
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
-            $permissionsGroup = $this->getReference($permissionsGroupRef, null);
+            $permissionsGroup = $this->getReference($permissionsGroupRef, PermissionsGroup::class);
             printf("processing permission group %s \n", $permissionsGroup->getName());
 
             foreach (LoadScopes::$references as $scopeRef) {
-                $scope = $this->getReference($scopeRef, null);
+                $scope = $this->getReference($scopeRef, Scope::class);
                 printf("processing scope %s \n", $scope->getName()['en']);
                 // create permission group
                 switch ($permissionsGroup->getName()) {
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
index 287705661..2a89982d8 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
@@ -12,8 +12,11 @@ declare(strict_types=1);
 namespace Chill\ReportBundle\DataFixtures\ORM;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
+use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
 use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ReportBundle\Entity\Report;
 use Doctrine\Common\DataFixtures\AbstractFixture;
@@ -60,9 +63,9 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa
         if (null !== $charline) {
             $report = (new Report())
                 ->setPerson($charline)
-                ->setCFGroup($this->getReference('cf_group_report_logement', null))
+                ->setCFGroup($this->getReference('cf_group_report_logement', CustomFieldsGroup::class))
                 ->setDate(new \DateTime('2015-01-05'))
-                ->setScope($this->getReference('scope_social', null));
+                ->setScope($this->getReference('scope_social', Scope::class));
             $this->fillReport($report);
 
             $manager->persist($report);
@@ -81,8 +84,8 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa
                 ->setPerson($person)
                 ->setCFGroup(
                     random_int(0, 10) > 5 ?
-                            $this->getReference('cf_group_report_logement', null) :
-                            $this->getReference('cf_group_report_education', null)
+                            $this->getReference('cf_group_report_logement', CustomFieldsGroup::class) :
+                            $this->getReference('cf_group_report_education', CustomFieldsGroup::class)
                 )
                 ->setScope($this->getScopeRandom());
             $this->fillReport($report);
@@ -95,7 +98,7 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa
         // setUser
         $usernameRef = array_rand(LoadUsers::$refs);
         $report->setUser(
-            $this->getReference($usernameRef, null)
+            $this->getReference($usernameRef, User::class)
         );
 
         // set date if null
@@ -214,7 +217,7 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa
     {
         $ref = LoadScopes::$references[array_rand(LoadScopes::$references)];
 
-        return $this->getReference($ref, null);
+        return $this->getReference($ref, Scope::class);
     }
 
     /**
diff --git a/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php b/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
index 14b72ed54..23043d1e9 100644
--- a/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
+++ b/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
@@ -13,7 +13,9 @@ namespace Chill\TaskBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
 use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\Entity\PermissionsGroup;
 use Chill\MainBundle\Entity\RoleScope;
+use Chill\MainBundle\Entity\Scope;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
@@ -33,10 +35,10 @@ class LoadTaskACL extends AbstractFixture implements OrderedFixtureInterface
     public function load(ObjectManager $manager): void
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
-            $permissionsGroup = $this->getReference($permissionsGroupRef, null);
+            $permissionsGroup = $this->getReference($permissionsGroupRef, PermissionsGroup::class);
 
             foreach (LoadScopes::$references as $scopeRef) {
-                $scope = $this->getReference($scopeRef, null);
+                $scope = $this->getReference($scopeRef, Scope::class);
                 // create permission group
                 switch ($permissionsGroup->getName()) {
                     case 'social':
diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
index 74713015c..dc4b5472b 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
@@ -14,6 +14,7 @@ namespace Chill\ThirdPartyBundle\DataFixtures\ORM;
 use Chill\MainBundle\DataFixtures\ORM\LoadCenters;
 use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
 use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\Bundle\FixturesBundle\Fixture;
@@ -70,10 +71,10 @@ class LoadThirdParty extends Fixture implements DependentFixtureInterface
         $number = random_int(1, \count($references));
 
         if (1 === $number) {
-            yield $this->getReference($references[array_rand($references)], null);
+            yield $this->getReference($references[array_rand($references)], Center::class);
         } else {
             foreach (array_rand($references, $number) as $index) {
-                yield $this->getReference($references[$index], null);
+                yield $this->getReference($references[$index], Center::class);
             }
         }
     }
@@ -82,7 +83,7 @@ class LoadThirdParty extends Fixture implements DependentFixtureInterface
     {
         $ref = LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)];
 
-        return $this->getReference($ref, null);
+        return $this->getReference($ref, PostalCode::class);
     }
 
     private function getThirdParties(): ObjectSet