diff --git a/composer.json b/composer.json
index a2aa29a5a..747747290 100644
--- a/composer.json
+++ b/composer.json
@@ -62,7 +62,8 @@
         "symfony/web-profiler-bundle": "^5.0"
     },
     "config": {
-        "bin-dir": "bin"
+        "bin-dir": "bin",
+        "vendor-dir": "tests/app/vendor"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index fe515918a..a454626b7 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -22,6 +22,9 @@
 
 namespace Chill\ActivityBundle\Controller;
 
+use Chill\ActivityBundle\Repository\ActivityACLAwareRepository;
+use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
@@ -36,6 +39,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Form\ActivityType;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
@@ -53,12 +57,16 @@ class ActivityController extends AbstractController
 
     protected SerializerInterface $serializer;
 
+    protected ActivityACLAwareRepositoryInterface $activityACLAwareRepository;
+
     public function __construct(
+        ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
         EventDispatcherInterface $eventDispatcher,
         AuthorizationHelper $authorizationHelper,
         LoggerInterface $logger,
         SerializerInterface $serializer
     ) {
+        $this->activityACLAwareRepository = $activityACLAwareRepository;
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
         $this->logger = $logger;
@@ -77,13 +85,9 @@ class ActivityController extends AbstractController
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($person instanceof Person) {
-            $reachableScopes = $this->authorizationHelper
-                ->getReachableCircles($this->getUser(), new Role('CHILL_ACTIVITY_SEE'),
-                    $person->getCenter());
-
-            $activities = $em->getRepository(Activity::class)
-                ->findByPersonImplied($person, $reachableScopes)
-                ;
+            $this->denyAccessUnlessGranted(ActivityVoter::SEE, $person);
+            $activities = $this->activityACLAwareRepository
+                ->findByPerson($person, ActivityVoter::SEE, 0, null);
 
             $event = new PrivacyEvent($person, array(
                 'element_class' => Activity::class,
@@ -93,10 +97,10 @@ class ActivityController extends AbstractController
 
             $view = 'ChillActivityBundle:Activity:listPerson.html.twig';
         } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $activities = $em->getRepository('ChillActivityBundle:Activity')->findBy(
-                ['accompanyingPeriod' => $accompanyingPeriod],
-                ['date' => 'DESC'],
-            );
+            $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);
+
+            $activities = $this->activityACLAwareRepository
+                ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE);
 
             $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
         }
@@ -136,6 +140,12 @@ class ActivityController extends AbstractController
             ];
         }
 
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+        } else {
+            $activityData = [];
+        }
+
         if ($view === null) {
             throw $this->createNotFoundException('Template not found');
         }
@@ -144,6 +154,7 @@ class ActivityController extends AbstractController
             'person' => $person,
             'accompanyingCourse' => $accompanyingPeriod,
             'data' => $data,
+            'activityData' => $activityData
         ]);
     }
 
@@ -163,10 +174,19 @@ class ActivityController extends AbstractController
         $activityType = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityType::class)
             ->find($activityType_id);
 
+        $activityData = null;
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+        }
+
         if (!$activityType instanceof \Chill\ActivityBundle\Entity\ActivityType ||
             !$activityType->isActive()) {
 
             $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+
+            if (null !== $activityData) {
+                $params['activityData'] = $activityData;
+            }
             return $this->redirectToRoute('chill_activity_activity_select_type', $params);
         }
 
@@ -184,6 +204,50 @@ class ActivityController extends AbstractController
         $entity->setType($activityType);
         $entity->setDate(new \DateTime('now'));
 
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+
+            if (array_key_exists('durationTime', $activityData)) {
+                $durationTimeInMinutes = $activityData['durationTime'];
+                $hours = floor($durationTimeInMinutes / 60);
+                $minutes = $durationTimeInMinutes % 60;
+                $duration = \DateTime::createFromFormat("H:i", $hours.':'.$minutes);
+                if ($duration) {
+                    $entity->setDurationTime($duration);
+                }
+            }
+
+            if (array_key_exists('date', $activityData)) {
+                $date = \DateTime::createFromFormat('Y-m-d', $activityData['date']);
+                if ($date) {
+                    $entity->setDate($date);
+                }
+            }
+
+            if (array_key_exists('personsId', $activityData)) {
+                foreach($activityData['personsId'] as $personId){
+                    $concernedPerson = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($personId);
+                    $entity->addPerson($concernedPerson);
+                }
+            }
+
+            if (array_key_exists('professionalsId', $activityData)) {
+                foreach($activityData['professionalsId'] as $professionalsId){
+                    $professional = $em->getRepository(\Chill\ThirdPartyBundle\Entity\ThirdParty::class)->find($professionalsId);
+                    $entity->addThirdParty($professional);
+                }
+            }
+
+            if (array_key_exists('comment', $activityData)) {
+                $comment = new CommentEmbeddable();
+                $comment->setComment($activityData['comment']);
+                $comment->setUserId($this->getUser()->getid());
+                $comment->setDate(new \DateTime('now'));
+                $entity->setComment($comment);
+            }
+
+        }
+
         // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity);
 
@@ -201,6 +265,7 @@ class ActivityController extends AbstractController
             $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
 
             $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+
             $params['id'] = $entity->getId();
 
             return $this->redirectToRoute('chill_activity_activity_show', $params);
@@ -238,7 +303,7 @@ class ActivityController extends AbstractController
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
-        
+
         if (null !== $accompanyingPeriod) {
            $entity->personsAssociated = $entity->getPersonsAssociated();
            $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
index b198875c5..b498a6090 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -23,6 +23,8 @@
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
@@ -33,9 +35,10 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Security\Core\Security;
 
 
-final class ActivityACLAwareRepository 
+final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInterface
 {
     private AuthorizationHelper $authorizationHelper;
 
@@ -45,16 +48,63 @@ final class ActivityACLAwareRepository
 
     private EntityManagerInterface $em;
 
+    private Security $security;
+
+    private CenterResolverDispatcher $centerResolverDispatcher;
+
     public function __construct(
         AuthorizationHelper $authorizationHelper,
+        CenterResolverDispatcher $centerResolverDispatcher,
         TokenStorageInterface $tokenStorage,
         ActivityRepository $repository,
-        EntityManagerInterface $em
+        EntityManagerInterface $em,
+        Security $security
     ) {
         $this->authorizationHelper = $authorizationHelper;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
         $this->tokenStorage = $tokenStorage;
         $this->repository = $repository;
         $this->em = $em;
+        $this->security = $security;
+    }
+
+    /**
+     * @param Person $person
+     * @param string $role
+     * @param int|null $start
+     * @param int|null $limit
+     * @param array $orderBy
+     * @return array|Activity[]
+     */
+    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
+    {
+        $user = $this->security->getUser();
+        $center = $this->centerResolverDispatcher->resolveCenter($person);
+        if (0 === count($orderBy)) {
+            $orderBy = ['date' => 'DESC'];
+        }
+
+        $reachableScopes = $this->authorizationHelper
+            ->getReachableCircles($user, $role, $center);
+
+        return $this->em->getRepository(Activity::class)
+            ->findByPersonImplied($person, $reachableScopes, $orderBy, $limit, $start);
+        ;
+    }
+
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
+    {
+        $user = $this->security->getUser();
+        $center = $this->centerResolverDispatcher->resolveCenter($period);
+        if (0 === count($orderBy)) {
+            $orderBy = ['date' => 'DESC'];
+        }
+
+        $scopes = $this->authorizationHelper
+            ->getReachableCircles($user, $role, $center);
+
+        return $this->em->getRepository(Activity::class)
+            ->findByAccompanyingPeriod($period, $scopes, true, $limit, $start, $orderBy);
     }
 
     public function queryTimelineIndexer(string $context, array $args = []): array
@@ -81,7 +131,7 @@ final class ActivityACLAwareRepository
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
         $metadataPerson = $this->em->getClassMetadata(Person::class);
         $associationMapping = $metadataActivity->getAssociationMapping('person');
-        
+
         return $metadataActivity->getTableName().' JOIN '
             .$metadataPerson->getTableName().' ON '
             .$metadataPerson->getTableName().'.'.
@@ -95,7 +145,7 @@ final class ActivityACLAwareRepository
     {
         $where = '';
         $parameters = [];
-        
+
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
         $metadataPerson = $this->em->getClassMetadata(Person::class);
         $activityToPerson = $metadataActivity->getAssociationMapping('person')['joinColumns'][0]['name'];
@@ -105,20 +155,20 @@ final class ActivityACLAwareRepository
 
         // acls:
         $role = new Role(ActivityVoter::SEE);
-        $reachableCenters = $this->authorizationHelper->getReachableCenters($this->tokenStorage->getToken()->getUser(), 
+        $reachableCenters = $this->authorizationHelper->getReachableCenters($this->tokenStorage->getToken()->getUser(),
                 $role);
-        
+
         if (count($reachableCenters) === 0) {
             // insert a dummy condition
             return 'FALSE = TRUE';
         }
 
-        if ($context === 'person') { 
-            // we start with activities having the person_id linked to person 
+        if ($context === 'person') {
+            // we start with activities having the person_id linked to person
             $where .= sprintf('%s = ? AND ', $activityToPerson);
             $parameters[] = $person->getId();
         }
-        
+
         // we add acl (reachable center and scopes)
         $where .= '('; // first loop for the for centers
         $centersI = 0; // like centers#i
@@ -131,7 +181,7 @@ final class ActivityACLAwareRepository
             $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), $role, $center);
             // we get the ids for those scopes
             $reachablesScopesId = array_map(
-                function(Scope $scope) { return $scope->getId(); }, 
+                function(Scope $scope) { return $scope->getId(); },
                 $reachableScopes
             );
 
@@ -162,7 +212,7 @@ final class ActivityACLAwareRepository
         }
         // close loop for centers
         $where .= ')';
-        
+
         return [$where, $parameters];
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
new file mode 100644
index 000000000..0b646f7c5
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Chill\ActivityBundle\Repository;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+
+interface ActivityACLAwareRepositoryInterface
+{
+    /**
+     * @return array|Activity[]
+     */
+    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
+
+    /**
+     * @return array|Activity[]
+     */
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
+}
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
index 340481ca9..90b3875f6 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
@@ -23,6 +23,8 @@
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
@@ -39,15 +41,22 @@ class ActivityRepository extends ServiceEntityRepository
         parent::__construct($registry, Activity::class);
     }
 
-    public function findByPersonImplied($person, array $scopes, $orderBy = [ 'date' => 'DESC'], $limit = 100, $offset = 0)
+    /**
+     * @param $person
+     * @param array $scopes
+     * @param string[] $orderBy
+     * @param int $limit
+     * @param int $offset
+     * @return array|Activity[]
+     */
+    public function findByPersonImplied(Person $person, array $scopes, ?array $orderBy = [ 'date' => 'DESC'], ?int $limit = 100, ?int $offset = 0): array
     {
         $qb = $this->createQueryBuilder('a');
         $qb->select('a');
 
         $qb
-            // TODO add acl
-            //->where($qb->expr()->in('a.scope', ':scopes'))
-            //->setParameter('scopes', $scopes)
+            ->where($qb->expr()->in('a.scope', ':scopes'))
+            ->setParameter('scopes', $scopes)
             ->andWhere(
                 $qb->expr()->orX(
                     $qb->expr()->eq('a.person', ':person'),
@@ -61,7 +70,56 @@ class ActivityRepository extends ServiceEntityRepository
             $qb->addOrderBy('a.'.$k, $dir);
         }
 
+        $qb->setMaxResults($limit)->setFirstResult($offset);
+
         return $qb->getQuery()
             ->getResult();
-    }    
+    }
+
+    /**
+     * @param AccompanyingPeriod $period
+     * @param array $scopes
+     * @param int|null $limit
+     * @param int|null $offset
+     * @param array|string[] $orderBy
+     * @return array|Activity[]
+     */
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, array $scopes, ?bool $allowNullScope = false, ?int $limit = 100, ?int $offset = 0, array $orderBy = ['date' => 'desc']): array
+    {
+        $qb = $this->createQueryBuilder('a');
+        $qb->select('a');
+
+        if (!$allowNullScope) {
+            $qb
+                ->where($qb->expr()->in('a.scope', ':scopes'))
+                ->setParameter('scopes', $scopes)
+            ;
+        } else {
+            $qb
+                ->where(
+                    $qb->expr()->orX(
+                        $qb->expr()->in('a.scope', ':scopes'),
+                        $qb->expr()->isNull('a.scope')
+                    )
+                )
+                ->setParameter('scopes', $scopes)
+            ;
+        }
+
+        $qb
+            ->andWhere(
+                $qb->expr()->eq('a.accompanyingPeriod', ':period')
+            )
+            ->setParameter('period', $period)
+        ;
+
+        foreach ($orderBy as $k => $dir) {
+            $qb->addOrderBy('a.'.$k, $dir);
+        }
+
+        $qb->setMaxResults($limit)->setFirstResult($offset);
+
+        return $qb->getQuery()
+            ->getResult();
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index 07b59c7e7..c227f5539 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -19,7 +19,7 @@
                             {% endif %}
 
                             <div class="duration">
-                                {% if t.durationTimeVisible > 0 %}
+                                {% if activity.durationTime and t.durationTimeVisible %}
                                     <p>
                                         <i class="fa fa-fw fa-hourglass-end"></i>
                                         {{ activity.durationTime|date('H:i') }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig
index 996d95b0f..4120d8285 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig
@@ -18,7 +18,12 @@
                     {% set accompanying_course_id = accompanyingCourse.id %}
                 {% endif %}
 
-                <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'activityType_id': activityType.id, 'accompanying_period_id': accompanying_course_id }) }}">
+                <a href="{{ path('chill_activity_activity_new', {
+                    'person_id': person_id,
+                    'activityType_id': activityType.id,
+                    'accompanying_period_id': accompanying_course_id,
+                    'activityData': activityData
+                }) }}">
 
                     <div class="bloc btn btn-primary btn-lg btn-block">
                         {{ activityType.name|localize_translatable_string }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 81ebddc05..1f54692d9 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -64,12 +64,22 @@
 
     {% if t.durationTimeVisible %}
     <dt class="inline">{{ 'Duration Time'|trans }}</dt>
-    <dd>{{ entity.durationTime|date('H:i') }}</dd>
+    <dd>{% if entity.durationTime is not null %}
+            {{ entity.durationTime|date('H:i') }}
+        {% else %}
+            {{ 'None'|trans|capitalize }}
+        {% endif %}
+    </dd>
     {% endif %}
 
     {% if t.travelTimeVisible %}
     <dt class="inline">{{ 'Travel Time'|trans }}</dt>
-    <dd>{{ entity.travelTime|date('H:i') }}</dd>
+    <dd>{% if entity.travelTime is not null %}
+            {{ entity.travelTime|date('H:i') }}
+        {% else %}
+            {{ 'None'|trans|capitalize }}
+        {% endif %}
+    </dd>
     {% endif %}
 
     {% if t.commentVisible %}
diff --git a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
index 79cb6d852..cc9cecf52 100644
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
@@ -19,6 +19,11 @@
 
 namespace Chill\ActivityBundle\Security\Authorization;
 
+use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
@@ -28,11 +33,10 @@ use Chill\MainBundle\Entity\User;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\Security;
 
 /**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Voter for Activity class
  */
 class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
@@ -41,30 +45,37 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
     const SEE_DETAILS = 'CHILL_ACTIVITY_SEE_DETAILS';
     const UPDATE = 'CHILL_ACTIVITY_UPDATE';
     const DELETE = 'CHILL_ACTIVITY_DELETE';
+    const FULL = 'CHILL_ACTIVITY_FULL';
 
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    protected $helper;
+    private const ALL = [
+        self::CREATE,
+        self::SEE,
+        self::UPDATE,
+        self::DELETE,
+        self::SEE_DETAILS,
+        self::FULL
+    ];
 
-    public function __construct(AuthorizationHelper $helper)
-    {
-        $this->helper = $helper;
+    protected VoterHelperInterface $voterHelper;
+
+    protected Security $security;
+
+    public function __construct(
+        Security $security,
+        VoterHelperFactoryInterface $voterHelperFactory
+    ) {
+        $this->security = $security;
+        $this->voterHelper = $voterHelperFactory->generate(self::class)
+            ->addCheckFor(Person::class, [self::SEE, self::CREATE])
+            ->addCheckFor(AccompanyingPeriod::class, [self::SEE, self::CREATE])
+            ->addCheckFor(Activity::class, self::ALL)
+            ->build();
     }
 
 
     protected function supports($attribute, $subject)
     {
-        if ($subject instanceof Activity) {
-            return \in_array($attribute, $this->getAttributes());
-        } elseif ($subject instanceof Person) {
-            return $attribute === self::SEE 
-                ||
-                $attribute === self::CREATE;
-        } else {
-            return false;
-        }
+        return $this->voterHelper->supports($attribute, $subject);
     }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
@@ -72,32 +83,34 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
         if (!$token->getUser() instanceof User) {
             return false;
         }
-        
-        if ($subject instanceof Person) {
-            $centers = $this->helper->getReachableCenters($token->getUser(), new Role($attribute));
-            
-            return \in_array($subject->getCenter(), $centers);
+
+        if ($subject instanceof Activity) {
+            if ($subject->getPerson() instanceof Person) {
+                // the context is person: we must have the right to see the person
+                if (!$this->security->isGranted(PersonVoter::SEE, $subject->getPerson())) {
+                    return false;
+                }
+            } elseif ($subject->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+                if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $subject->getAccompanyingPeriod())) {
+                    return false;
+                }
+            } else {
+                throw new \RuntimeException("could not determine context of activity");
+            }
         }
-        
-        /* @var $subject Activity */
-        return $this->helper->userHasAccess($token->getUser(), $subject, $attribute);
-    }
-    
-    private function getAttributes()
-    {
-        return [ self::CREATE, self::SEE, self::UPDATE, self::DELETE,
-                  self::SEE_DETAILS ];
+
+        return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);
     }
 
 
     public function getRoles()
     {
-        return $this->getAttributes();
+        return self::ALL;
     }
 
     public function getRolesWithoutScope()
     {
-        return array();
+        return [];
     }
 
 
diff --git a/src/Bundle/ChillActivityBundle/config/services.yaml b/src/Bundle/ChillActivityBundle/config/services.yaml
index 86168101a..0a65e08c8 100644
--- a/src/Bundle/ChillActivityBundle/config/services.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services.yaml
@@ -1,20 +1,4 @@
 services:
-    chill.activity.security.authorization.activity_voter:
-        class: Chill\ActivityBundle\Security\Authorization\ActivityVoter
-        arguments:
-            - "@chill.main.security.authorization.helper"
-        tags:
-            - { name: security.voter }
-            - { name: chill.role }
-
-    chill.activity.security.authorization.activity_stats_voter:
-        class: Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter
-        arguments:
-            - "@chill.main.security.authorization.helper"
-        tags:
-            - { name: security.voter }
-            - { name: chill.role }
-
 
     chill.activity.timeline:
         class: Chill\ActivityBundle\Timeline\TimelineActivityProvider
@@ -38,3 +22,8 @@ services:
         autowire: true
         autoconfigure: true
         resource: '../Notification'
+
+    Chill\ActivityBundle\Security\Authorization\:
+        resource: '../Security/Authorization/'
+        autowire: true
+        autoconfigure: true
diff --git a/src/Bundle/ChillActivityBundle/config/services/controller.yaml b/src/Bundle/ChillActivityBundle/config/services/controller.yaml
index 106b2c6e4..96ace0a64 100644
--- a/src/Bundle/ChillActivityBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services/controller.yaml
@@ -1,8 +1,4 @@
 services:
     Chill\ActivityBundle\Controller\ActivityController:
-        arguments:
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
-            $logger: '@chill.main.logger'
-            $serializer: '@Symfony\Component\Serializer\SerializerInterface'
+        autowire: true
         tags: ['controller.service_arguments']
diff --git a/src/Bundle/ChillActivityBundle/config/services/repositories.yaml b/src/Bundle/ChillActivityBundle/config/services/repositories.yaml
index 2f0a9b83c..26bc58ac9 100644
--- a/src/Bundle/ChillActivityBundle/config/services/repositories.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services/repositories.yaml
@@ -24,9 +24,7 @@ services:
             - '@Doctrine\Persistence\ManagerRegistry'
 
     Chill\ActivityBundle\Repository\ActivityACLAwareRepository:
-        arguments:
-            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
-            $repository: '@Chill\ActivityBundle\Repository\ActivityRepository'
-            $em: '@Doctrine\ORM\EntityManagerInterface'
+        autowire: true
+        autoconfigure: true
+    Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface: '@Chill\ActivityBundle\Repository\ActivityACLAwareRepository'
 
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index fff20940a..71e461464 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -36,7 +36,9 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Form\CalendarType;
+use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Pagination\PaginatorFactory;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Routing\Annotation\Route;
 
@@ -55,16 +57,24 @@ class CalendarController extends AbstractController
 
     protected SerializerInterface $serializer;
 
+    protected PaginatorFactory $paginator;
+
+    private CalendarRepository $calendarRepository;
+
     public function __construct(
         EventDispatcherInterface $eventDispatcher,
         AuthorizationHelper $authorizationHelper,
         LoggerInterface $logger,
-        SerializerInterface $serializer
+        SerializerInterface $serializer,
+        PaginatorFactory $paginator,
+        CalendarRepository $calendarRepository
     ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
         $this->logger = $logger;
         $this->serializer = $serializer;
+        $this->paginator = $paginator;
+        $this->calendarRepository = $calendarRepository;
     }
 
     /**
@@ -73,31 +83,40 @@ class CalendarController extends AbstractController
      */
     public function listAction(Request $request): Response
     {
-        $em = $this->getDoctrine()->getManager();
         $view = null;
 
         [$user, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($user instanceof User) {
 
-            $calendarItems = $em->getRepository(Calendar::class)
-                ->findByUser($user)
-                ;
+            $calendarItems = $this->calendarRepository->findByUser($user);
+
             $view = '@ChillCalendar/Calendar/listByUser.html.twig';
+
+            return $this->render($view, [
+                'calendarItems' => $calendarItems,
+                'user' => $user
+            ]);
+
         } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $calendarItems = $em->getRepository(Calendar::class)->findBy(
+
+            $total = $this->calendarRepository->countByAccompanyingPeriod($accompanyingPeriod);
+            $paginator = $this->paginator->create($total);
+            $calendarItems = $this->calendarRepository->findBy(
                 ['accompanyingPeriod' => $accompanyingPeriod],
-                ['startDate' => 'DESC']
+                ['startDate' => 'DESC'],
+                $paginator->getItemsPerPage(),
+                $paginator->getCurrentPageFirstItemNumber()
             );
 
             $view = '@ChillCalendar/Calendar/listByAccompanyingCourse.html.twig';
-        }
 
-        return $this->render($view, [
-            'calendarItems' => $calendarItems,
-            'user' => $user,
-            'accompanyingCourse' => $accompanyingPeriod,
-        ]);
+            return $this->render($view, [
+                'calendarItems' => $calendarItems,
+                'accompanyingCourse' => $accompanyingPeriod,
+                'paginator' => $paginator
+            ]);
+        }
     }
 
     /**
@@ -111,7 +130,7 @@ class CalendarController extends AbstractController
         [$user, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = '@ChillCalendar/Calendar/newAccompanyingCourse.html.twig';
+            $view = '@ChillCalendar/Calendar/newByAccompanyingCourse.html.twig';
         } 
         // elseif ($user instanceof User) {
         //     $view = '@ChillCalendar/Calendar/newUser.html.twig';
@@ -196,10 +215,33 @@ class CalendarController extends AbstractController
             throw $this->createNotFoundException('Template not found');
         }
 
+        $personsId = [];
+        foreach ($entity->getPersons() as $p) {
+            array_push($personsId, $p->getId());
+        }
+
+        $professionalsId = [];
+        foreach ($entity->getProfessionals() as $p) {
+            array_push($professionalsId, $p->getId());
+        }
+
+        $durationTime = $entity->getEndDate()->diff($entity->getStartDate());
+        $durationTimeInMinutes = $durationTime->days*1440 + $durationTime->h*60 + $durationTime->i;
+
+        $activityData = [
+            'calendarId' => $id,
+            'personsId' => $personsId,
+            'professionalsId' => $professionalsId,
+            'date' => $entity->getStartDate()->format('Y-m-d'),
+            'durationTime' => $durationTimeInMinutes,
+            'comment' => $entity->getComment()->getComment(),
+        ];
+
         return $this->render($view, [
             'accompanyingCourse' => $accompanyingPeriod,
             'entity'      => $entity,
-            'user' => $user
+            'user' => $user,
+            'activityData' => $activityData
             //'delete_form' => $deleteForm->createView(),
         ]);
     }
diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
index 8660fac52..eaa8a1416 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
@@ -29,6 +29,7 @@ class ChillCalendarExtension extends Extension implements PrependExtensionInterf
         $loader->load('services/controller.yml');
         $loader->load('services/fixtures.yml');
         $loader->load('services/form.yml');
+        $loader->load('services/event.yml');
     }
 
     public function prepend(ContainerBuilder $container)
diff --git a/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
new file mode 100644
index 000000000..f3c4e7a59
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Chill\CalendarBundle\Event;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Doctrine\Persistence\Event\LifecycleEventArgs;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+class ListenToActivityCreate
+{
+
+    private RequestStack $requestStack;
+
+    public function __construct(RequestStack $requestStack)
+    {
+        $this->requestStack = $requestStack;
+    }
+
+    public function postPersist(Activity $activity, LifecycleEventArgs $event): void
+    {
+        // Get the calendarId from the request
+        $request = $this->requestStack->getCurrentRequest();
+
+        if (null === $request) {
+            return;
+        }
+        
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+            if (array_key_exists('calendarId', $activityData)) {
+                $calendarId = $activityData['calendarId'];
+            }
+        }
+
+        // Attach the activity to the calendar
+        $em = $event->getObjectManager();
+
+        $calendar = $em->getRepository(\Chill\CalendarBundle\Entity\Calendar::class)->find($calendarId);
+        $calendar->setActivity($activity);
+
+        $em->persist($calendar);
+        $em->flush();
+
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
index edb51bb35..b87f4f525 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
@@ -3,7 +3,9 @@
 namespace Chill\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\Calendar;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
@@ -14,9 +16,13 @@ use Doctrine\Persistence\ManagerRegistry;
  */
 class CalendarRepository extends ServiceEntityRepository
 {
+
+    // private EntityRepository $repository;
+
     public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, Calendar::class);
+       // $this->repository = $entityManager->getRepository(AccompanyingPeriodWork::class);
     }
 
     // /**
diff --git a/src/Bundle/ChillCalendarBundle/Resources/config/services/event.yml b/src/Bundle/ChillCalendarBundle/Resources/config/services/event.yml
new file mode 100644
index 000000000..348677174
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/config/services/event.yml
@@ -0,0 +1,10 @@
+services:
+    Chill\CalendarBundle\Event\ListenToActivityCreate:
+        autowire: true
+        autoconfigure: true
+        tags:
+            -
+                name: 'doctrine.orm.entity_listener'
+                event: 'postPersist'
+                entity: 'Chill\ActivityBundle\Entity\Activity'
+        
\ No newline at end of file
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
deleted file mode 100644
index 44295e192..000000000
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
+++ /dev/null
@@ -1,135 +0,0 @@
-{% set user_id = null %}
-{% if user %}
-    {% set user_id = user.id %}
-{% endif %}
-
-{% set accompanying_course_id = null %}
-{% if accompanyingCourse %}
-    {% set accompanying_course_id = accompanyingCourse.id %}
-{% endif %}
-
-{% if context == 'user' %}
-    <h2>{{ 'My calendar list' |trans }}</h2>
-{% else %}
-    <h2>{{ 'Calendar list' |trans }}</h2>
-{% endif %}
-
-{% if context == 'user' %}
-    <div id="myCalendar"></div>
-{% else %}
-
-    {% if calendarItems|length == 0 %}
-        <p class="chill-no-data-statement">
-            {{ "There is no calendar items."|trans }}
-            <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create button-small"></a>
-        </p>
-    {% else %}
-
-    <div class="flex-table list-records context-{{ context }}">
-
-        {% for calendar in calendarItems %}
-
-            <div class="item-bloc">
-                <div class="item-row main">
-                    <div class="item-col">
-
-
-                        {% if calendar.startDate and calendar.endDate %}
-                            {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
-                                <h3>{{ "From the day"|trans }} {{ calendar.startDate|format_datetime('medium', 'short') }} </h3>
-                                <h3>{{ "to the day"|trans }} {{ calendar.endDate|format_datetime('medium', 'short') }}</h3>
-                            {% else %}
-                                <h3>{{ calendar.startDate|format_date('full') }} </h3>
-                                <h3>{{ calendar.startDate|format_datetime('none', 'short', locale='fr') }} - {{ calendar.endDate|format_datetime('none', 'short', locale='fr') }}</h3>
-
-                                <div class="duration">
-                                    <p>
-                                        <i class="fa fa-fw fa-hourglass-end"></i>
-                                        {{ calendar.endDate.diff(calendar.startDate)|date("%H:%M")}}
-                                    </p>
-                                </div>
-                            {% endif %}
-
-                        {% endif %}
-
-                        
-                    </div>
-                    <div class="item-col">
-                        <ul class="list-content">
-                            {% if calendar.user %}
-                            <li>
-                                <b>{{ 'by'|trans }}{{ calendar.user.usernameCanonical }}</b>
-                            </li>
-                            {% endif %}
-
-                            {% if calendar.mainUser is not empty %}
-                            <li>
-                                <b>{{ 'main user concerned'|trans }}: {{ calendar.mainUser.usernameCanonical }}</b>
-                            </li>
-                            {% endif %}
-
-                        </ul>
-                        <ul class="record_actions">
-                            <li>
-                                <a href="{{ path('chill_calendar_calendar_show', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
-                            </li>
-                            {# TOOD
-                            {% if is_granted('CHILL_ACTIVITY_UPDATE', calendar) %}
-                            #}
-                            <li>
-                                <a href="{{ path('chill_calendar_calendar_edit', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
-                            </li>
-                            {# TOOD
-                            {% endif %}
-                            {% if is_granted('CHILL_ACTIVITY_DELETE', calendar) %}
-                            #}
-                            <li>
-                                <a href="{{ path('chill_calendar_calendar_delete', { 'id': calendar.id, 'user_id' : user_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
-                            </li>
-                            {#
-                            {% endif %}
-                            #}
-                        </ul>
-                    </div>
-                </div>
-
-                {%
-                    if calendar.comment.comment is not empty
-                    or calendar.users|length > 0
-                    or calendar.thirdParties|length > 0
-                    or calendar.users|length > 0
-                %}
-                <div class="item-row details">
-                    <div class="item-col">
-
-                        {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': calendar } %}
-                    </div>
-
-                    {% if calendar.comment.comment is not empty %}
-                    <div class="item-col comment">
-                        {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
-                    </div>
-                    {% endif %}
-                </div>
-                {% endif %}
-
-            </div>
-        {% endfor %}
-    </div>
-    {% endif %}
-
-    {% if context != 'user' %}
-    {# TODO set this condition in configuration #}
-    <ul class="record_actions">
-        <li>
-            <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
-                {{ 'Add a new calendar' | trans }}
-            </a>
-        </li>
-    </ul>
-    {% endif %}
-
-
-
-{% endif %}
-
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
index c0230344d..07aed8686 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
@@ -4,6 +4,123 @@
 
 {% block title %}{{ 'Calendar list' |trans }}{% endblock title %}
 
+{% set user_id = null %}
+{% set accompanying_course_id = accompanyingCourse.id %}
+
 {% block content %}
-    {% include 'ChillCalendarBundle:Calendar:list.html.twig' with {'context': 'accompanyingCourse'} %}
-{% endblock %}
+
+<h1>{{ 'Calendar list' |trans }}</h1>
+
+{% if calendarItems|length == 0 %}
+    <p class="chill-no-data-statement">
+        {{ "There is no calendar items."|trans }}
+        <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create button-small"></a>
+    </p>
+{% else %}
+
+    <div class="flex-table list-records context-accompanyingCourse">
+
+        {% for calendar in calendarItems %}
+
+            <div class="item-bloc">
+                <div class="item-row main">
+                    <div class="item-col">
+
+                        {% if calendar.startDate and calendar.endDate %}
+                            {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
+                                <h3>{{ "From the day"|trans }} {{ calendar.startDate|format_datetime('medium', 'short') }} </h3>
+                                <h3>{{ "to the day"|trans }} {{ calendar.endDate|format_datetime('medium', 'short') }}</h3>
+                            {% else %}
+                                <h3>{{ calendar.startDate|format_date('full') }} </h3>
+                                <h3>{{ calendar.startDate|format_datetime('none', 'short', locale='fr') }} - {{ calendar.endDate|format_datetime('none', 'short', locale='fr') }}</h3>
+
+                                <div class="duration">
+                                    <p>
+                                        <i class="fa fa-fw fa-hourglass-end"></i>
+                                        {{ calendar.endDate.diff(calendar.startDate)|date("%H:%M")}}
+                                    </p>
+                                </div>
+                            {% endif %}
+
+                        {% endif %}
+
+                    </div>
+                    <div class="item-col">
+                        <ul class="list-content">
+                            {% if calendar.user %}
+                            <li>
+                                <b>{{ 'by'|trans }}{{ calendar.user.usernameCanonical }}</b>
+                            </li>
+                            {% endif %}
+
+                            {% if calendar.mainUser is not empty %}
+                            <li>
+                                <b>{{ 'main user concerned'|trans }}: {{ calendar.mainUser.usernameCanonical }}</b>
+                            </li>
+                            {% endif %}
+
+                        </ul>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ path('chill_calendar_calendar_show', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
+                            </li>
+                            {# TOOD
+                            {% if is_granted('CHILL_ACTIVITY_UPDATE', calendar) %}
+                            #}
+                            <li>
+                                <a href="{{ path('chill_calendar_calendar_edit', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
+                            </li>
+                            {# TOOD
+                            {% endif %}
+                            {% if is_granted('CHILL_ACTIVITY_DELETE', calendar) %}
+                            #}
+                            <li>
+                                <a href="{{ path('chill_calendar_calendar_delete', { 'id': calendar.id, 'user_id' : user_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
+                            </li>
+                            {#
+                            {% endif %}
+                            #}
+                        </ul>
+                    </div>
+                </div>
+
+                {%
+                    if calendar.comment.comment is not empty
+                    or calendar.users|length > 0
+                    or calendar.thirdParties|length > 0
+                    or calendar.users|length > 0
+                %}
+                <div class="item-row details">
+                    <div class="item-col">
+
+                        {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': accompanyingCourse, 'with_display': 'row', 'entity': calendar } %}
+                    </div>
+
+                    {% if calendar.comment.comment is not empty %}
+                    <div class="item-col comment">
+                        {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
+                    </div>
+                    {% endif %}
+                </div>
+                {% endif %}
+
+            </div>
+        {% endfor %}
+
+        {% if calendarItems|length < paginator.getTotalItems %}
+            {{ chill_pagination(paginator) }}
+        {% endif %}
+
+    </div>
+{% endif %}
+
+
+<ul class="record_actions">
+    <li>
+        <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
+            {{ 'Add a new calendar' | trans }}
+        </a>
+    </li>
+</ul>
+
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
index 004000fc6..055d967a7 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
@@ -5,7 +5,10 @@
 {% block title %}{{ 'My calendar list' |trans }}{% endblock title %}
 
 {% block content %}
-    {% include 'ChillCalendarBundle:Calendar:list.html.twig' with {'context': 'user'} %}
+
+<h1>{{ 'My calendar list' |trans }}</h1>
+<div id="myCalendar"></div>
+
 {% endblock %}
  
 {% block js %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByAccompanyingCourse.html.twig
similarity index 100%
rename from src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newAccompanyingCourse.html.twig
rename to src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByAccompanyingCourse.html.twig
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
index 971abe67d..e8830a33d 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
@@ -65,13 +65,21 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a class="btn btn-cancel" href="{{ path('chill_calendar_calendar_list', { 'accompanying_period_id': accompanying_course_id, 'user_id': user_id } ) }}">
+        <a class="btn btn-cancel" href="{{ path('chill_calendar_calendar_list',
+            { 'accompanying_period_id': accompanying_course_id, 'user_id': user_id }) }}">
             {{ 'Back to the list'|trans }}
         </a>
     </li>
+    <li>
+        <a class="btn btn-create" href="{{ chill_path_add_return_path('chill_activity_activity_new',
+            { 'accompanying_period_id': accompanying_course_id, 'activityData': activityData }) }}">
+            {{ 'Transform to activity'|trans }}
+        </a>
+    </li>
     {% if accompanyingCourse %}
     <li>
-        <a class="btn btn-update" href="{{ path('chill_calendar_calendar_edit', { 'id': entity.id, 'accompanying_period_id': accompanying_course_id }) }}">
+        <a class="btn btn-update" href="{{ path('chill_calendar_calendar_edit',
+            { 'id': entity.id, 'accompanying_period_id': accompanying_course_id }) }}">
             {{ 'Edit'|trans }}
         </a>
     </li>
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index 0eb7349a4..562233546 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -23,4 +23,5 @@ Add a new calendar: Ajouter un nouveau rendez-vous
 "Success : calendar item created!": "Rendez-vous créé"
 The calendar item has been successfully removed.: Le rendez-vous a été supprimé
 From the day: Du
-to the day: au
\ No newline at end of file
+to the day: au
+Transform to activity: Transformer en échange
\ No newline at end of file
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
index 78429b439..c92971b8f 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
@@ -23,6 +23,7 @@ use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\DocStoreBundle\Entity\PersonDocument;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
@@ -42,30 +43,25 @@ class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHiera
     const UPDATE = 'CHILL_PERSON_DOCUMENT_UPDATE';
     const DELETE = 'CHILL_PERSON_DOCUMENT_DELETE';
 
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    protected AuthorizationHelper $authorizationHelper;
 
-    /**
-     * @var AccessDecisionManagerInterface
-     */
-    protected $accessDecisionManager;
+    protected AccessDecisionManagerInterface $accessDecisionManager;
 
-    /**
-     * @var LoggerInterface
-     */
-    protected $logger;
+    protected LoggerInterface $logger;
+
+    protected CenterResolverDispatcher $centerResolverDispatcher;
 
     public function __construct(
         AccessDecisionManagerInterface $accessDecisionManager,
         AuthorizationHelper $authorizationHelper,
-        LoggerInterface $logger
+        LoggerInterface $logger//,
+        //CenterResolverDispatcher $centerResolverDispatcher
     )
     {
         $this->accessDecisionManager = $accessDecisionManager;
         $this->authorizationHelper = $authorizationHelper;
         $this->logger = $logger;
+        //$this->centerResolverDispatcher = $centerResolverDispatcher;
     }
 
     public function getRoles()
@@ -78,17 +74,18 @@ class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHiera
             self::DELETE
         ];
     }
-    
+
     protected function supports($attribute, $subject)
     {
         if (\in_array($attribute, $this->getRoles()) && $subject instanceof PersonDocument) {
             return true;
         }
-        
-        if ($subject instanceof Person && $attribute === self::CREATE) {
+
+        if ($subject instanceof Person
+            && \in_array($attribute, [self::CREATE, self::SEE])) {
             return true;
         }
-        
+
         return false;
     }
 
@@ -107,6 +104,8 @@ class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHiera
             return false;
         }
 
+        $center = $this->centerResolverDispatcher->resolveCenter($subject);
+
         if ($subject instanceof PersonDocument) {
             return $this->authorizationHelper->userHasAccess($token->getUser(), $subject, $attribute);
 
diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php
index ee9523273..91c58f68b 100644
--- a/src/Bundle/ChillMainBundle/ChillMainBundle.php
+++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php
@@ -3,6 +3,11 @@
 namespace Chill\MainBundle;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\MainBundle\Search\SearchInterface;
+use Chill\MainBundle\Security\Authorization\ChillVoterInterface;
+use Chill\MainBundle\Security\ProvideRoleInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverInterface;
+use Chill\MainBundle\Security\Resolver\ScopeResolverInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Chill\MainBundle\DependencyInjection\CompilerPass\SearchableServicesCompilerPass;
@@ -27,6 +32,12 @@ class ChillMainBundle extends Bundle
 
         $container->registerForAutoconfiguration(LocalMenuBuilderInterface::class)
             ->addTag('chill.menu_builder');
+        $container->registerForAutoconfiguration(ProvideRoleInterface::class)
+            ->addTag('chill.role');
+        $container->registerForAutoconfiguration(CenterResolverInterface::class)
+            ->addTag('chill_main.center_resolver');
+        $container->registerForAutoconfiguration(ScopeResolverInterface::class)
+            ->addTag('chill_main.scope_resolver');
 
         $container->addCompilerPass(new SearchableServicesCompilerPass());
         $container->addCompilerPass(new ConfigConsistencyCompilerPass());
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 1637ee098..d0aada689 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -19,6 +19,10 @@
 
 namespace Chill\MainBundle\DependencyInjection;
 
+use Chill\MainBundle\Doctrine\DQL\STContains;
+use Chill\MainBundle\Doctrine\DQL\StrictWordSimilarityOPS;
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Form\UserJobType;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -183,6 +187,8 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                                 'JSONB_EXISTS_IN_ARRAY' => JsonbExistsInArray::class,
                                 'SIMILARITY' => Similarity::class,
                                 'OVERLAPSI' => OverlapsI::class,
+                                'STRICT_WORD_SIMILARITY_OPS' => StrictWordSimilarityOPS::class,
+                                'ST_CONTAINS' => STContains::class,
                             ],
                         ],
                         'hydrators' => [
@@ -264,6 +270,27 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
     protected function prependCruds(ContainerBuilder $container)
     {
         $container->prependExtensionConfig('chill_main', [
+            'cruds' => [
+                [
+                    'class' => UserJob::class,
+                    'name' => 'admin_user_job',
+                    'base_path' => '/admin/main/user-job',
+                    'base_role' => 'ROLE_ADMIN',
+                    'form_class' => UserJobType::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/UserJob/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN'
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN'
+                        ]
+                    ],
+                ],
+            ],
             'apis' => [
                 [
                     'class' => \Chill\MainBundle\Entity\Address::class,
@@ -371,6 +398,26 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                         ],
                     ]
                 ],
+                [
+                    'class' => \Chill\MainBundle\Entity\Scope::class,
+                    'name' => 'scope',
+                    'base_path' => '/api/1.0/main/scope',
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_index' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true
+                            ],
+                        ],
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ]
+                        ],
+                    ]
+                ],
             ]
         ]);
     }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
new file mode 100644
index 000000000..5235d51bb
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
@@ -0,0 +1,52 @@
+<?php
+/*
+ * Chill is a software for social workers
+ * Copyright (C) 2018 Champs-Libres Coopérative <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Chill\MainBundle\Doctrine\DQL;
+
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\Lexer;
+
+/**
+ * Geometry function 'ST_CONTAINS', added by postgis
+ */
+class STContains extends FunctionNode
+{
+    private $firstPart;
+
+    private $secondPart;
+
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    {
+        return 'ST_CONTAINS('.$this->firstPart->dispatch($sqlWalker).
+            ', ' . $this->secondPart->dispatch($sqlWalker) .")";
+    }
+
+    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+
+        $this->firstPart = $parser->StringPrimary();
+
+        $parser->match(Lexer::T_COMMA);
+
+        $this->secondPart = $parser->StringPrimary();
+
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
index 988e55f5f..1875f978c 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
@@ -21,20 +21,15 @@ namespace Chill\MainBundle\Doctrine\DQL;
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
 
-/**
- * 
- *
- * 
- */
 class Similarity extends FunctionNode
 {
     private $firstPart;
-    
+
     private $secondPart;
-    
+
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'SIMILARITY('.$this->firstPart->dispatch($sqlWalker). 
+        return 'SIMILARITY('.$this->firstPart->dispatch($sqlWalker).
             ', ' . $this->secondPart->dispatch($sqlWalker) .")";
     }
 
@@ -42,13 +37,13 @@ class Similarity extends FunctionNode
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
-        
+
         $this->firstPart = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_COMMA);
-        
+
         $this->secondPart = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
new file mode 100644
index 000000000..22dcda879
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Chill\MainBundle\Doctrine\DQL;
+
+use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+class StrictWordSimilarityOPS extends \Doctrine\ORM\Query\AST\Functions\FunctionNode
+{
+    private $firstPart;
+
+    private $secondPart;
+
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    {
+        return $this->firstPart->dispatch($sqlWalker).
+            ' <<% ' . $this->secondPart->dispatch($sqlWalker);
+    }
+
+    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+
+        $this->firstPart = $parser->StringPrimary();
+
+        $parser->match(Lexer::T_COMMA);
+
+        $this->secondPart = $parser->StringPrimary();
+
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php b/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
index 086b566da..0a0c160cd 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
@@ -21,7 +21,7 @@ class PointType extends Type {
      *
      * @param array $fieldDeclaration
      * @param AbstractPlatform $platform
-     * @return type
+     * @return string
      */
     public function getSqlDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
     {
@@ -32,7 +32,7 @@ class PointType extends Type {
      *
      * @param type $value
      * @param AbstractPlatform $platform
-     * @return Point
+     * @return ?Point
      */
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index f3973ff0f..22e4848bf 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -383,6 +383,16 @@ class Address
             ;
     }
 
+    public static function createFromAddressReference(AddressReference $original): Address
+    {
+        return (new Address())
+            ->setPoint($original->getPoint())
+            ->setPostcode($original->getPostcode())
+            ->setStreet($original->getStreet())
+            ->setStreetNumber($original->getStreetNumber())
+            ;
+    }
+
     public function getStreet(): ?string
     {
         return $this->street;
diff --git a/src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php b/src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php
new file mode 100644
index 000000000..921cbba41
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Chill\MainBundle\Entity;
+
+interface HasCentersInterface
+{
+    public function getCenters(): ?iterable;
+}
diff --git a/src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php b/src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php
new file mode 100644
index 000000000..911dea563
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Chill\MainBundle\Entity;
+
+interface HasScopesInterface
+{
+    /**
+     * @return array|Scope[]
+     */
+    public function getScopes(): iterable;
+}
diff --git a/src/Bundle/ChillMainBundle/Entity/Scope.php b/src/Bundle/ChillMainBundle/Entity/Scope.php
index ba11a1842..2e75c5791 100644
--- a/src/Bundle/ChillMainBundle/Entity/Scope.php
+++ b/src/Bundle/ChillMainBundle/Entity/Scope.php
@@ -3,17 +3,17 @@
 /*
  * Chill is a suite of a modules, Chill is a software for social workers
  * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -46,17 +46,17 @@ class Scope
      * @Groups({"read"})
      */
     private $id;
-    
+
     /**
      * translatable names
-     * 
+     *
      * @var array
      *
      * @ORM\Column(type="json_array")
      * @Groups({"read"})
      */
     private $name = [];
-    
+
     /**
      * @var Collection
      *
@@ -66,8 +66,8 @@ class Scope
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
     private $roleScopes;
-    
-    
+
+
     /**
      * Scope constructor.
      */
@@ -75,7 +75,7 @@ class Scope
     {
         $this->roleScopes = new ArrayCollection();
     }
-    
+
     /**
      * @return int
      */
@@ -91,7 +91,7 @@ class Scope
     {
         return $this->name;
     }
-    
+
     /**
      * @param $name
      * @return $this
@@ -101,7 +101,7 @@ class Scope
         $this->name = $name;
         return $this;
     }
-    
+
     /**
      * @return Collection
      */
@@ -109,7 +109,7 @@ class Scope
     {
         return $this->roleScopes;
     }
-    
+
     /**
      * @param RoleScope $roleScope
      */
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 76bb7b54d..41d6db40c 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -5,6 +5,7 @@ namespace Chill\MainBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
+use Chill\MainBundle\Entity\UserJob;
 use Symfony\Component\Security\Core\User\AdvancedUserInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
@@ -20,7 +21,7 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
  * })
  */
 class User implements AdvancedUserInterface {
-    
+
     /**
      * @var integer
      *
@@ -36,24 +37,30 @@ class User implements AdvancedUserInterface {
      * @ORM\Column(type="string", length=80)
      */
     private $username;
-    
+
     /**
      * @var string
      *
      * @ORM\Column(
      *     type="string",
      *     length=80,
-     *     unique=true)
+     *     unique=true,
+     *     nullable=true)
      */
     private $usernameCanonical;
-    
+
+    /**
+     * @ORM\Column(type="string", length=200)
+     */
+    private string $label = '';
+
     /**
      * @var string
      *
      * @ORM\Column(type="string", length=150, nullable=true)
      */
     private $email;
-    
+
     /**
      * @var string
      *
@@ -64,14 +71,14 @@ class User implements AdvancedUserInterface {
      *     unique=true)
      */
     private $emailCanonical;
-    
+
     /**
      * @var string
      *
      * @ORM\Column(type="string", length=255)
      */
     private $password;
-    
+
     /**
      * @var string
      * @internal must be set to null if we use bcrypt
@@ -79,7 +86,7 @@ class User implements AdvancedUserInterface {
      * @ORM\Column(type="string", length=255, nullable=true)
      */
     private $salt = null;
-    
+
     /**
      * @var boolean
      *
@@ -87,14 +94,14 @@ class User implements AdvancedUserInterface {
      *      sf4 check: in yml was false by default !?
      */
     private $locked = true;
-    
+
     /**
      * @var boolean
      *
      * @ORM\Column(type="boolean")
      */
     private $enabled = true;
-    
+
     /**
      * @var Collection
      *
@@ -112,7 +119,25 @@ class User implements AdvancedUserInterface {
      * @ORM\Column(type="json_array", nullable=true)
      */
     private $attributes;
-    
+
+    /**
+     * @var Center|null
+     * @ORM\ManyToOne(targetEntity=Center::class)
+     */
+    private ?Center $mainCenter = null;
+
+    /**
+     * @var Scope|null
+     * @ORM\ManyToOne(targetEntity=Scope::class)
+     */
+    private ?Scope $mainScope = null;
+
+    /**
+     * @var UserJob|null
+     * @ORM\ManyToOne(targetEntity=UserJob::class)
+     */
+    private ?UserJob $userJob = null;
+
     /**
      * User constructor.
      */
@@ -120,13 +145,13 @@ class User implements AdvancedUserInterface {
     {
         $this->groupCenters = new ArrayCollection();
     }
-    
+
     /**
      * @return string
      */
     public function __toString()
     {
-        return $this->getUsername();
+        return $this->getLabel();
     }
 
     /**
@@ -148,10 +173,14 @@ class User implements AdvancedUserInterface {
     public function setUsername($name)
     {
         $this->username = $name;
-    
+
+        if (empty($this->getLabel())) {
+            $this->setLabel($name);
+        }
+
         return $this;
     }
-    
+
     /**
      * @return string
      */
@@ -159,11 +188,11 @@ class User implements AdvancedUserInterface {
     {
         return $this->username;
     }
-    
+
     /**
      */
     public function eraseCredentials() {}
-    
+
     /**
      * @return array
      */
@@ -171,7 +200,7 @@ class User implements AdvancedUserInterface {
     {
         return array('ROLE_USER');
     }
-    
+
     /**
      * @return null|string
      */
@@ -179,7 +208,7 @@ class User implements AdvancedUserInterface {
     {
         return $this->salt;
     }
-    
+
     /**
      * @param $usernameCanonical
      * @return $this
@@ -187,10 +216,10 @@ class User implements AdvancedUserInterface {
     public function setUsernameCanonical($usernameCanonical)
     {
         $this->usernameCanonical = $usernameCanonical;
-        
+
         return $this;
     }
-    
+
     /**
      * @return string
      */
@@ -198,7 +227,7 @@ class User implements AdvancedUserInterface {
     {
         return $this->usernameCanonical;
     }
-    
+
     /**
      * @param $email
      * @return $this
@@ -206,10 +235,10 @@ class User implements AdvancedUserInterface {
     public function setEmail($email)
     {
         $this->email = $email;
-        
+
         return $this;
     }
-    
+
     /**
      * @return string
      */
@@ -217,7 +246,7 @@ class User implements AdvancedUserInterface {
     {
         return $this->email;
     }
-    
+
     /**
      * @param $emailCanonical
      * @return $this
@@ -225,10 +254,10 @@ class User implements AdvancedUserInterface {
     public function setEmailCanonical($emailCanonical)
     {
         $this->emailCanonical = $emailCanonical;
-        
+
         return $this;
     }
-    
+
     /**
      * @return string
      */
@@ -236,7 +265,7 @@ class User implements AdvancedUserInterface {
     {
         return $this->emailCanonical;
     }
-    
+
     /**
      * @param $password
      * @return $this
@@ -244,7 +273,7 @@ class User implements AdvancedUserInterface {
     function setPassword($password)
     {
         $this->password =  $password;
-        
+
         return $this;
     }
 
@@ -255,7 +284,7 @@ class User implements AdvancedUserInterface {
     {
         return $this->password;
     }
-    
+
     /**
      * @param $salt
      * @return $this
@@ -265,7 +294,7 @@ class User implements AdvancedUserInterface {
         $this->salt = $salt;
         return $this;
     }
-    
+
     /**
      * @return bool
      */
@@ -273,7 +302,7 @@ class User implements AdvancedUserInterface {
     {
         return true;
     }
-    
+
     /**
      * @return bool
      */
@@ -281,7 +310,7 @@ class User implements AdvancedUserInterface {
     {
         return $this->locked;
     }
-    
+
     /**
      * @return bool
      */
@@ -289,7 +318,7 @@ class User implements AdvancedUserInterface {
     {
         return true;
     }
-    
+
     /**
      * @return bool
      */
@@ -297,17 +326,17 @@ class User implements AdvancedUserInterface {
     {
         return $this->enabled;
     }
-    
+
     /**
      * @param bool $enabled
      */
     public function setEnabled($enabled)
     {
         $this->enabled = $enabled;
-        
+
         return $this;
     }
-    
+
     /**
      * @return GroupCenter
      */
@@ -315,7 +344,7 @@ class User implements AdvancedUserInterface {
     {
         return $this->groupCenters;
     }
-    
+
     /**
      * @param \Chill\MainBundle\Entity\GroupCenter $groupCenter
      * @return \Chill\MainBundle\Entity\User
@@ -325,7 +354,7 @@ class User implements AdvancedUserInterface {
         $this->groupCenters->add($groupCenter);
         return $this;
     }
-    
+
     /**
      * @param \Chill\MainBundle\Entity\GroupCenter $groupCenter
      * @throws \RuntimeException if the groupCenter is not in the collection
@@ -337,9 +366,9 @@ class User implements AdvancedUserInterface {
                     . "it seems not to be associated with the user. Aborting."));
         }
     }
-    
+
     /**
-     * This function check that groupCenter are present only once. The validator 
+     * This function check that groupCenter are present only once. The validator
      * use this function to avoid a user to be associated to the same groupCenter
      * more than once.
      */
@@ -350,7 +379,7 @@ class User implements AdvancedUserInterface {
             if (in_array($groupCenter->getId(), $groupCentersIds)) {
                 $context->buildViolation("The user has already those permissions")
                         ->addViolation();
-                
+
             } else {
                 $groupCentersIds[] = $groupCenter->getId();
             }
@@ -384,4 +413,76 @@ class User implements AdvancedUserInterface {
 
         return $this->attributes;
     }
+
+    /**
+     * @return string
+     */
+    public function getLabel(): string
+    {
+        return $this->label;
+    }
+
+    /**
+     * @param string $label
+     * @return User
+     */
+    public function setLabel(string $label): User
+    {
+        $this->label = $label;
+        return $this;
+    }
+
+    /**
+     * @return Center|null
+     */
+    public function getMainCenter(): ?Center
+    {
+        return $this->mainCenter;
+    }
+
+    /**
+     * @param Center|null $mainCenter
+     * @return User
+     */
+    public function setMainCenter(?Center $mainCenter): User
+    {
+        $this->mainCenter = $mainCenter;
+        return $this;
+    }
+
+    /**
+     * @return Scope|null
+     */
+    public function getMainScope(): ?Scope
+    {
+        return $this->mainScope;
+    }
+
+    /**
+     * @param Scope|null $mainScope
+     * @return User
+     */
+    public function setMainScope(?Scope $mainScope): User
+    {
+        $this->mainScope = $mainScope;
+        return $this;
+    }
+
+    /**
+     * @return UserJob|null
+     */
+    public function getUserJob(): ?UserJob
+    {
+        return $this->userJob;
+    }
+
+    /**
+     * @param UserJob|null $userJob
+     * @return User
+     */
+    public function setUserJob(?UserJob $userJob): User
+    {
+        $this->userJob = $userJob;
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/UserJob.php b/src/Bundle/ChillMainBundle/Entity/UserJob.php
new file mode 100644
index 000000000..9d1ca9157
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Entity/UserJob.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Chill\MainBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("chill_main_user_job")
+ */
+class UserJob
+{
+
+    /**
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected ?int $id = null;
+
+    /**
+     * @var array|string[]A
+     * @ORM\Column(name="label", type="json")
+     */
+    protected array $label = [];
+
+    /**
+     * @var bool
+     * @ORM\Column(name="active", type="boolean")
+     */
+    protected bool $active = true;
+
+    /**
+     * @return int|null
+     */
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return array|string[]
+     */
+    public function getLabel(): array
+    {
+        return $this->label;
+    }
+
+    /**
+     * @param array|string[] $label
+     * @return UserJob
+     */
+    public function setLabel(array $label): UserJob
+    {
+        $this->label = $label;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isActive(): bool
+    {
+        return $this->active;
+    }
+
+    /**
+     * @param bool $active
+     * @return UserJob
+     */
+    public function setActive(bool $active): UserJob
+    {
+        $this->active = $active;
+        return $this;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php b/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
new file mode 100644
index 000000000..43fab6f62
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Chill\MainBundle\Form\Event;
+
+use Symfony\Component\Form\FormBuilderInterface;
+
+class CustomizeFormEvent extends \Symfony\Component\EventDispatcher\Event
+{
+    const NAME = 'chill_main.customize_form';
+
+    protected string $type;
+
+    protected FormBuilderInterface $builder;
+
+    public function __construct(string $type, FormBuilderInterface $builder)
+    {
+        $this->type = $type;
+        $this->builder = $builder;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return FormBuilderInterface
+     */
+    public function getBuilder(): FormBuilderInterface
+    {
+        return $this->builder;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/CenterType.php b/src/Bundle/ChillMainBundle/Form/Type/CenterType.php
index ba039c938..0366e8ccf 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/CenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/CenterType.php
@@ -95,9 +95,12 @@ class CenterType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         if (count($this->reachableCenters) > 1) {
-            $resolver->setDefault('class', Center::class);
-            $resolver->setDefault('choices', $this->reachableCenters);
+            $resolver->setDefault('class', Center::class)
+                ->setDefault('choices', $this->reachableCenters)
+                ->setDefault('placeholder', 'Pick a center')
+                ;
         }
+
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
index 832db628f..ebf474657 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
@@ -146,14 +146,7 @@ class ScopePickerType extends AbstractType
             ->setParameter('center', $center->getId())
           // role constraints
             ->andWhere($qb->expr()->in('rs.role', ':roles'))
-            ->setParameter(
-                'roles', \array_map(
-                    function (Role $role) {
-                        return $role->getRole();
-                    },
-                    $roles
-                )
-            )
+            ->setParameter('roles', $roles)
           // user contraint
           ->andWhere(':user MEMBER OF gc.users')
           ->setParameter('user', $this->tokenStorage->getToken()->getUser());
diff --git a/src/Bundle/ChillMainBundle/Form/UserJobType.php b/src/Bundle/ChillMainBundle/Form/UserJobType.php
new file mode 100644
index 000000000..eec718261
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/UserJobType.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Chill\MainBundle\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class UserJobType extends \Symfony\Component\Form\AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('label', TranslatableStringFormType::class, [
+                'label' => 'Label',
+                'required' => true
+            ])
+            ->add('active', ChoiceType::class, [
+                'choices' => [
+                    'Active' => true,
+                    'Inactive' => false
+                ]
+            ])
+            ;
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index 5196ee6c0..09e2d1391 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -2,7 +2,15 @@
 
 namespace Chill\MainBundle\Form;
 
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -16,6 +24,16 @@ use Chill\MainBundle\Form\UserPasswordType;
 
 class UserType extends AbstractType
 {
+    private TranslatableStringHelper $translatableStringHelper;
+
+    /**
+     * @param TranslatableStringHelper $translatableStringHelper
+     */
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
     /**
      * @param FormBuilderInterface $builder
      * @param array $options
@@ -24,7 +42,40 @@ class UserType extends AbstractType
     {
         $builder
             ->add('username')
-            ->add('email')
+            ->add('email', EmailType::class, [
+                'required' => true
+            ])
+            ->add('label', TextType::class)
+            ->add('mainCenter', EntityType::class, [
+                'label' => 'main center',
+                'required' => false,
+                'placeholder' => 'choose a main center',
+                'class' => Center::class,
+                'query_builder' => function (EntityRepository $er) {
+                    $qb = $er->createQueryBuilder('c');
+                    $qb->addOrderBy('c.name');
+
+                    return $qb;
+                }
+            ])
+            ->add('mainScope', EntityType::class, [
+                'label' => 'Choose a main scope',
+                'required' => false,
+                'placeholder' => 'choose a main scope',
+                'class' => Scope::class,
+                'choice_label' => function (Scope $c) {
+                    return $this->translatableStringHelper->localize($c->getName());
+                },
+            ])
+            ->add('userJob', EntityType::class, [
+                'label' => 'Choose a job',
+                'required' => false,
+                'placeholder' => 'choose a job',
+                'class' => UserJob::class,
+                'choice_label' => function (UserJob $c) {
+                    return $this->translatableStringHelper->localize($c->getLabel());
+                },
+            ])
             ;
         if ($options['is_creation']) {
             $builder->add('plainPassword', RepeatedType::class, array(
diff --git a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
index f040446b3..cf488f411 100644
--- a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
@@ -36,6 +36,14 @@ final class AddressReferenceRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
+    public function countAll(): int
+    {
+        $qb = $this->repository->createQueryBuilder('ar');
+        $qb->select('count(ar.id)');
+
+        return $qb->getQuery()->getSingleScalarResult();
+    }
+
     /**
      * @return AddressReference[]
      */
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
index 31d2c8d09..6100bc842 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
@@ -98,6 +98,9 @@ section.chill-entity {
             &.date-since {}
             &.date-until {}
         }
+        .address-more {
+            margin-bottom: 1em;
+        }
     }
 
     // used for comment-embeddable
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js b/src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js
new file mode 100644
index 000000000..a8df4ed88
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js
@@ -0,0 +1,17 @@
+const fetchScopes = () => {
+  return window.fetch('/api/1.0/main/scope.json').then(response => {
+    if (response.ok) {
+      return response.json();
+    }
+  }).then(data => {
+    console.log(data);
+    return new Promise((resolve, reject) => {
+      console.log(data);
+      resolve(data.results);
+    });
+  });
+};
+
+export {
+  fetchScopes
+};
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.js
index 678f418b0..ddbc4afa7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.js
@@ -52,10 +52,10 @@ Fields.forEach(function(field) {
     ClassicEditor
         .create( field )
         .then( editor => {
-            console.log( 'CkEditor was initialized', editor );
+            //console.log( 'CkEditor was initialized', editor );
         })
         .catch( error => {
             console.error( error.stack );
         })
     ;
-});
\ No newline at end of file
+});
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 249b53588..d429098a5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -1,24 +1,15 @@
 <template>
    <add-address
-      v-bind:key="context.entity.type"
+      v-bind:key="key"
       v-bind:context="context"
-      v-bind:options="addAddress.options"
-      v-bind:result="addAddress.result"
-      @submitAddress="submitAddress"
+      v-bind:options="options"
+      v-bind:addressChangedCallback="submitAddress"
       ref="addAddress">
    </add-address>
 </template>
 
 <script>
-/*
-*  Address component is a uniq component for many contexts.
-*  Allow to create/attach/edit an address to
-*  - a person (new or edit address),
-*  - a household (move or edit address)
-*
-* */
 import AddAddress from './components/AddAddress.vue';
-import { patchAddress } from "./api";
 import { postAddressToHousehold, postAddressToPerson } from "ChillPersonAssets/vuejs/_api/AddAddress";
 
 export default {
@@ -26,60 +17,46 @@ export default {
    components: {
       AddAddress
    },
-   data() {
-      return {
-         context: {
-            edit: window.mode === 'edit',
-            entity: {
-               type: window.entityType,
-               id: window.entityId
-            },
-            addressId: window.addressId | null,
-            backUrl: window.backUrl,
-            valid: {
-               from: new Date()
-            },
-         },
-         addAddress: {
-            options: {
-
-               /// Options override default.
-               /// null value take default component value defined in AddAddress data()
-               button: {
-                  text:  {
-                     create: window.buttonText || null,
-                     edit: window.buttonText || null
-                  },
-                  size: window.buttonSize || null,
-                  displayText: window.buttonDisplayText   //boolean, default: true
-               },
-
-               /// Modal title text if create or edit address (trans chain, see i18n)
-               title: {
-                  create: window.modalTitle || null,
-                  edit: window.modalTitle || null
-               },
-
-               /// Display each step in page or Modal
-               bindModal: {
-                  step1: window.binModalStep1,  //boolean, default: true
-                  step2: window.binModalStep2   //boolean, default: true
-               }
-            }
-         }
+   props: ['addAddress'],
+   computed: {
+      context() {
+         return this.addAddress.context;
+      },
+      options() {
+         return this.addAddress.options;
+      },
+      key() {
+         return (this.context.edit) ? 'address_' + this.context.addressId
+            : this.context.target.name + '_' + this.context.target.id ;
       }
    },
+   mounted() {
+      //console.log('AddAddress: data context', this.context);
+      //console.log('AddAddress: data options', this.options);
+   },
    methods: {
       displayErrors() {
          return this.$refs.addAddress.errorMsg;
       },
-      submitAddress() {
-         console.log('@@@ click on Submit Address Button');
-         let payload = this.$refs.addAddress.submitNewAddress(); // Cast child method
-         this.addDateToAddressAndPostAddressTo(payload);
+      submitAddress(payload) {
+         console.log('@@@ click on Submit Address Button', payload);
+
+         // Existing address
+         if (this.context.edit) {
+
+            // address is already linked, just finish !
+            this.$refs.addAddress.afterLastPaneAction({});
+
+         // New created address
+         } else {
+            this.postAddressTo(payload);
+         }
       },
-      addDateToAddressAndPostAddressTo(payload)
-      {
+
+      /*
+      * Patch date
+      * TO MOVE in DatePane
+      addDateToAddressAndPostAddressTo(payload) {
          payload.body = {
             validFrom: {
                datetime: `${this.context.valid.from.toISOString().split('T')[0]}T00:00:00+0100`
@@ -100,50 +77,57 @@ export default {
                this.$refs.addAddress.flag.loading = false;
             });
       },
+      */
 
-      postAddressTo(payload)
-      {
-         console.log('postAddressTo', payload.entity);
-         if (!this.context.edit) {
-            switch (payload.entity) {
-               case 'household':
-                  postAddressToHousehold(payload.entityId, payload.addressId)
-                     .then(household => new Promise((resolve, reject) => {
-                        console.log('..toHousehold', household);
-                        this.$refs.addAddress.flag.loading = false;
-                        this.$refs.addAddress.flag.success = true;
-                        window.location.assign(this.context.backUrl);
-                        resolve();
-                     }))
-                     .catch((error) => {
-                        this.$refs.addAddress.errorMsg.push(error);
-                        this.$refs.addAddress.flag.loading = false;
-                     })
-                  ;
-                  break;
-               case 'person':
-                  postAddressToPerson(payload.entityId, payload.addressId)
-                     .then(person => new Promise((resolve, reject) => {
-                        console.log('..toPerson', person);
-                        this.$refs.addAddress.flag.loading = false;
-                        this.$refs.addAddress.flag.success = true;
-                        window.location.assign(this.context.backUrl);
-                        resolve();
-                     }))
-                     .catch((error) => {
-                        this.$refs.addAddress.errorMsg.push(error);
-                        this.$refs.addAddress.flag.loading = false;
-                     })
-                  ;
-                  break;
-               default:
-                  this.$refs.addAddress.errorMsg.push('That entity is not managed by address !');
-            }
-         } else {
-            // address is already linked, just finish !
-            window.location.assign(this.context.backUrl);
+      /*
+      *  Post new created address to targetEntity
+      */
+      postAddressTo(payload) {
+         console.log('postAddress', payload.addressId, 'To', payload.target, payload.targetId);
+         switch (payload.target) {
+            case 'household':
+               postAddressToHousehold(payload.targetId, payload.addressId)
+                  .then(address => new Promise((resolve, reject) => {
+                     console.log('..household address', address);
+                     this.$refs.addAddress.flag.loading = false;
+                     this.$refs.addAddress.flag.success = true;
+
+                     // finish
+                     this.$refs.addAddress.afterLastPaneAction({ addressId: address.address_id });
+
+                     resolve();
+                  }))
+                  .catch((error) => {
+                     this.$refs.addAddress.errorMsg.push(error);
+                     this.$refs.addAddress.flag.loading = false;
+                  })
+               ;
+               break;
+            case 'person':
+               postAddressToPerson(payload.targetId, payload.addressId)
+                  .then(address => new Promise((resolve, reject) => {
+                     console.log('..person address', address);
+                     this.$refs.addAddress.flag.loading = false;
+                     this.$refs.addAddress.flag.success = true;
+
+                     // finish
+                     this.$refs.addAddress.afterLastPaneAction({ addressId: address.address_id });
+
+                     resolve();
+                  }))
+                  .catch((error) => {
+                     this.$refs.addAddress.errorMsg.push(error);
+                     this.$refs.addAddress.flag.loading = false;
+                  })
+               ;
+               break;
+            case 'thirdparty':
+               console.log('TODO write postAddressToThirdparty');
+               break;
+            default:
+               this.$refs.addAddress.errorMsg.push('That entity is not managed by address !');
          }
-      },
+      }
    }
 }
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
index e4ed78f35..14fa0490f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
@@ -109,7 +109,7 @@ const patchAddress = (id, body) => {
 * method POST, post Postal Code Object
 * @returns {Promise}
 */
-const postPostalCode = (postalCode) => {
+const postPostalCode = (postalCode) => { //<--
    const url = `/api/1.0/main/postal-code.json?`;
    const body = postalCode;
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
new file mode 100644
index 000000000..501d14e03
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
@@ -0,0 +1,31 @@
+<template>
+   <ul class="record_actions"
+      :class="{ 'sticky-form-buttons': isStickyForm }">
+
+      <li v-if="isStickyForm" class="cancel">
+         <slot name="before"></slot>
+      </li>
+
+      <slot name="action"></slot>
+
+      <li v-if="isStickyForm">
+         <slot name="after"></slot>
+      </li>
+   </ul>
+</template>
+
+<script>
+export default {
+   name: "ActionButtons",
+   props: ['options', 'defaultz'],
+   computed: {
+      isStickyForm() {
+         return (typeof this.options.stickyActions !== 'undefined') ?
+            this.options.stickyActions : this.defaultz.stickyActions;
+      },
+   },
+   methods: {
+
+   }
+}
+</script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 19d35381c..80668270f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -1,18 +1,22 @@
 <template>
 
-   <!-- start with a button -->
-   <button v-if="step1WithModal"
-      @click="openShowPane"
-      class="btn" :class="getClassButton"
-      type="button" name="button" :title="$t(getTextButton)">
-      <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
-   </button>
+   <!-- step0 -->
+   <show-pane v-if="flag.showPane"
+      v-bind:context="this.context"
+      v-bind:options="this.options"
+      v-bind:defaultz="this.defaultz"
+      v-bind:entity="this.entity"
+      v-bind:flag="this.flag"
+      v-bind:useDatePane="this.useDatePane"
+      @openEditPane="openEditPane"
+      ref="showAddress">
+   </show-pane>
 
    <!-- step 1 -->
-   <teleport to="body" v-if="step1WithModal">
-      <modal v-if="flag.showPane"
+   <teleport to="body" v-if="inModal">
+      <modal v-if="flag.suggestPane"
          modalDialogClass="modal-dialog-scrollable modal-xl"
-         @close="flag.showPane = false">
+         @close="resetPane">
 
          <template v-slot:header>
             <h2 class="modal-title">{{ $t(getTextTitle) }}
@@ -24,24 +28,86 @@
          </template>
 
          <template v-slot:body>
-            <show-address-pane
+            <suggest-pane
                v-bind:context="this.context"
                v-bind:options="this.options"
-               v-bind:default="this.default"
+               v-bind:defaultz="this.defaultz"
                v-bind:entity="this.entity"
-               v-bind:valid="this.context.valid"
                v-bind:flag="this.flag"
-               ref="showAddress">
-            </show-address-pane>
+               ref="suggestAddress">
+            </suggest-pane>
          </template>
 
          <template v-slot:footer>
             <button @click="openEditPane"
-               class="btn btn-update">
-               {{ $t('action.edit')}}
+               class="btn btn-create">
+               {{ $t('create_a_new_address')}}
             </button>
-            <button class="btn btn-save"
-               @click.prevent="$emit('submitAddress')">
+         </template>
+
+      </modal>
+   </teleport>
+   <div class="mt-4" v-else>
+      <suggest-pane v-if="flag.suggestPane"
+         v-bind:context="this.context"
+         v-bind:options="this.options"
+         v-bind:defaultz="this.defaultz"
+         v-bind:entity="this.entity"
+         v-bind:flag="this.flag"
+         v-bind:insideModal="false"
+         ref="suggestAddress">
+
+         <template v-slot:before v-if="!bypassFirstStep">
+            <a class="btn btn-cancel" @click="resetPane">
+               {{ $t('action.cancel') }}
+            </a>
+         </template>
+         <template v-slot:action>
+            <li>
+               <button @click="openEditPane"
+                  class="btn btn-create">
+                  {{ $t('create_a_new_address')}}
+               </button>
+            </li>
+         </template>
+
+      </suggest-pane>
+   </div>
+
+   <!-- step 2 -->
+   <teleport to="body" v-if="inModal">
+      <modal v-if="flag.editPane"
+         modalDialogClass="modal-dialog-scrollable modal-xl"
+         @close="resetPane">
+
+         <template v-slot:header>
+            <h2 class="modal-title">{{ $t(getTextTitle) }}
+               <span v-if="flag.loading" class="loading">
+                  <i class="fa fa-circle-o-notch fa-spin fa-fw"></i>
+                  <span class="sr-only">{{ $t('loading') }}</span>
+               </span>
+            </h2>
+         </template>
+
+         <template v-slot:body>
+            <edit-pane
+               v-bind:context="this.context"
+               v-bind:options="this.options"
+               v-bind:defaultz="this.defaultz"
+               v-bind:entity="this.entity"
+               v-bind:flag="this.flag"
+               @getCities="getCities"
+               @getReferenceAddresses="getReferenceAddresses">
+            </edit-pane>
+         </template>
+
+         <template v-slot:footer>
+            <!--<button class="btn btn-cancel change-icon" @click="resetPane">{{ $t('action.cancel') }}</button>-->
+            <button v-if="!this.context.edit && this.useDatePane" class="btn btn-update change-icon" @click="closeEditPane">
+               {{ $t('nav.next')}}
+               <i class="fa fa-fw fa-arrow-right"></i>
+            </button>
+            <button v-else class="btn btn-save" @click="closeEditPane">
                {{ $t('action.save')}}
             </button>
          </template>
@@ -49,25 +115,43 @@
       </modal>
    </teleport>
    <div class="mt-4" v-else>
-
-      <show-address-pane v-if="flag.showPane"
+      <edit-pane v-if="flag.editPane"
          v-bind:context="this.context"
          v-bind:options="this.options"
-         v-bind:default="this.default"
+         v-bind:defaultz="this.defaultz"
          v-bind:entity="this.entity"
-         v-bind:valid="this.context.valid"
          v-bind:flag="this.flag"
-         ref="showAddress"
-         v-bind:insideModal="false" @openEditPane="openEditPane"
-         @submitAddress="$emit('submitAddress')">
-      </show-address-pane>
+         v-bind:insideModal="false"
+         @getCities="getCities"
+         @getReferenceAddresses="getReferenceAddresses">
+
+         <template v-slot:before>
+            <a class="btn btn-cancel" @click="resetPane">
+               {{ $t('action.cancel') }}
+            </a>
+         </template>
+         <template v-slot:action>
+            <li v-if="!this.context.edit && this.useDatePane">
+               <button class="btn btn-update change-icon" @click="closeEditPane">
+                  {{ $t('nav.next')}}
+                  <i class="fa fa-fw fa-arrow-right"></i>
+               </button>
+            </li>
+            <li v-else>
+               <button class="btn btn-save" @click="closeEditPane">
+                  {{ $t('action.save')}}
+               </button>
+            </li>
+         </template>
+
+      </edit-pane>
    </div>
 
-   <!-- step 2 -->
-   <teleport to="body" v-if="step2WithModal">
-      <modal v-if="flag.editPane"
-         modalDialogClass="modal-dialog-scrollable modal-xl"
-         @close="flag.editPane = false">
+   <!-- step 3 -->
+   <teleport to="body" v-if="inModal">
+      <modal v-if="flag.datePane"
+             modalDialogClass="modal-dialog-scrollable modal-xl"
+             @close="resetPane">
 
          <template v-slot:header>
             <h2 class="modal-title">{{ $t(getTextTitle) }}
@@ -79,41 +163,54 @@
          </template>
 
          <template v-slot:body>
-            <edit-address-pane
+            <date-pane
                v-bind:context="this.context"
                v-bind:options="this.options"
-               v-bind:default="this.default"
+               v-bind:defaultz="this.defaultz"
                v-bind:entity="this.entity"
                v-bind:flag="this.flag"
-               @getCities="getCities"
-               @getReferenceAddresses="getReferenceAddresses">
-            </edit-address-pane>
+               ref="dateAddress">
+            </date-pane>
          </template>
 
          <template v-slot:footer>
-            <button class="btn btn-cancel change-icon" @click="flag.showPane = true; flag.editPane = false;">
-               {{ $t('action.cancel') }}
+            <button class="btn btn-misc" @click="openEditPane">
+               <i class="fa fa-fw fa-arrow-left"></i>
+               {{ $t('nav.previous')}}
             </button>
-            <button class="btn btn-update"
-               @click="closeEditPane">
-               {{ $t('action.valid')}}
+            <button class="btn btn-save" @click="closeDatePane">
+               {{ $t('action.save')}}
             </button>
+            <!-- -->
          </template>
 
       </modal>
    </teleport>
    <div class="mt-4" v-else>
-
-      <edit-address-pane v-if="flag.editPane"
+      <date-pane v-if="flag.datePane"
          v-bind:context="this.context"
          v-bind:options="this.options"
-         v-bind:default="this.default"
+         v-bind:defaultz="this.defaultz"
          v-bind:entity="this.entity"
          v-bind:flag="this.flag"
-         v-bind:insideModal="false" @closeEditPane="closeEditPane"
-         @getCities="getCities"
-         @getReferenceAddresses="getReferenceAddresses">
-      </edit-address-pane>
+         v-bind:insideModal="false"
+         ref="dateAddress">
+
+         <template v-slot:before>
+            <button class="btn btn-misc" @click="openEditPane">
+               <i class="fa fa-fw fa-arrow-left"></i>
+               {{ $t('nav.previous')}}
+            </button>
+         </template>
+         <template v-slot:action>
+            <li>
+               <button class="btn btn-save" @click="closeDatePane">
+                  {{ $t('action.save')}}
+               </button>
+            </li>
+         </template>
+
+      </date-pane>
    </div>
 
 </template>
@@ -122,37 +219,45 @@
 import Modal from 'ChillMainAssets/vuejs/_components/Modal';
 import { getAddress, fetchCountries, fetchCities, fetchReferenceAddresses, patchAddress, postAddress, postPostalCode } from '../api';
 import { postAddressToPerson, postAddressToHousehold } from "ChillPersonAssets/vuejs/_api/AddAddress.js";
-import ShowAddressPane from './ShowAddressPane.vue';
-import EditAddressPane from './EditAddressPane.vue';
+import ShowPane from './ShowPane.vue';
+import SuggestPane from './SuggestPane.vue';
+import EditPane from './EditPane.vue';
+import DatePane from './DatePane.vue';
 
 export default {
    name: "AddAddress",
-   props: ['context', 'options', 'result'],
-   emits: ['submitAddress'],
+   props: ['context', 'options', 'addressChangedCallback'],
    components: {
       Modal,
-      ShowAddressPane,
-      EditAddressPane,
+      ShowPane,
+      SuggestPane,
+      EditPane,
+      DatePane
    },
    data() {
       return {
          flag: {
-            showPane: false,
+            showPane: true, // begin with showPane
+            suggestPane: false,
             editPane: false,
+            datePane: false,
             loading: false,
             success: false
          },
-         default: {
+         defaultz: {
             button: {
                text: { create: 'add_an_address_title', edit: 'edit_address' },
                type: { create: 'btn-create', edit: 'btn-update'},
                displayText: true
             },
             title: { create: 'add_an_address_title', edit: 'edit_address' },
-            bindModal: {
-               step1: true,
-               step2: true,
+            openPanesInModal: true,
+            stickyActions: false,
+            useDate: {
+               validFrom: false,
+               validTo: false
             },
+            hideAddress: false
          },
          entity: {
             address: {}, // <== loaded and returned
@@ -173,6 +278,10 @@ export default {
                writeNew: {
                   address: false,
                   postcode: false
+               },
+               valid: {
+                  from: new Date(),
+                  to:  null
                }
             },
             addressMap: {
@@ -186,19 +295,26 @@ export default {
       }
    },
    computed: {
-      step1WithModal() {
-         return (this.options.bindModal !== null && typeof this.options.bindModal.step1 !== 'undefined') ?
-            this.options.bindModal.step1 : this.default.bindModal.step1;
+      inModal() {
+         return (typeof this.options.openPanesInModal !== 'undefined') ?
+            this.options.openPanesInModal : this.defaultz.openPanesInModal;
       },
-      step2WithModal() {
-         let step2 = (this.options.bindModal !== null && typeof this.options.bindModal.step2 !== 'undefined') ?
-            this.options.bindModal.step2 : this.default.bindModal.step2;
-
-         if (step2 === false && this.step1WithModal === true) {
-            console.log("step2 must open in a Modal");
-            return true;
-         }
-         return step2;
+      useDatePane() {
+         let vFrom = (typeof this.options.useDate !== 'undefined'
+            && typeof this.options.useDate.validFrom !== 'undefined') ?
+            this.options.useDate.validFrom : this.defaultz.useDate.validFrom ;
+         let vTo = (typeof this.options.useDate !== 'undefined'
+            && typeof this.options.useDate.validTo !== 'undefined') ?
+            this.options.useDate.validTo : this.defaultz.useDate.validTo ;
+         return (vFrom || vTo) ? true : false;
+      },
+      hasSuggestions() {
+         // TODO
+         //return addressSuggestions.length > 0
+         return false;
+      },
+      displaySuggestions() {
+         return !this.context.edit && this.hasSuggestions;
       },
       getTextTitle() {
          if ( typeof this.options.title !== 'undefined'
@@ -207,36 +323,27 @@ export default {
             )) {
             return (this.context.edit) ? this.options.title.edit : this.options.title.create;
          }
-         return (this.context.edit) ? this.default.title.edit : this.default.title.create;
+         return (this.context.edit) ? this.defaultz.title.edit : this.defaultz.title.create;
       },
-      getTextButton() {
-         if ( typeof this.options.button.text !== 'undefined'
-            && ( this.options.button.text.edit !== null
-               || this.options.button.text.create !== null
-            )) {
-            return (this.context.edit) ? this.options.button.text.edit : this.options.button.text.create;
-         }
-         return (this.context.edit) ? this.default.button.text.edit : this.default.button.text.create;
+      bypassFirstStep() {
+         // exception: passing step0 if new address and pane are not in modal
+         return !this.context.edit && !this.inModal;
       },
-      getClassButton() {
-         let type = (this.context.edit) ? this.default.button.type.edit : this.default.button.type.create;
-         let size = (typeof this.options.button !== 'undefined' && this.options.button.size !== null) ?
-            `${this.options.button.size} ` : '';
-         return `${size}${type}`;
-      },
-      displayTextButton() {
-         return (typeof this.options.button !== 'undefined' && typeof this.options.button.displayText !== 'undefined') ?
-            this.options.button.displayText : this.default.button.displayText;
-      },
-      context() {
-         return this.context;
+      forceRedirect() {
+         return (!(this.context.backUrl === null || typeof this.context.backUrl === 'undefined'));
       }
    },
    mounted() {
-      if (!this.step1WithModal) {
-         //console.log('Mounted now !');
-         this.openShowPane();
+
+      console.log('useDatePane', this.useDatePane);
+
+      console.log('Mounted now !');
+      if (this.context.edit) {
+         console.log('getInitialAddress', this.context.addressId);
+         this.getInitialAddress(this.context.addressId);
       }
+      this.openShowPane();
+
    },
    methods: {
 
@@ -244,35 +351,89 @@ export default {
       *  Opening and closing Panes when interacting with buttons
       */
       openShowPane() {
-
-         if (this.context.edit) {
-            this.getInitialAddress(this.context.addressId);
-         }
-
-         // when create new address, start first with editPane
-         if ( this.context.edit === false
-            && this.flag.editPane === false
-         ) {
+         if (this.flag.editPane === false && this.bypassFirstStep) {
+            console.log('bypassFirstStep');
+            this.closeShowPane();
             this.openEditPane();
-            this.flag.editPane = true;
-
          } else {
             this.flag.showPane = true;
-            console.log('step1: open the Show Panel');
+            console.log('step0: open the Show Panel');
          }
       },
-
+      closeShowPane() {
+         // Show pane can be closed only when openPanesInModal is false
+         if (!this.inModal) {
+            this.flag.showPane = false;
+            console.log('step0: close the Show Panel');
+         }
+      },
+      openSuggestPane() {
+         this.flag.suggestPane = true;
+         console.log('step1: open the Suggestion Panel');
+      },
+      closeSuggestPane() {
+         this.flag.suggestPane = false;
+         console.log('step1: close the Suggestion Panel');
+      },
       openEditPane() {
-         console.log('step2: open the Edit panel');
-         this.initForm();
-         this.getCountries();
+         if (this.flag.suggestPane === false && this.displaySuggestions) {
+            console.log('displaySuggestions');
+            this.openSuggestPane();
+         } else {
+            if (this.flag.datePane === false) {
+               this.initForm(); // reset form except if we come back from datePane
+            }
+            this.getCountries(); // will open editPane when resolve promise
+         }
+      },
+      closeEditPane() {
+         this.flag.editPane = false;
+         console.log('step2: close the Edit Panel');
+         if (!this.context.edit && this.useDatePane) {
+            this.openDatePane();
+         } else {
+            this.applyChanges();
+            if (!this.forceRedirect) {
+               this.openShowPane();
+            }
+         }
+      },
+      openDatePane() {
+         this.flag.datePane = true;
+         console.log('step3: open the Date Panel');
+      },
+      closeDatePane() {
+         this.applyChanges();
+         this.flag.datePane = false;
+         console.log('step3: close the Date Panel');
+      },
+      resetPane() {
+         console.log('resetPane');
+         this.flag.suggestPane = false;
+         this.flag.editPane = false;
+         this.flag.datePane = false;
+         this.openShowPane();
       },
 
-      closeEditPane() {
-         console.log('step2: close the Edit Panel');
-         this.applyChanges();
-         this.flag.showPane = true;
-         this.flag.editPane = false;
+      /*
+      *  What happens when submitting last Pane:
+      *  - redirect or reset pane,
+      *  - change context to editing
+      */
+      afterLastPaneAction(params) {
+         this.initForm();
+         if (this.forceRedirect) {
+            console.log("redirect to backUrl");
+            window.location.assign(this.context.backUrl);
+         } else {
+            console.log("don't redirect");
+            this.resetPane();
+            if (!this.context.edit) {
+               this.context.edit = true;
+               this.context.addressId = params.addressId;
+               console.log("context is now edit, with address", params.addressId);
+            }
+         }
       },
 
       /*
@@ -297,7 +458,16 @@ export default {
          fetchCountries().then(
             countries => new Promise((resolve, reject) => {
                this.entity.loaded.countries = countries.results;
-               this.flag.showPane = false;
+               if (this.flag.showPane === true) {
+                  this.closeShowPane();
+               }
+               if (this.flag.suggestPane === true) {
+                  this.closeSuggestPane();
+               }
+               if (this.flag.datePane === true) {
+                  this.flag.datePane = false;
+               }
+               console.log('step2: open the Edit panel');
                this.flag.editPane = true;
                this.flag.loading = false;
                resolve()
@@ -365,6 +535,7 @@ export default {
 
          this.entity.selected.writeNew.address = this.context.edit;
          this.entity.selected.writeNew.postcode = this.context.edit;
+         console.log('!! just set writeNew.postcode to', this.entity.selected.writeNew.postcode);
       },
 
       /*
@@ -374,6 +545,8 @@ export default {
       */
       applyChanges()
       {
+         console.log('apply changes');
+
          let newAddress = {
             'isNoAddress': this.entity.selected.isNoAddress,
             'street': this.entity.selected.isNoAddress ? '' : this.entity.selected.address.street,
@@ -398,18 +571,22 @@ export default {
             newPostcode = Object.assign(newPostcode, {
                'country': {'id': this.entity.selected.country.id },
             });
+            console.log('writeNew postcode is true! newPostcode: ', newPostcode);
             newAddress = Object.assign(newAddress, {
                'newPostcode': newPostcode
             });
          }
 
-         if (this.context.edit) {
+         if (!this.context.edit) {
+            this.addNewAddress(newAddress)
+               .then(payload => this.addressChangedCallback(payload));
+
+         } else {
             this.updateAddress({
                addressId: this.context.addressId,
                newAddress: newAddress
-            });
-         } else {
-            this.addNewAddress(newAddress);
+            })
+            .then(payload => this.addressChangedCallback(payload));
          }
       },
 
@@ -419,34 +596,42 @@ export default {
       */
       addNewAddress(payload)
       {
-         //console.log('addNewAddress', payload);
+         console.log('addNewAddress', payload);
          this.flag.loading = true;
 
          if ('newPostcode' in payload) {
 
             let postcodeBody = payload.newPostcode;
-            if (this.context.entity.type === 'person') {
+            if (this.context.target.name === 'person') { // !!! maintain here ?
                postcodeBody = Object.assign(postcodeBody, {'origin': 3});
             }
-            postPostalCode(postcodeBody)
+            console.log('juste before post new postcode', postcodeBody);
+            return postPostalCode(postcodeBody)
                .then(postalCode =>  {
+                  console.log('new postcode created', postalCode.id);
                   payload.postcode = {'id': postalCode.id };
-                  this.postNewAddress(payload);
+                  return this.postNewAddress(payload);
                });
 
          } else {
-            this.postNewAddress(payload);
+            return this.postNewAddress(payload);
          }
       },
 
-      postNewAddress(payload) {
-         //console.log('postNewAddress', payload);
-         postAddress(payload)
+      postNewAddress(payload)
+      {
+         console.log('postNewAddress', payload);
+         return postAddress(payload)
             .then(address => new Promise((resolve, reject) => {
                this.entity.address = address;
                this.flag.loading = false;
                this.flag.success = true;
-               resolve();
+               resolve({
+                  target: this.context.target.name,
+                  targetId: this.context.target.id,
+                  addressId: this.entity.address.address_id
+                  }
+               );
             }))
             .catch((error) => {
                this.errorMsg.push(error);
@@ -463,31 +648,39 @@ export default {
          this.flag.loading = true;
 
          // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
+         // BUG réécrit un postcode à chaque édition !
          if ('newPostcode' in payload.newAddress) {
 
             let postcodeBody = payload.newAddress.newPostcode;
             postcodeBody = Object.assign(postcodeBody, {'origin': 3});
 
-            postPostalCode(postcodeBody)
+            console.log('juste before post new postcode', postcodeBody);
+            return postPostalCode(postcodeBody)
                .then(postalCode => {
+                  console.log('new postcode created', postalCode.id);
                   payload.newAddress.postcode = {'id': postalCode.id };
-                  this.patchExistingAddress(payload);
+                  return this.patchExistingAddress(payload);
                });
 
          } else {
-            this.patchExistingAddress(payload);
+            return this.patchExistingAddress(payload);
          }
       },
 
       patchExistingAddress(payload) {
          console.log('patchExistingAddress', payload);
-         patchAddress(payload.addressId, payload.newAddress)
+         return patchAddress(payload.addressId, payload.newAddress)
             .then(address => new Promise((resolve, reject) => {
-               this.entity.address = address;
-               this.flag.loading = false;
-               this.flag.success = true;
-               resolve();
-            }))
+                  this.entity.address = address;
+                  this.flag.loading = false;
+                  this.flag.success = true;
+                  return resolve({
+                     target: this.context.target.name,
+                     targetId: this.context.target.id,
+                     addressId: this.entity.address.address_id
+                  });
+               })
+            )
             .catch((error) => {
                this.errorMsg.push(error);
                this.flag.loading = false;
@@ -495,24 +688,17 @@ export default {
       },
 
       /*
-      *  Method called by parent when submitting address
+      *  Method just add closing pane to the callback method
       *  (get out step1 show pane, submit button)
-      */
-      submitNewAddress()
+      closePaneAndCallbackSubmit(payload)
       {
-         let payload = {
-            entity: this.context.entity.type,
-            entityId: this.context.entity.id,
-            addressId: this.entity.address.address_id
-         };
-
-         console.log('submitNewAddress return', payload);
-
-         this.initForm();
-         this.flag.showPane = false;
-
-         return payload;
+         //this.initForm();
+         //this.resetPane(); // because parent callback will cast afterLastPaneAction()
+         console.log('will call parent callback method', payload);
+         // callback props method from parent
+         this.addressChangedCallback(payload);
       }
+      */
    }
 }
 </script>
@@ -525,4 +711,7 @@ div.entity-address {
       right: 0; top: -55px;
    }
 }
+h4.h3 {
+   font-weight: bold;
+}
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
index 828c3ed96..9b6a7b87f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
@@ -1,6 +1,6 @@
 <template>
    <div class="my-1">
-      <label class="col-form-label" for="citySelector">{{ $t('city') }}</label>
+      <label class="col-form-label">{{ $t('city') }}</label>
       <VueMultiselect
          id="citySelector"
          v-model="value"
@@ -25,7 +25,7 @@
          <div class="form-floating">
             <input class="form-control"
                type="text"
-               name="code"
+               id="code"
                :placeholder="$t('postalCode_code')"
                v-model="code"/>
             <label for="code">{{ $t('postalCode_code') }}</label>
@@ -35,7 +35,7 @@
          <div class="form-floating">
             <input class="form-control"
                type="text"
-               name="name"
+               id="name"
                :placeholder="$t('postalCode_name')"
                v-model="name"/>
             <label for="name">{{ $t('postalCode_name') }}</label>
@@ -87,6 +87,9 @@ export default {
          }
       },
    },
+   mounted() {
+      console.log('writeNew.postcode', this.entity.selected.writeNew.postcode, 'in mounted');
+   },
    methods: {
       transName(value) {
          return (value.code && value.name) ? `${value.code}-${value.name}` : '';
@@ -96,6 +99,7 @@ export default {
          this.entity.selected.postcode.name = value.name;
          this.entity.selected.postcode.code = value.code;
          this.entity.selected.writeNew.postcode = false;
+         console.log('writeNew.postcode false, in selectCity');
          this.$emit('getReferenceAddresses', value);
          this.focusOnAddress();
       },
@@ -110,6 +114,7 @@ export default {
             this.entity.selected.postcode.name = city.name;
             this.entity.selected.postcode.code = city.code;
             this.entity.selected.writeNew.postcode = true;
+            console.log('writeNew.postcode true, in listenInputSearch');
          }
       },
       splitCity(city) {
@@ -142,6 +147,7 @@ export default {
       addPostcode() {
          console.log('addPostcode: pass here ?? never, it seems');
          this.entity.selected.writeNew.postcode = true;
+         console.log('writeNew.postcode true, in addPostcode');
       }
    }
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/SelectHouseholdAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/SelectHouseholdAddress.vue
deleted file mode 100644
index 74ce14c3c..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/SelectHouseholdAddress.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-   <div class="container">
-      <VueMultiselect
-         v-model="value"
-         @select="selectAddress"
-         name="field"
-         track-by="id"
-         label="value"
-         :custom-label="transName"
-         :multiple="false"
-         :placeholder="$t('select_address')"
-         :options="addresses">
-      </VueMultiselect>
-   </div>
-</template>
-
-<script>
-import VueMultiselect from 'vue-multiselect';
-
-export default {
-   name: 'SelectHouseholdAddress',
-   components: { VueMultiselect },
-   props: ['address'],
-   data() {
-      return {
-         value: null
-      }
-   },
-   computed: {
-      addresses() {
-         return this.address.loaded.addresses;
-      }
-   },
-   methods: {
-      transName(value) {
-         return `${value.text} ${value.postcode.name}`
-      },
-      selectAddress(value) {
-         this.address.selected.address = value;
-      }
-   }
-};
-</script>
-
-<style src="vue-multiselect/dist/vue-multiselect.css"></style>
-
-
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
new file mode 100644
index 000000000..69e4ccea6
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
@@ -0,0 +1,139 @@
+<template>
+
+   <div v-if="insideModal === false" class="loading">
+      <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
+      <span class="sr-only">{{ $t('loading') }}</span>
+   </div>
+
+   <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
+      {{ errorMsg }}
+   </div>
+
+   <address-render-box :address="selectedAddress"></address-render-box>
+
+   <div class="row">
+      <div v-if="showDateFrom" class='col-lg-6 address-valid date-since'>
+         <h3>{{ $t(getValidFromDateText) }}</h3>
+         <div class="input-group mb-3">
+            <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
+            <input type="date" class="form-control form-control-lg" name="validFrom"
+                   v-bind:placeholder="$t(getValidFromDateText)"
+                   v-model="validFrom"
+                   aria-describedby="validFrom"
+            />
+         </div>
+      </div>
+
+      <div v-if="showDateTo" class='col-lg-6 address-valid date-until'>
+         <h3>{{ $t(getValidToDateText) }}</h3>
+         <div class="input-group mb-3">
+            <span class="input-group-text" id="validTo"><i class="fa fa-fw fa-calendar"></i></span>
+            <input type="date" class="form-control form-control-lg" name="validTo"
+                   v-bind:placeholder="$t(getValidToDateText)"
+                   v-model="validTo"
+                   aria-describedby="validTo"
+            />
+         </div>
+      </div>
+   </div>
+
+   <action-buttons v-if="insideModal === false"
+      :options="this.options"
+      :defaultz="this.defaultz">
+      <template v-slot:before>
+         <slot name="before"></slot>
+      </template>
+      <template v-slot:action>
+         <slot name="action"></slot>
+      </template>
+      <template v-slot:after>
+         <slot name="after"></slot>
+      </template>
+   </action-buttons>
+
+</template>
+
+<script>
+import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
+import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
+import ActionButtons from './ActionButtons.vue';
+
+export default {
+   name: "DatePane",
+   components: {
+      AddressRenderBox,
+      ActionButtons
+   },
+   props: [
+      'context',
+      'options',
+      'defaultz',
+      'flag',
+      'entity',
+      'errorMsg',
+      'insideModal'
+   ],
+   computed: {
+      address() {
+         return this.entity.address;
+      },
+      validFrom: {
+         set(value) {
+            this.entity.selected.valid.from = ISOToDate(value);
+         },
+         get() {
+            return dateToISO(this.entity.selected.valid.from);
+         }
+      },
+      validTo: {
+         set(value) {
+            this.entity.selected.valid.to = ISOToDate(value);
+         },
+         get() {
+            return dateToISO(this.entity.selected.valid.to);
+         }
+      },
+      getValidFromDateText() {
+         return (this.context.target.name === 'household') ? 'move_date' : 'validFrom';
+      },
+      getValidToDateText() {
+         return 'validTo';
+      },
+      showDateFrom() {
+         return !this.context.edit && this.options.useDate.validFrom;
+      },
+      showDateTo() {
+         return !this.context.edit && this.options.useDate.validTo;
+      },
+      selectedAddress() {
+         let address = {};
+
+         address['country'] = (this.entity.selected.country) ? this.entity.selected.country : null;
+         address['postcode'] = (this.entity.selected.postcode) ? this.entity.selected.postcode : null;
+
+         if (this.entity.selected.address) {
+            let number = (this.entity.selected.address.streetNumber) ? this.entity.selected.address.streetNumber : null;
+            let street = (this.entity.selected.address.street) ? this.entity.selected.address.street : null;
+            address['text'] = number + ', ' + street;
+
+            address['street'] = (this.entity.selected.address.street) ? this.entity.selected.address.street : null;
+            address['streetNumber'] = (this.entity.selected.address.streetNumber) ? this.entity.selected.address.streetNumber : null;
+            address['floor'] = (this.entity.selected.address.floor) ? this.entity.selected.address.floor : null;
+            address['corridor'] = (this.entity.selected.address.corridor) ? this.entity.selected.address.corridor : null;
+            address['steps'] = (this.entity.selected.address.steps) ? this.entity.selected.address.steps : null;
+            address['flat'] = (this.entity.selected.address.flat) ? this.entity.selected.address.flat : null;
+            address['buildingName'] = (this.entity.selected.address.buildingName) ? this.entity.selected.address.buildingName : null;
+            address['distribution'] = (this.entity.selected.address.distribution) ? this.entity.selected.address.distribution : null;
+            address['extra'] = (this.entity.selected.address.extra) ? this.entity.selected.address.extra : null;
+         }
+
+         if (this.entity.selected.valid) {
+            address['validFrom'] = (this.entity.selected.valid.from) ? dateToISO(this.entity.selected.valid.from) : null;
+            address['validTo'] = (this.entity.selected.valid.to) ? dateToISO(this.entity.selected.valid.to) : null;
+         }
+
+         return address;
+      }
+   }
+}
+</script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
similarity index 78%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
index 7bbad3db5..9e257fe4a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -2,7 +2,7 @@
    <div class="address-form">
 
       <!-- Not display in modal -->
-      <div v-if="insideModal == false" class="loading">
+      <div v-if="insideModal === false" class="loading">
          <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
          <span class="sr-only">Loading...</span>
       </div>
@@ -54,25 +54,19 @@
          v-bind:entity="entity">
       </address-more>
 
-      <!-- Not display in modal -->
-      <ul v-if="insideModal == false"
-          class="record_actions sticky-form-buttons">
-         <li class="cancel">
-            <a class="btn btn-cancel" v-bind:href="context.backUrl">
-               {{ $t('back_to_the_list') }}
-            </a>
-         </li>
-         <li>
-            <a class="btn btn-cancel change-icon" @click="flag.showPane = true; flag.editPane = false;">
-               {{ $t('action.cancel') }}
-            </a>
-         </li>
-         <li>
-            <a class="btn btn-update" @click.prevent="$emit('closeEditPane')">
-               {{ $t('action.valid_and_see')}}
-            </a>
-         </li>
-      </ul>
+      <action-buttons v-if="insideModal === false"
+         :options="this.options"
+         :defaultz="this.defaultz">
+         <template v-slot:before>
+            <slot name="before"></slot>
+         </template>
+         <template v-slot:action>
+            <slot name="action"></slot>
+         </template>
+         <template v-slot:after>
+            <slot name="after"></slot>
+         </template>
+      </action-buttons>
 
    </div>
 </template>
@@ -82,27 +76,29 @@ import CountrySelection from './AddAddress/CountrySelection';
 import CitySelection from './AddAddress/CitySelection';
 import AddressSelection from './AddAddress/AddressSelection';
 import AddressMap from './AddAddress/AddressMap';
-import AddressMore from './AddAddress/AddressMore'
+import AddressMore from './AddAddress/AddressMore';
+import ActionButtons from './ActionButtons.vue';
 
 export default {
-   name: "EditAddressPane",
+   name: "EditPane",
    components: {
       CountrySelection,
       CitySelection,
       AddressSelection,
       AddressMap,
-      AddressMore
+      AddressMore,
+      ActionButtons
    },
    props: [
       'context',
       'options',
-      'default',
+      'defaultz',
       'flag',
       'entity',
       'errorMsg',
       'insideModal'
    ],
-   emits: ['closeEditPane', 'getCities', 'getReferenceAddresses'],
+   emits: ['getCities', 'getReferenceAddresses'],
    data() {
       return {
          value: false
@@ -149,11 +145,7 @@ export default {
 </script>
 
 <style lang="scss">
-
 div.address-form {
-   h4.h3 {
-      font-weight: bold;
-   }
    div#address_map {
       height: 400px;
       width: 100%;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
deleted file mode 100644
index d3894f972..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-<template>
-
-   <div v-if="insideModal == false" class="loading">
-      <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
-      <span class="sr-only">{{ $t('loading') }}</span>
-   </div>
-   <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
-      {{ errorMsg }}
-   </div>
-   <div v-if="flag.success" class="alert alert-success">
-      {{ $t(getSuccessText) }}
-   </div>
-
-   <address-render-box :address="address"></address-render-box>
-
-   <div v-if="showDateFrom" class='address-valid date-since'>
-      <h3>{{ $t(getValidFromDateText) }}</h3>
-      <div class="input-group mb-3">
-         <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
-         <input type="date" class="form-control form-control-lg" name="validFrom"
-                v-bind:placeholder="$t(getValidFromDateText)"
-                v-model="validFrom"
-                aria-describedby="validFrom"
-         />
-      </div>
-   </div>
-
-   <ul v-if="insideModal == false"
-      class="record_actions sticky-form-buttons">
-      <li class="cancel">
-         <a class="btn btn-cancel" v-bind:href="context.backUrl">
-            {{ $t('back_to_the_list') }}</a>
-      </li>
-      <li>
-         <a @click.prevent="$emit('openEditPane')"
-            class="btn btn-update">
-            {{ $t('action.edit')}}
-         </a>
-      </li>
-      <li>
-         <a class="btn btn-save"
-            @click.prevent="$emit('submitAddress')">
-            {{ $t('action.save')}}
-         </a>
-      </li>
-   </ul>
-</template>
-
-<script>
-import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
-import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
-
-export default {
-   name: 'ShowAddressPane',
-   components: {
-      AddressRenderBox
-   },
-   props: [
-      'context',
-      'options',
-      'default',
-      'flag',
-      'entity',
-      'valid',
-      'errorMsg',
-      'insideModal'
-   ],
-   emits: ['openEditPane', 'submitAddress'], //?
-   computed: {
-      address() {
-         return this.entity.address;
-      },
-      validFrom: {
-         set(value) {
-            this.valid.from = ISOToDate(value);
-         },
-         get() {
-            return dateToISO(this.valid.from);
-         }
-      },
-      getValidFromDateText() {
-         return (this.context.entity.type === 'household') ? 'move_date' : 'validFrom';
-      },
-      getSuccessText() {
-         switch (this.context.entity.type) {
-            /*
-            case 'household':
-               return (this.context.edit) ? 'household_address_edit_success' : 'household_address_move_success';
-            case 'person':
-               return (this.context.edit) ? 'person_address_edit_success' : 'person_address_creation_success';
-            */
-            default:
-               return (this.context.edit) ? 'address_edit_success' : 'address_new_success';
-         }
-      },
-      showDateFrom() {
-         return !this.context.edit && !this.options.hideDateFrom;
-      }
-   }
-};
-</script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
new file mode 100644
index 000000000..a4e5c571d
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -0,0 +1,101 @@
+<template>
+
+   <div v-if="!hideAddress">
+      <div class="loading">
+         <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
+         <span class="sr-only">{{ $t('loading') }}</span>
+      </div>
+
+      <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
+         {{ errorMsg }}
+      </div>
+
+      <div v-if="flag.success" class="alert alert-success">
+         {{ $t(getSuccessText) }}
+         <span v-if="forceRedirect">{{ $t('wait_redirection') }}</span>
+      </div>
+
+      <div v-if="noAddressWithStickyActions" class="mt-5">
+         <p class="chill-no-data-statement">
+            {{ $t('not_yet_address') }}
+         </p>
+      </div>
+
+      <address-render-box :address="address" :useDatePane="useDatePane"></address-render-box>
+   </div>
+
+   <action-buttons
+      :options="this.options"
+      :defaultz="this.defaultz">
+      <template v-slot:action>
+         <li>
+            <button @click.prevent="$emit('openEditPane')"
+               class="btn" :class="getClassButton"
+               type="button" name="button" :title="$t(getTextButton)">
+               <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
+            </button>
+         </li>
+      </template>
+   </action-buttons>
+
+</template>
+
+<script>
+import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
+import ActionButtons from './ActionButtons.vue';
+
+export default {
+   name: 'ShowPane',
+   components: {
+      AddressRenderBox,
+      ActionButtons
+   },
+   props: [
+      'context',
+      'options',
+      'defaultz',
+      'flag',
+      'entity',
+      'errorMsg',
+      'useDatePane'
+   ],
+   emits: ['openEditPane'],
+   computed: {
+      address() {
+         return this.entity.address;
+      },
+      displayTextButton() {
+         return (typeof this.options.button !== 'undefined' && typeof this.options.button.displayText !== 'undefined') ?
+            this.options.button.displayText : this.defaultz.button.displayText;
+      },
+      getClassButton() {
+         let type = (this.context.edit) ? this.defaultz.button.type.edit : this.defaultz.button.type.create;
+         let size = (typeof this.options.button !== 'undefined' && this.options.button.size !== null) ?
+            `${this.options.button.size} ` : '';
+         return `${size}${type}`;
+      },
+      getTextButton() {
+         if ( typeof this.options.button.text !== 'undefined'
+            && ( this.options.button.text.edit !== null
+               || this.options.button.text.create !== null
+            )) {
+            return (this.context.edit) ? this.options.button.text.edit : this.options.button.text.create;
+         }
+         return (this.context.edit) ? this.defaultz.button.text.edit : this.defaultz.button.text.create;
+      },
+      getSuccessText() {
+         return (this.context.edit) ? 'address_edit_success' : 'address_new_success';
+      },
+      hideAddress() {
+         return (typeof this.options.hideAddress !== 'undefined') ?
+            this.options.hideAddress : this.defaultz.hideAddress;
+      },
+      forceRedirect() {
+         return (!(this.context.backUrl === null || typeof this.context.backUrl === 'undefined'));
+      },
+      noAddressWithStickyActions() {
+         return !this.context.edit && !this.address.id && this.options.stickyActions;
+      }
+   }
+};
+</script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
new file mode 100644
index 000000000..fa1a08530
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
@@ -0,0 +1,76 @@
+<template>
+
+   <div v-if="insideModal === false" class="loading">
+      <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
+      <span class="sr-only">{{ $t('loading') }}</span>
+   </div>
+
+   <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">{{ errorMsg }}</div>
+
+   <h4 class="h3">{{ $t('address_suggestions') }}</h4>
+
+   <div class="flex-table AddressSuggestionList">
+      <div class="item-bloc">
+         <div class="float-button bottom">
+            <div class="box">
+               <div class="action">
+                  <ul class="record_actions">
+                     <li>
+                        <button class="btn btn-sm btn-choose">
+                           {{ $t('use_this_address') }}
+                        </button>
+                     </li>
+                  </ul>
+               </div>
+               <ul class="list-content fa-ul">
+                  <li>
+                     <i class="fa fa-li fa-map-marker"></i>
+                     <!--
+                     <address-render-box></address-render-box>
+                     -->
+                  </li>
+               </ul>
+            </div>
+         </div>
+      </div>
+   </div>
+
+   <action-buttons v-if="insideModal === false"
+      :options="this.options"
+      :defaultz="this.defaultz">
+      <template v-slot:before>
+         <slot name="before"></slot>
+      </template>
+      <template v-slot:action>
+         <slot name="action"></slot>
+      </template>
+      <template v-slot:after>
+         <slot name="after"></slot>
+      </template>
+   </action-buttons>
+
+</template>
+
+<script>
+import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
+import ActionButtons from './ActionButtons.vue';
+
+export default {
+   name: "SuggestPane",
+   components: {
+      AddressRenderBox,
+      ActionButtons
+   },
+   props: [
+      'context',
+      'options',
+      'defaultz',
+      'flag',
+      'entity',
+      'errorMsg',
+      'insideModal'
+   ],
+   computed: {},
+   methods: {}
+}
+</script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
index c938ae86d..9d7185696 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -22,7 +22,7 @@ const addressMessages = {
         corridor: 'Couloir',
         steps: 'Escalier',
         flat: 'Appartement',
-        buildingName: 'Nom du bâtiment',
+        buildingName: 'Résidence',
         extra: 'Complément d\'adresse',
         distribution: 'Cedex',
         create_postal_code: 'Localité inconnue. Cliquez ici pour créer une nouvelle localité',
@@ -30,22 +30,18 @@ const addressMessages = {
         postalCode_code: 'Code postal',
         date: "Date de la nouvelle adresse",
         validFrom: "L'adresse est valable à partir du",
+        validTo: "L'adresse est valable jusqu'au",
         back_to_the_list: 'Retour à la liste',
         loading: 'chargement en cours...',
-        address_new_success: 'La nouvelle adresse est enregistrée',
-        address_edit_success: 'L\'adresse a été mise à jour',
-
-        // person specific
-        add_an_address_to_person: 'Ajouter l\'adresse à la personne',
-        person_address_creation_success: 'La nouvelle adresse de la personne est enregistrée',
-        person_address_edit_success: 'L\'adresse de la personne a été mise à jour',
+        address_suggestions: "Suggestion d'adresses",
+        address_new_success: 'La nouvelle adresse est enregistrée.',
+        address_edit_success: 'L\'adresse a été mise à jour.',
+        wait_redirection: " La page est redirigée.",
+        not_yet_address: "Il n'y a pas encore d'adresse. Cliquez sur '+ Créer une adresse'",
+        use_this_address: "Utiliser cette adresse",
 
         // household specific
         move_date: 'Date du déménagement',
-        select_a_existing_address: 'Sélectionner une adresse existante',
-        add_an_address_to_household: 'Enregistrer',
-        household_address_move_success: 'La nouvelle adresse du ménage est enregistrée',
-        household_address_edit_success: 'L\'adresse du ménage a été mise à jour',
 
     }
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index bb2dd6543..f0a308b7b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -1,13 +1,67 @@
 import { createApp } from 'vue';
-import App from './App.vue';
 import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n';
 import { addressMessages } from './i18n';
+import App from './App.vue';
 
 const i18n = _createI18n( addressMessages );
 
-const app = createApp({
-    template: `<app></app>`,
-})
-.use(i18n)
-.component('app', App)
-.mount('#address');
+let containers = document.querySelectorAll('.address-container');
+containers.forEach((container) => {
+
+    const app = createApp({
+        template: `<app v-bind:addAddress="this.addAddress" ></app>`,
+        data() {
+            return {
+                addAddress: {
+                    context: {
+                        target: {
+                            name: container.dataset.targetName,
+                            id: parseInt(container.dataset.targetId)
+                        },
+                        edit: container.dataset.mode === 'edit',  //boolean
+                        addressId: parseInt(container.dataset.addressId) || null,
+                        backUrl: container.dataset.backUrl || null
+                    },
+                    options: {
+                        /// Options override default.
+                        /// null value take default component value defined in AddAddress data()
+                        button: {
+                            text:  {
+                                create: container.dataset.buttonText || null,
+                                edit: container.dataset.buttonText || null
+                            },
+                            size: container.dataset.buttonSize || null,
+                            displayText: container.dataset.buttonDisplayText !== 'false'  //boolean, default: true
+                        },
+
+                        /// Modal title text if create or edit address (trans chain, see i18n)
+                        title: {
+                            create: container.dataset.modalTitle || null,
+                            edit: container.dataset.modalTitle || null
+                        },
+
+                        /// Display panes in Modal for step123
+                        openPanesInModal: container.dataset.openPanesInModal !== 'false',  //boolean, default: true
+
+                        /// Display actions buttons of panes in a sticky-form-button navbar
+                        stickyActions: container.dataset.stickyActions === 'true',  //boolean, default: false
+
+                        /// Use Date fields
+                        useDate: {
+                            validFrom: container.dataset.useValidFrom === 'true',  //boolean, default: false
+                            validTo: container.dataset.useValidTo === 'true'       //boolean, default: false
+                        },
+
+                        /// Don't display show renderbox Address: showPane display only a button
+                        hideAddress: container.dataset.hideAddress === 'true'       //boolean, default: false
+                    }
+                }
+            }
+        }
+    })
+    .use(i18n)
+    .component('app', App)
+    .mount(container);
+
+    //console.log('container dataset', container.dataset);
+});
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
index 997774190..475558d0c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
@@ -16,7 +16,7 @@
          </p>
       </component>
 
-      <div v-if="isMultiline === true">
+      <div v-if="isMultiline === true" class="address-more">
          <div v-if="address.floor">
             <span class="floor">
                <b>{{ $t('floor') }}</b>: {{ address.floor }}
@@ -54,6 +54,19 @@
          </div>
       </div>
 
+      <div v-if="useDatePane === true" class="address-more">
+         <div v-if="address.validFrom">
+            <span class="validFrom">
+               <b>{{ $t('validFrom') }}</b>: {{ $d(address.validFrom.date) }}
+            </span>
+         </div>
+         <div v-if="address.validTo">
+            <span class="validTo">
+               <b>{{ $t('validTo') }}</b>: {{ $d(address.validTo.date) }}
+            </span>
+         </div>
+      </div>
+
    </component>
 </template>
 
@@ -67,6 +80,10 @@ export default {
       isMultiline: {
          default: true,
          type: Boolean
+      },
+      useDatePane: {
+         default: false,
+         type: Boolean
       }
    },
    computed: {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index 9d1c8adde..5e001a21b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -76,7 +76,9 @@ const messages = {
          birthday: {
             man: "Né le",
             woman: "Née le"
-         } ,
+         },
+         deathdate: "Date de décès",
+         years_old: "ans",
          household_without_address: "Le ménage de l'usager est sans adresse",
          no_data: "Aucune information renseignée",
          type: {
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
new file mode 100644
index 000000000..f4f63c4eb
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -0,0 +1,78 @@
+{#
+    This Twig template include load vue_address component.
+    It push all variables from context in Address/App.vue.
+
+    OPTIONS
+    * targetEntity  {
+          name:     string
+          id:       integer
+      }
+    * mode          string ['edit*'|'new']
+    * addressId     integer
+    * backUrl       twig route:   path('route', {parameters})
+    * modalTitle    twig translated chain
+    * buttonText    twig translated chain
+    * buttonSize    bootstrap class like 'btn-sm'
+    * buttonDisplayText     bool (default: true)
+    * openPanesInModal      bool (default: true)
+    * stickyActions         bool (default: false)
+    * useValidFrom          bool (default: false)
+    * useValidTo            bool (default: false)
+    * hideAddress           bool (default: false)
+#}
+<div class="address-container"
+
+     data-target-name="{{ targetEntity.name|e('html_attr') }}"
+     data-target-id="{{ targetEntity.id|e('html_attr') }}"
+
+    {% if 'edit' in app.request.get('_route') %}
+        data-mode="edit"
+        data-address-id="{{ app.request.get('address_id')|e('html_attr') }}"
+    {% elseif mode is defined and mode == 'edit' %}
+        data-mode="edit"
+        data-address-id="{{ addressId|e('html_attr') }}"
+    {% endif %}
+
+    {% if backUrl is defined %}
+        data-back-url="{{ backUrl|e('html_attr') }}"
+    {% endif %}
+
+    {% if modalTitle is defined %}
+        data-modal-title="{{ modalTitle|trans|e('html_attr') }}"
+    {% endif %}
+
+    {% if buttonText is defined %}
+        data-button-text="{{ buttonText|trans|e('html_attr') }}"
+    {% endif %}
+
+    {% if buttonSize is defined %}
+        data-button-size="{{ buttonSize|e('html_attr') }}"
+    {% endif %}
+
+    {% if buttonDisplayText is defined and buttonDisplayText != 1 %}
+        data-button-display-text="false"
+    {% endif %}
+
+    {% if openPanesInModal is defined and openPanesInModal != 1 %}
+        data-open-panes-in-modal="false"
+    {% endif %}
+
+    {% if stickyActions is defined and stickyActions == 1 %}
+        data-sticky-actions="true"
+    {% endif %}
+
+    {% if useValidFrom is defined and useValidFrom == 1 %}
+        data-use-valid-from="true"
+    {% endif %}
+
+    {% if useValidTo is defined and useValidTo == 1 %}
+        data-use-valid-to="true"
+    {% endif %}
+
+    {% if hideAddress is defined and hideAddress == 1 %}
+        data-hide-address="true"
+    {% endif %}
+></div>
+
+{{ encore_entry_script_tags('vue_address') }}
+{{ encore_entry_link_tags('vue_address') }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig
new file mode 100644
index 000000000..1dc0acc81
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig
@@ -0,0 +1,8 @@
+{% extends '@ChillMain/Admin/layout.html.twig' %}
+
+{% block title %}{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}{% endblock %}
+
+{% block content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+    {% endembed %}
+{% endblock content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
index 4628e3cb5..b1bdb8438 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -34,25 +34,25 @@
 
 {% macro extended(address, options) %}
     {% if address.floor is not empty %}
-        <span class="floor">{{ address.floor }}</span>
+        <span class="floor">{{ 'address more.floor'|trans }} {{ address.floor }}</span>
     {% endif %}
     {% if address.corridor is not empty %}
-        <span class="corridor">{{ address.corridor }}</span>
+        <span class="corridor">{{ 'address more.corridor'|trans }} {{ address.corridor }}</span>
     {% endif %}
     {% if address.steps is not empty %}
-        <span class="steps">{{ address.steps }}</span>
+        <span class="steps">{{ 'address more.steps'|trans }} {{ address.steps }}</span>
     {% endif %}
     {% if address.buildingName is not empty %}
-        <span class="buildingName">{{ address.buildingName }}</span>
+        <span class="buildingName">{{ 'address more.buildingName'|trans }} {{ address.buildingName }}</span>
     {% endif %}
     {% if address.flat is not empty %}
-        <span class="flat">{{ address.flat }}</span>
-    {% endif %}
-    {% if address.distribution is not empty %}
-        <span class="distribution">{{ address.distribution }}</span>
+        <span class="flat">{{ 'address more.flat'|trans }} {{ address.flat }}</span>
     {% endif %}
     {% if address.extra is not empty %}
-        <span class="extra">{{ address.extra }}</span>
+        <span class="extra">{{ 'address more.extra'|trans }} {{ address.extra }}</span>
+    {% endif %}
+    {% if address.distribution is not empty %}
+        <span class="distribution">{{ 'address more.distribution'|trans }} {{ address.distribution }}</span>
     {% endif %}
 {% endmacro %}
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
new file mode 100644
index 000000000..8f037f150
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
@@ -0,0 +1,26 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>id</th>
+            <th>label</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.label|localize_translatable_string }}</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_admin_user_job_edit', { 'id': entity.id}) }}" class="btn btn-sm btn-edit btn-mini"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endblock %}
+    {% endembed %}
+{% endblock content %}
diff --git a/src/Bundle/ChillMainBundle/Search/SearchInterface.php b/src/Bundle/ChillMainBundle/Search/SearchInterface.php
index 708835b47..958ce9ddd 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchInterface.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchInterface.php
@@ -23,45 +23,44 @@ namespace Chill\MainBundle\Search;
 
 /**
  * This interface must be implemented on services which provide search results.
- * 
+ *
  * @todo : write doc and add a link to documentation
- * 
+ *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  *
  */
 interface SearchInterface
 {
-
     const SEARCH_PREVIEW_OPTION = '_search_preview';
-    
+
     /**
      * Request parameters contained inside the `add_q` parameters
      */
     const REQUEST_QUERY_PARAMETERS = '_search_parameters';
-    
+
     /**
      * Supplementary parameters to the query string
      */
     const REQUEST_QUERY_KEY_ADD_PARAMETERS = 'add_q';
 
-   /** 
+   /**
     * return the result in a html string. The string will be inclued (as raw)
     * into a global view.
-    * 
+    *
     * The global view may be :
     * {% for result as resultsFromDifferentSearchInterface %}
     *    {{ result|raw }}
     * {% endfor %}
-    * 
+    *
     * **available options** :
-    * - SEARCH_PREVIEW_OPTION (boolean) : if renderResult should return a "preview" of 
+    * - SEARCH_PREVIEW_OPTION (boolean) : if renderResult should return a "preview" of
     * the results. In this case, a subset of results should be returned, and,
     * if the query return more results, a button "see all results" should be
     * displayed at the end of the list.
-    * 
-    * **Interaction between `start` and `limit` and pagination : you should 
-    * take only the given parameters into account; the results from pagination 
-    * should be ignored. (Most of the time, it should be the same). 
+    *
+    * **Interaction between `start` and `limit` and pagination : you should
+    * take only the given parameters into account; the results from pagination
+    * should be ignored. (Most of the time, it should be the same).
     *
     * @param array  $terms   the string to search
     * @param int    $start   the first result (for pagination)
@@ -72,10 +71,10 @@ interface SearchInterface
     */
    public function renderResult(array $terms, $start=0, $limit=50, array $options = array(), $format = 'html');
 
-   /** 
+   /**
     * we may desactive the search interface by default. in this case,
-    * the search will be launch and rendered only with "advanced search" 
-    * 
+    * the search will be launch and rendered only with "advanced search"
+    *
     * this may be activated/desactived from bundle definition in config.yml
     *
     * @return bool
@@ -84,18 +83,18 @@ interface SearchInterface
 
    /**
     * the order in which the results will appears in the global view
-    * 
+    *
     * (this may be eventually defined in config.yml)
-    * 
-    * @return int 
+    *
+    * @return int
     */
    public function getOrder();
-   
+
    /**
     * indicate if the implementation supports the given domain
-    * 
+    *
     * @return boolean
     */
    public function supports($domain, $format);
-   
+
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
index 842fc5ecc..9131a6501 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
@@ -23,8 +23,8 @@ use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
- * Voter for Chill software. 
- * 
+ * Voter for Chill software.
+ *
  * This abstract Voter provide generic methods to handle object specific to Chill
  *
  *
@@ -36,20 +36,20 @@ abstract class AbstractChillVoter extends Voter implements ChillVoterInterface
     {
         @trigger_error('This voter should implements the new `supports` '
             . 'methods introduced by Symfony 3.0, and do not rely on '
-            . 'getSupportedAttributes and getSupportedClasses methods.', 
+            . 'getSupportedAttributes and getSupportedClasses methods.',
             E_USER_DEPRECATED);
 
         return \in_array($attribute, $this->getSupportedAttributes($attribute))
             && \in_array(\get_class($subject), $this->getSupportedClasses());
     }
-    
+
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
         @trigger_error('This voter should implements the new `voteOnAttribute` '
             . 'methods introduced by Symfony 3.0, and do not rely on '
             . 'isGranted method', E_USER_DEPRECATED);
-        
+
         return $this->isGranted($attribute, $subject, $token->getUser());
     }
-    
+
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
index 697158bf8..2b223a0fe 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
@@ -23,6 +23,11 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
+use Chill\MainBundle\Security\Resolver\ScopeResolverInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\MainBundle\Entity\Scope;
@@ -32,87 +37,126 @@ use Chill\MainBundle\Entity\GroupCenter;
 use Chill\MainBundle\Entity\RoleScope;
 
 /**
- * Helper for authorizations. 
- * 
+ * Helper for authorizations.
+ *
  * Provides methods for user and entities information.
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class AuthorizationHelper
 {
+    protected RoleHierarchyInterface $roleHierarchy;
+
     /**
-     *
-     * @var RoleHierarchyInterface
-     */
-    protected $roleHierarchy;
-    
-    /**
-     * The role in a hierarchy, given by the parameter 
+     * The role in a hierarchy, given by the parameter
      * `security.role_hierarchy.roles` from the container.
      *
      * @var string[]
      */
-    protected $hierarchy;
-    
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
+    protected array $hierarchy;
+
+    protected EntityManagerInterface $em;
+
+    protected CenterResolverDispatcher $centerResolverDispatcher;
+
+    protected ScopeResolverDispatcher $scopeResolverDispatcher;
+
+    protected LoggerInterface $logger;
+
     public function __construct(
         RoleHierarchyInterface $roleHierarchy,
-        $hierarchy,
-        EntityManagerInterface $em
+        ParameterBagInterface $parameterBag,
+        EntityManagerInterface $em,
+        CenterResolverDispatcher $centerResolverDispatcher,
+        LoggerInterface $logger,
+        ScopeResolverDispatcher $scopeResolverDispatcher
     ) {
         $this->roleHierarchy = $roleHierarchy;
-        $this->hierarchy     = $hierarchy;
+        $this->hierarchy     = $parameterBag->get('security.role_hierarchy.roles');
         $this->em = $em;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+        $this->logger = $logger;
+        $this->scopeResolverDispatcher = $scopeResolverDispatcher;
     }
-    
+
     /**
      * Determines if a user is active on this center
-     * 
+     *
+     * If
+     *
      * @param User $user
-     * @param Center $center
+     * @param Center|Center[] $center May be an array of center
      * @return bool
      */
-    public function userCanReachCenter(User $user, Center $center)
+    public function userCanReachCenter(User $user, $center)
     {
-        foreach ($user->getGroupCenters() as $groupCenter) {
-            if ($center->getId() === $groupCenter->getCenter()->getId()) {
-                
-                return true;
+        if ($center instanceof \Traversable) {
+            foreach ($center as $c) {
+                if ($c->userCanReachCenter($user, $c)) {
+                    return true;
+                }
             }
+            return false;
+        } elseif ($center instanceof Center) {
+            foreach ($user->getGroupCenters() as $groupCenter) {
+                if ($center->getId() === $groupCenter->getCenter()->getId()) {
+                    return true;
+                }
+            }
+
+            return false;
         }
-        
-        return false;
+
+        throw new \UnexpectedValueException(sprintf("The entity given is not an ".
+            "instance of %s, %s given", Center::class, get_class($center)));
     }
-    
+
     /**
-     * 
+     *
      * Determines if the user has access to the given entity.
-     * 
+     *
      * if the entity implements Chill\MainBundle\Entity\HasScopeInterface,
      * the scope is taken into account.
-     * 
+     *
      * @param User $user
-     * @param HasCenterInterface $entity the entity may also implement HasScopeInterface
+     * @param mixed $entity the entity may also implement HasScopeInterface
      * @param string|Role $attribute
      * @return boolean true if the user has access
      */
-    public function userHasAccess(User $user, HasCenterInterface $entity, $attribute)
+    public function userHasAccess(User $user, $entity, $attribute)
+    {
+        $center = $this->centerResolverDispatcher->resolveCenter($entity);
+
+        if (is_iterable($center)) {
+            foreach ($center as $c) {
+                if ($this->userHasAccessForCenter($user, $c, $entity, $attribute)) {
+                    return true;
+                }
+            }
+
+            return false;
+        } elseif ($center instanceof Center) {
+            return $this->userHasAccessForCenter($user, $center, $entity, $attribute);
+        } elseif (NULL === $center) {
+            return false;
+        } else {
+            throw new \UnexpectedValueException("could not resolver a center");
+        }
+    }
+
+    private function userHasAccessForCenter(User $user, Center $center, $entity, $attribute): bool
     {
-        
-        $center = $entity->getCenter();
-        
         if (!$this->userCanReachCenter($user, $center)) {
+            $this->logger->debug("user cannot reach center of entity", [
+                'center_name' => $center->getName(),
+                'user' => $user->getUsername()
+            ]);
             return false;
         }
-        
+
         foreach ($user->getGroupCenters() as $groupCenter){
             //filter on center
-            if ($groupCenter->getCenter()->getId() === $entity->getCenter()->getId()) {
+            if ($groupCenter->getCenter() === $center) {
                 $permissionGroup = $groupCenter->getPermissionsGroup();
                 //iterate on roleScopes
                 foreach($permissionGroup->getRoleScopes() as $roleScope) {
@@ -120,31 +164,42 @@ class AuthorizationHelper
                     if ($this->isRoleReached($attribute, $roleScope->getRole())) {
                         //if yes, we have a right on something...
                         // perform check on scope if necessary
-                        if ($entity instanceof HasScopeInterface) {
-                            $scope = $entity->getScope();
-                            if ($scope === NULL) {
-                                return true;
-                            }
-                            if ($scope->getId() === $roleScope
-                                  ->getScope()->getId()) {
-                                return true;
-                            }
+                        if ($this->scopeResolverDispatcher->isConcerned($entity)) {
+                           $scope = $this->scopeResolverDispatcher->resolveScope($entity);
+
+                           if (NULL === $scope) {
+                               return true;
+                           } elseif (is_iterable($scope)) {
+                               foreach ($scope as $s) {
+                                   if ($s === $roleScope->getScope()) {
+                                       return true;
+                                   }
+                               }
+                           } else {
+                               if ($scope === $roleScope->getScope()) {
+                                   return true;
+                               }
+                           }
                         } else {
                             return true;
                         }
                     }
                 }
-                
             }
         }
-        
+
+        $this->logger->debug("user can reach center entity, but not role", [
+            'username' => $user->getUsername(),
+            'center' => $center->getName()
+        ]);
+
         return false;
     }
-    
+
     /**
      * Get reachable Centers for the given user, role,
      * and optionnaly Scope
-     * 
+     *
      * @param User $user
      * @param string|Role $role
      * @param null|Scope $scope
@@ -156,7 +211,7 @@ class AuthorizationHelper
             $role = $role->getRole();
         }
         $centers = array();
-        
+
         foreach ($user->getGroupCenters() as $groupCenter){
             $permissionGroup = $groupCenter->getPermissionsGroup();
             //iterate on roleScopes
@@ -170,13 +225,13 @@ class AuthorizationHelper
                         if ($scope->getId() == $roleScope->getScope()->getId()){
                             $centers[] = $groupCenter->getCenter();
                             break 1;
-                        }      
+                        }
                     }
                 }
             }
-            
+
         }
-        
+
         return $centers;
     }
 
@@ -203,18 +258,18 @@ class AuthorizationHelper
 
         return $results;
     }
-    
+
     /**
      * Return all reachable scope for a given user, center and role
-     * 
+     *
      * @deprecated Use getReachableCircles
      *
      * @param User $user
-     * @param Role $role
-     * @param Center $center
+     * @param string role
+     * @param Center|Center[] $center
      * @return Scope[]
      */
-    public function getReachableScopes(User $user, $role, Center $center)
+    public function getReachableScopes(User $user, $role, $center)
     {
         if ($role instanceof Role) {
             $role = $role->getRole();
@@ -222,22 +277,31 @@ class AuthorizationHelper
 
         return $this->getReachableCircles($user, $role, $center);
     }
-    
+
     /**
      * Return all reachable circle for a given user, center and role
-     * 
+     *
      * @param User $user
      * @param string|Role $role
-     * @param Center $center
+     * @param Center|Center[] $center
      * @return Scope[]
      */
-    public function getReachableCircles(User $user, $role, Center $center)
+    public function getReachableCircles(User $user, $role, $center)
     {
+        $scopes = [];
+
+        if (is_iterable($center)) {
+            foreach ($center as $c) {
+                $scopes = \array_merge($scopes, $this->getReachableCircles($user, $role, $c));
+            }
+
+            return $scopes;
+        }
+
         if ($role instanceof Role) {
             $role = $role->getRole();
         }
-        $scopes = array();
-        
+
         foreach ($user->getGroupCenters() as $groupCenter){
             if ($center->getId() === $groupCenter->getCenter()->getId()) {
                 //iterate on permissionGroup
@@ -251,23 +315,19 @@ class AuthorizationHelper
                 }
             }
         }
-        
+
         return $scopes;
     }
-    
+
     /**
-     * 
-     * @param Role $role
-     * @param Center $center
-     * @param Scope $circle
-     * @return Users
+     *
+     * @return User[]
      */
-    public function findUsersReaching(Role $role, Center $center, Scope $circle = null)
+    public function findUsersReaching(string $role, Center $center, Scope $circle = null): array
     {
         $parents = $this->getParentRoles($role);
         $parents[] = $role;
-        $parentRolesString = \array_map(function(Role $r) { return $r->getRole(); }, $parents);
-        
+
         $qb = $this->em->createQueryBuilder();
         $qb
             ->select('u')
@@ -276,23 +336,23 @@ class AuthorizationHelper
             ->join('gc.permissionsGroup', 'pg')
             ->join('pg.roleScopes', 'rs')
             ->where('gc.center = :center')
-            ->andWhere($qb->expr()->in('rs.role', $parentRolesString))
+            ->andWhere($qb->expr()->in('rs.role', $parents))
             ;
-        
+
         $qb->setParameter('center', $center);
-        
+
         if ($circle !== null) {
             $qb->andWhere('rs.scope = :circle')
                 ->setParameter('circle', $circle)
                 ;
         }
-        
+
         return $qb->getQuery()->getResult();
     }
-    
+
     /**
      * Test if a parent role may give access to a given child role
-     * 
+     *
      * @param Role $childRole The role we want to test if he is reachable
      * @param Role $parentRole The role which should give access to $childRole
      * @return boolean true if the child role is granted by parent role
@@ -301,36 +361,31 @@ class AuthorizationHelper
     {
         $reachableRoles = $this->roleHierarchy
                 ->getReachableRoleNames([$parentRole]);
-        
+
         return in_array($childRole, $reachableRoles);
     }
-    
+
     /**
-     * Return all the role which give access to the given role. Only the role 
+     * Return all the role which give access to the given role. Only the role
      * which are registered into Chill are taken into account.
-     * 
+     *
      * @param Role $role
-     * @return Role[] the role which give access to the given $role
+     * @return string[] the role which give access to the given $role
      */
-    public function getParentRoles(Role $role)
+    public function getParentRoles($role): array
     {
         $parentRoles = [];
         // transform the roles from role hierarchy from string to Role
-        $roles = \array_map(
-                function($string) {
-                    return new Role($string);
-                }, 
-                \array_keys($this->hierarchy)
-                );
-        
+        $roles = \array_keys($this->hierarchy);
+
         foreach ($roles as $r) {
-            $childRoles = $this->roleHierarchy->getReachableRoleNames([$r->getRole()]);
-            
+            $childRoles = $this->roleHierarchy->getReachableRoleNames([$r]);
+
             if (\in_array($role, $childRoles)) {
                 $parentRoles[] = $r;
             }
         }
-        
+
         return $parentRoles;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
new file mode 100644
index 000000000..ef1d319ac
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Chill\MainBundle\Security\Authorization;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+
+final class DefaultVoterHelper implements VoterHelperInterface
+{
+    protected AuthorizationHelper $authorizationHelper;
+
+    protected CenterResolverDispatcher $centerResolverDispatcher;
+
+    protected array $configuration = [];
+
+    /**
+     * @param AuthorizationHelper $authorizationHelper
+     * @param CenterResolverDispatcher $centerResolverDispatcher
+     * @param array $configuration
+     */
+    public function __construct(
+        AuthorizationHelper $authorizationHelper,
+        CenterResolverDispatcher $centerResolverDispatcher,
+        array $configuration
+    ) {
+        $this->authorizationHelper = $authorizationHelper;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+        $this->configuration = $configuration;
+    }
+
+    public function supports($attribute, $subject): bool
+    {
+        foreach ($this->configuration as list($attributes, $subj)) {
+            if ($subj === null) {
+                if ($subject === null && \in_array($attribute, $attributes)) {
+                    return true;
+                }
+            } elseif ($subject instanceof $subj) {
+                return \in_array($attribute, $attributes);
+            }
+        }
+
+        return false;
+    }
+
+    public function voteOnAttribute($attribute, $subject, $token): bool
+    {
+        if (!$token->getUser() instanceof User) {
+            return false;
+        }
+
+        if (NULL === $subject) {
+            return 0 < count($this->authorizationHelper->getReachableCenters($token->getUser(), $attribute, null));
+        }
+
+        return $this->authorizationHelper->userHasAccess(
+            $token->getUser(),
+            $subject,
+            $attribute
+        );
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
new file mode 100644
index 000000000..9349eaed2
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Chill\MainBundle\Security\Authorization;
+
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+
+class DefaultVoterHelperFactory implements VoterHelperFactoryInterface
+{
+    protected AuthorizationHelper $authorizationHelper;
+    protected CenterResolverDispatcher $centerResolverDispatcher;
+
+    public function __construct(
+        AuthorizationHelper $authorizationHelper,
+        CenterResolverDispatcher $centerResolverDispatcher
+    ) {
+        $this->authorizationHelper = $authorizationHelper;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+    }
+
+    public function generate($context): VoterGeneratorInterface
+    {
+        return new DefaultVoterHelperGenerator(
+            $this->authorizationHelper,
+            $this->centerResolverDispatcher
+        );
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
new file mode 100644
index 000000000..c8300e45a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Chill\MainBundle\Security\Authorization;
+
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+
+final class DefaultVoterHelperGenerator implements VoterGeneratorInterface
+{
+    protected AuthorizationHelper $authorizationHelper;
+    protected CenterResolverDispatcher $centerResolverDispatcher;
+    protected array $configuration = [];
+
+    public function __construct(
+        AuthorizationHelper $authorizationHelper,
+        CenterResolverDispatcher $centerResolverDispatcher
+    ) {
+        $this->authorizationHelper = $authorizationHelper;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+    }
+
+    public function addCheckFor(?string $subject, array $attributes): self
+    {
+       $this->configuration[] = [$attributes, $subject];
+
+       return $this;
+    }
+
+    public function build(): VoterHelperInterface
+    {
+        return new DefaultVoterHelper(
+            $this->authorizationHelper,
+            $this->centerResolverDispatcher,
+            $this->configuration
+        );
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
new file mode 100644
index 000000000..70e517536
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Chill\MainBundle\Security\Authorization;
+
+interface VoterGeneratorInterface
+{
+    /**
+     * @param string $class The FQDN of a class
+     * @param array $attributes an array of attributes
+     * @return $this
+     */
+    public function addCheckFor(?string $class, array $attributes): self;
+
+    public function build(): VoterHelperInterface;
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php
new file mode 100644
index 000000000..5b16a10ef
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Chill\MainBundle\Security\Authorization;
+
+interface VoterHelperFactoryInterface
+{
+    public function generate($context): VoterGeneratorInterface;
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php
new file mode 100644
index 000000000..fc08bcb40
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Chill\MainBundle\Security\Authorization;
+
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+
+interface VoterHelperInterface
+{
+    public function supports($attribute, $subject): bool;
+
+    public function voteOnAttribute($attribute, $subject, TokenInterface $token);
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
new file mode 100644
index 000000000..1e2f9c02b
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Chill\MainBundle\Security\Resolver;
+
+class CenterResolverDispatcher
+{
+    /**
+     * @var iterabble|CenterResolverInterface[]
+     */
+    private iterable $resolvers = [];
+
+    public function __construct(iterable $resolvers)
+    {
+        $this->resolvers = $resolvers;
+    }
+
+    /**
+     * @param mixed $entity
+     * @param array|null $options
+     * @return null|Center|Center[]
+     */
+    public function resolveCenter($entity, ?array $options = [])
+    {
+        foreach($this->resolvers as $priority => $resolver) {
+            if ($resolver->supports($entity, $options)) {
+                return $resolver->resolveCenter($entity, $options);
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php
new file mode 100644
index 000000000..db49874b7
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\Center;
+
+interface CenterResolverInterface
+{
+    public function supports($entity, ?array $options = []): bool;
+
+    /**
+     * @param $entity
+     * @param array|null $options
+     * @return Center|array|Center[]
+     */
+    public function resolveCenter($entity, ?array $options = []);
+
+    public static function getDefaultPriority(): int;
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
new file mode 100644
index 000000000..e3e92164a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\HasCentersInterface;
+
+class DefaultCenterResolver implements CenterResolverInterface
+{
+    public function supports($entity, ?array $options = []): bool
+    {
+        return $entity instanceof HasCenterInterface || $entity instanceof HasCentersInterface;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param HasCenterInterface $entity
+     * @param array $options
+     */
+    public function resolveCenter($entity, ?array $options = [])
+    {
+        if ($entity instanceof HasCenterInterface) {
+            return $entity->getCenter();
+        } elseif ($entity instanceof HasCentersInterface) {
+            return $entity->getCenters();
+        } else {
+            throw new \UnexpectedValueException("should be an instanceof");
+        }
+    }
+
+    public static function getDefaultPriority(): int
+    {
+        return -256;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
new file mode 100644
index 000000000..caf052764
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
+
+class DefaultScopeResolver implements ScopeResolverInterface
+{
+
+    public function supports($entity, ?array $options = []): bool
+    {
+        return $entity instanceof HasScopeInterface || $entity instanceof HasScopesInterface;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param HasScopeInterface|HasScopesInterface $entity
+     */
+    public function resolveScope($entity, ?array $options = [])
+    {
+        if ($entity instanceof HasScopeInterface) {
+            return $entity->getScope();
+        } elseif ($entity instanceof HasScopesInterface) {
+            return $entity->getScopes();
+        } else {
+            throw new \UnexpectedValueException("should be an instanceof %s or %s",
+                HasScopesInterface::class, HasScopeInterface::class);
+        }
+    }
+
+    public function isConcerned($entity, ?array $options = []): bool
+    {
+        return $entity instanceof HasScopeInterface || $entity instanceof HasScopesInterface;
+    }
+
+    public static function getDefaultPriority(): int
+    {
+        return -256;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php b/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
new file mode 100644
index 000000000..21ece21a3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Twig\TwigFilter;
+
+final class ResolverTwigExtension extends \Twig\Extension\AbstractExtension
+{
+    private CenterResolverDispatcher $centerResolverDispatcher;
+
+    /**
+     * @param CenterResolverDispatcher $centerResolverDispatcher
+     */
+    public function __construct(CenterResolverDispatcher $centerResolverDispatcher)
+    {
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+    }
+
+    public function getFilters()
+    {
+        return [
+            new TwigFilter('chill_resolve_center', [$this, 'resolveCenter'])
+        ];
+    }
+
+    /**
+     * @param mixed $entity
+     * @param array|null $options
+     * @return Center|Center[]|null
+     */
+    public function resolveCenter($entity, ?array $options = [])
+    {
+        return $this->centerResolverDispatcher->resolveCenter($entity, $options);
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
new file mode 100644
index 000000000..cc3f11560
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\Scope;
+
+final class ScopeResolverDispatcher
+{
+    /**
+     * @var iterable|ScopeResolverInterface[]
+     */
+    private iterable $resolvers;
+
+    public function __construct(iterable $resolvers)
+    {
+        $this->resolvers = $resolvers;
+    }
+
+    /**
+     * @param $entity
+     * @return Scope|Scope[]|iterable
+     */
+    public function resolveScope($entity, ?array $options = [])
+    {
+        foreach ($this->resolvers as $resolver) {
+            if ($resolver->supports($entity, $options)) {
+                return $resolver->resolveScope($entity, $options);
+            }
+        }
+
+        return null;
+    }
+
+    public function isConcerned($entity, ?array $options = []): bool
+    {
+        foreach ($this->resolvers as $resolver) {
+            if ($resolver->supports($entity, $options)) {
+                return $resolver->isConcerned($entity, $options);
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
new file mode 100644
index 000000000..04e949a59
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\Scope;
+
+/**
+ * Interface to implement to define a ScopeResolver.
+ */
+interface ScopeResolverInterface
+{
+    /**
+     * Return true if this resolve is able to decide "something" on this entity.
+     */
+    public function supports($entity, ?array $options = []): bool;
+
+    /**
+     * Will return the scope for the entity
+     *
+     * @return Scope|array|Scope[]
+     */
+    public function resolveScope($entity, ?array $options = []);
+
+
+    /**
+     * Return true if the entity is concerned by scope, false otherwise.
+     */
+    public function isConcerned($entity, ?array $options = []): bool;
+
+    /**
+     * get the default priority for this resolver. Resolver with an higher priority will be
+     * queried first.
+     */
+    public static function getDefaultPriority(): int;
+}
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
index 44998043b..2b39c07c3 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
@@ -13,12 +13,15 @@ class AddressNormalizer implements NormalizerAwareInterface, NormalizerInterface
 
     public function normalize($address, string $format = null, array $context = [])
     {
+        /** @var Address $address */
         $data['address_id'] = $address->getId();
         $data['text'] = $address->isNoAddress() ? '' : $address->getStreetNumber().', '.$address->getStreet();
         $data['street'] = $address->getStreet();
         $data['streetNumber'] = $address->getStreetNumber();
+        $data['postcode']['id'] = $address->getPostCode()->getId();
         $data['postcode']['name'] = $address->getPostCode()->getName();
         $data['postcode']['code'] = $address->getPostCode()->getCode();
+        $data['country']['id'] = $address->getPostCode()->getCountry()->getId();
         $data['country']['name'] = $address->getPostCode()->getCountry()->getName();
         $data['country']['code'] = $address->getPostCode()->getCountry()->getCountryCode();
         $data['floor'] = $address->getFloor();
@@ -28,6 +31,8 @@ class AddressNormalizer implements NormalizerAwareInterface, NormalizerInterface
         $data['buildingName'] = $address->getBuildingName();
         $data['distribution'] = $address->getDistribution();
         $data['extra'] = $address->getExtra();
+        $data['validFrom'] = $address->getValidFrom();
+        $data['validTo'] = $address->getValidTo();
 
         return $data;
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
index eeff4cc06..1953439dd 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
@@ -7,11 +7,11 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 class UserControllerTest extends WebTestCase
 {
     private $client;
-    
+
     public function setUp()
     {
         self::bootKernel();
-        
+
         $this->client = static::createClient(array(), array(
            'PHP_AUTH_USER' => 'admin',
            'PHP_AUTH_PW'   => 'password',
@@ -23,62 +23,64 @@ class UserControllerTest extends WebTestCase
     {
         // get the list
         $crawler = $this->client->request('GET', '/fr/admin/user/');
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode(), 
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode(),
                 "Unexpected HTTP status code for GET /admin/user/");
-        
+
         $link = $crawler->selectLink('Ajouter un nouvel utilisateur')->link();
         $this->assertInstanceOf('Symfony\Component\DomCrawler\Link', $link);
         $this->assertRegExp('|/fr/admin/user/new$|', $link->getUri());
     }
-        
+
     public function testNew()
     {
         $crawler = $this->client->request('GET', '/fr/admin/user/new');
-        
+
         $username = 'Test_user'.  uniqid();
         $password = 'Password1234!';
-        dump($crawler->text());
         // Fill in the form and submit it
         $form = $crawler->selectButton('Créer')->form(array(
             'chill_mainbundle_user[username]'  => $username,
             'chill_mainbundle_user[plainPassword][first]' => $password,
-            'chill_mainbundle_user[plainPassword][second]' => $password
+            'chill_mainbundle_user[plainPassword][second]' => $password,
+            'chill_mainbundle_user[email]'  => $username.'@gmail.com',
+            'chill_mainbundle_user[label]'  => $username,
+
         ));
 
         $this->client->submit($form);
         $crawler = $this->client->followRedirect();
 
         // Check data in the show view
-        $this->assertGreaterThan(0, $crawler->filter('td:contains("Test_user")')->count(), 
+        $this->assertGreaterThan(0, $crawler->filter('td:contains("Test_user")')->count(),
                 'Missing element td:contains("Test user")');
-        
+
         $update = $crawler->selectLink('Modifier')->link();
-        
+
         $this->assertInstanceOf('Symfony\Component\DomCrawler\Link', $update);
         $this->assertRegExp('|/fr/admin/user/[0-9]{1,}/edit$|', $update->getUri());
-        
+
         //test the auth of the new client
         $this->isPasswordValid($username, $password);
-        
+
         return $update;
     }
-    
+
     protected function isPasswordValid($username, $password)
     {
         /* @var $passwordEncoder \Symfony\Component\Security\Core\Encoder\UserPasswordEncoder */
         $passwordEncoder = self::$kernel->getContainer()
                 ->get('security.password_encoder');
-        
+
         $user = self::$kernel->getContainer()
                 ->get('doctrine.orm.entity_manager')
                 ->getRepository('ChillMainBundle:User')
                 ->findOneBy(array('username' => $username));
-        
+
         $this->assertTrue($passwordEncoder->isPasswordValid($user, $password));
     }
-    
+
     /**
-     * 
+     *
      * @param \Symfony\Component\DomCrawler\Link $update
      * @depends testNew
      */
@@ -90,24 +92,24 @@ class UserControllerTest extends WebTestCase
         $form = $crawler->selectButton('Mettre à jour')->form(array(
             'chill_mainbundle_user[username]'  => $username,
         ));
-        
+
         $this->client->submit($form);
         $crawler = $this->client->followRedirect();
         // Check the element contains an attribute with value equals "Foo"
-        $this->assertGreaterThan(0, $crawler->filter('[value="'.$username.'"]')->count(), 
+        $this->assertGreaterThan(0, $crawler->filter('[value="'.$username.'"]')->count(),
                 'Missing element [value="Foo bar"]');
-        
+
         $updatePassword = $crawler->selectLink('Modifier le mot de passe')->link();
-        
+
         $this->assertInstanceOf('Symfony\Component\DomCrawler\Link', $updatePassword);
-        $this->assertRegExp('|/fr/admin/user/[0-9]{1,}/edit_password$|', 
+        $this->assertRegExp('|/fr/admin/user/[0-9]{1,}/edit_password$|',
                 $updatePassword->getUri());
-        
+
         return array('link' => $updatePassword, 'username' => $username);
     }
-    
+
     /**
-     * 
+     *
      * @param \Symfony\Component\DomCrawler\Link $updatePassword
      * @depends testUpdate
      */
@@ -116,22 +118,22 @@ class UserControllerTest extends WebTestCase
         $link = $params['link'];
         $username = $params['username'];
         $newPassword = '1234Password!';
-        
+
         $crawler = $this->client->click($link);
-        
+
         $form = $crawler->selectButton('Changer le mot de passe')->form(array(
             'chill_mainbundle_user_password[new_password][first]' => $newPassword,
             'chill_mainbundle_user_password[new_password][second]' => $newPassword,
         ));
-        
+
         $this->client->submit($form);
-        
-        $this->assertTrue($this->client->getResponse()->isRedirect(), 
+
+        $this->assertTrue($this->client->getResponse()->isRedirect(),
                 "the response is a redirection");
         $this->client->followRedirect();
-        
+
         $this->isPasswordValid($username, $newPassword);
     }
 
-    
+
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
index fbd3cd4d1..764d6c429 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
@@ -19,6 +19,10 @@
 
 namespace Chill\MainBundle\Tests\Security\Authorization;
 
+use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\HasCentersInterface;
+use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Chill\MainBundle\Test\PrepareUserTrait;
 use Chill\MainBundle\Test\PrepareCenterTrait;
@@ -30,22 +34,22 @@ use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\Center;
 
 /**
- * 
+ *
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class AuthorizationHelperTest extends KernelTestCase
 {
-    
+
     use PrepareUserTrait, PrepareCenterTrait, PrepareScopeTrait, ProphecyTrait;
-    
-    public function setUp() 
+
+    public function setUp()
     {
         static::bootKernel();
     }
-    
+
     /**
-     * 
+     *
      * @return \Chill\MainBundle\Security\Authorization\AuthorizationHelper
      */
     private function getAuthorizationHelper()
@@ -54,13 +58,13 @@ class AuthorizationHelperTest extends KernelTestCase
                 ->get('chill.main.security.authorization.helper')
                 ;
     }
-    
+
     /**
      * Test function userCanReach of helper.
-     * 
+     *
      * A user can reach center => the function should return true.
      */
-    public function testUserCanReachCenter_UserShouldReach() 
+    public function testUserCanReachCenter_UserShouldReach()
     {
         $center = $this->prepareCenter(1, 'center');
         $scope = $this->prepareScope(1, 'default');
@@ -72,16 +76,16 @@ class AuthorizationHelperTest extends KernelTestCase
             )
         ));
         $helper = $this->getAuthorizationHelper();
-        
+
         $this->assertTrue($helper->userCanReachCenter($user, $center));
     }
-    
+
     /**
      * Test function userCanReach of helper
-     * 
+     *
      * A user can not reachcenter =>W the function should return false
      */
-    public function testUserCanReachCenter_UserShouldNotReach() 
+    public function testUserCanReachCenter_UserShouldNotReach()
     {
         $centerA = $this->prepareCenter(1, 'center');
         $centerB = $this->prepareCenter(2, 'centerB');
@@ -94,11 +98,11 @@ class AuthorizationHelperTest extends KernelTestCase
             )
         ));
         $helper = $this->getAuthorizationHelper();
-        
+
         $this->assertFalse($helper->userCanReachCenter($user, $centerB));
-        
+
     }
-    
+
     public function testUserHasAccess_shouldHaveAccess_EntityWithoutScope()
     {
         $center = $this->prepareCenter(1, 'center');
@@ -114,11 +118,11 @@ class AuthorizationHelperTest extends KernelTestCase
         $entity = $this->getProphet()->prophesize();
         $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
         $entity->getCenter()->willReturn($center);
-        
-        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 
+
+        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(),
               'CHILL_ROLE'));
     }
-    
+
     public function testUserHasAccess_ShouldHaveAccessWithInheritance_EntityWithoutScope()
     {
         $center = $this->prepareCenter(1, 'center');
@@ -130,17 +134,17 @@ class AuthorizationHelperTest extends KernelTestCase
                 )
             )
         ));
-        
+
         $helper = $this->getAuthorizationHelper();
         $entity = $this->getProphet()->prophesize();
         $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
         $entity->getCenter()->willReturn($center);
-        
-        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 
+
+        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(),
               'CHILL_INHERITED_ROLE_1'));
     }
-    
-    
+
+
     public function testuserHasAccess_UserHasNoRole_EntityWithoutScope()
     {
         $center = $this->prepareCenter(1, 'center');
@@ -156,10 +160,10 @@ class AuthorizationHelperTest extends KernelTestCase
         $entity = $this->getProphet()->prophesize();
         $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
         $entity->getCenter()->willReturn($center);
-        
+
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
     }
-    
+
     /**
      * test that a user has no access on a entity, but is granted on the same role
      * on another center
@@ -186,10 +190,10 @@ class AuthorizationHelperTest extends KernelTestCase
         $entity = $this->getProphet()->prophesize();
         $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
         $entity->getCenter()->willReturn($centerA);
-        
+
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
     }
-    
+
     public function testtestUserHasAccess_UserShouldHaveAccess_EntityWithScope()
     {
         $center = $this->prepareCenter(1, 'center');
@@ -207,10 +211,10 @@ class AuthorizationHelperTest extends KernelTestCase
         $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
         $entity->getCenter()->willReturn($center);
         $entity->getScope()->willReturn($scope);
-        
+
         $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
     }
-    
+
     public function testUserHasAccess_UserHasNoRole_EntityWithScope()
     {
         $center = $this->prepareCenter(1, 'center');
@@ -228,10 +232,10 @@ class AuthorizationHelperTest extends KernelTestCase
         $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
         $entity->getCenter()->willReturn($center);
         $entity->getScope()->willReturn($scope);
-        
+
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'ANOTHER_ROLE'));
     }
-    
+
     public function testUserHasAccess_UserHasNoCenter_EntityWithScope()
     {
         $centerA = $this->prepareCenter(1, 'center'); //the user will have this center
@@ -250,10 +254,10 @@ class AuthorizationHelperTest extends KernelTestCase
         $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
         $entity->getCenter()->willReturn($centerB);
         $entity->getScope()->willReturn($scope);
-        
+
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
     }
-    
+
     public function testUserHasAccess_UserHasNoScope_EntityWithScope()
     {
         $center = $this->prepareCenter(1, 'center');
@@ -268,16 +272,106 @@ class AuthorizationHelperTest extends KernelTestCase
         ));
         $helper = $this->getAuthorizationHelper();
         $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
-        $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
+        $entity->willImplement(HasCenterInterface::class);
+        $entity->willImplement(HasScopeInterface::class);
         $entity->getCenter()->willReturn($center);
         $entity->getScope()->willReturn($scopeA);
-        
+
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
     }
-    
+
+    public function testUserHasAccess_MultiCenter_EntityWithoutScope()
+    {
+        $center = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(1, 'centerB');
+        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $user = $this->prepareUser(array(
+            array(
+                'center' => $center, 'permissionsGroup' => array(
+                ['scope' => $scopeB, 'role' => 'CHILL_ROLE']
+            )
+            )
+        ));
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement(HasCentersInterface::class);
+        $entity->getCenters()->willReturn([$center, $centerB]);
+
+        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    public function testUserHasNoAccess_MultiCenter_EntityWithoutScope()
+    {
+        $center = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(1, 'centerB');
+        $centerC = $this->prepareCenter(1, 'centerC');
+        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $user = $this->prepareUser(array(
+            array(
+                'center' => $center, 'permissionsGroup' => array(
+                ['scope' => $scopeB, 'role' => 'CHILL_ROLE']
+            )
+            )
+        ));
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement(HasCentersInterface::class);
+        $entity->getCenters()->willReturn([$centerB, $centerC]);
+
+        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    public function testUserHasNoAccess_EntityMultiScope()
+    {
+        $centerA = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(1, 'centerB');
+        $scopeA = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $scopeC = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $user = $this->prepareUser(array(
+            array(
+                'center' => $centerA, 'permissionsGroup' => array(
+                ['scope' => $scopeA, 'role' => 'CHILL_ROLE']
+            )
+            )
+        ));
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement(HasCentersInterface::class);
+        $entity->willImplement(HasScopesInterface::class);
+        $entity->getCenters()->willReturn([$centerA, $centerB]);
+        $entity->getScopes()->willReturn([$scopeB, $scopeC]);
+
+        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    public function testUserHasAccess_EntityMultiScope()
+    {
+        $centerA = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(1, 'centerB');
+        $scopeA = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $user = $this->prepareUser(array(
+            array(
+                'center' => $centerA, 'permissionsGroup' => array(
+                ['scope' => $scopeA, 'role' => 'CHILL_ROLE']
+            )
+            )
+        ));
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement(HasCentersInterface::class);
+        $entity->willImplement(HasScopesInterface::class);
+        $entity->getCenters()->willReturn([$centerA, $centerB]);
+        $entity->getScopes()->willReturn([$scopeA, $scopeB]);
+
+        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+
+
     /**
-     * 
+     *
      * @dataProvider dataProvider_getReachableCenters
      * @param Center $shouldHaveCenter
      * @param User $user
@@ -288,7 +382,7 @@ class AuthorizationHelperTest extends KernelTestCase
     {
         $this->assertEquals($test, $result, $msg);
     }
-    
+
     public function dataProvider_getReachableCenters()
     {
         $this->setUp();
@@ -297,10 +391,10 @@ class AuthorizationHelperTest extends KernelTestCase
         $scopeA = $this->prepareScope(1, 'scope default');
         $scopeB = $this->prepareScope(2, 'scope B');
         $scopeC = $this->prepareScope(3, 'scope C');
-        
+
         $userA = $this->prepareUser(array(
             array(
-                'center' => $centerA, 
+                'center' => $centerA,
                 'permissionsGroup' => array(
                     ['scope' => $scopeB, 'role' => 'CHILL_ROLE_1'],
                     ['scope' => $scopeA, 'role' => 'CHILL_ROLE_2']
@@ -313,62 +407,62 @@ class AuthorizationHelperTest extends KernelTestCase
                      ['scope' => $scopeC, 'role' => 'CHILL_ROLE_2']
                )
             )
-            
+
         ));
-        
+
         $ah = $this->getAuthorizationHelper();
-        
+
         return array(
            // without scopes
             array(
-                true, 
-                in_array($centerA, $ah->getReachableCenters($userA, 
+                true,
+                in_array($centerA, $ah->getReachableCenters($userA,
                     new Role('CHILL_ROLE_1'), null)),
                 'center A should be available for userA, with role 1 '
            ),
             array(
-                true, 
-                in_array($centerA, $ah->getReachableCenters($userA, 
+                true,
+                in_array($centerA, $ah->getReachableCenters($userA,
                     new Role('CHILL_ROLE_2'), null)),
                 'center A should be available for userA, with role 2 '
            ),
            array(
-                true, 
-                in_array($centerB, $ah->getReachableCenters($userA, 
+                true,
+                in_array($centerB, $ah->getReachableCenters($userA,
                     new Role('CHILL_ROLE_2'), null)),
                 'center A should be available for userA, with role 2 '
            ),
            array(
-                false, 
+                false,
                 in_array($centerB, $ah->getReachableCenters($userA,
                     new Role('CHILL_ROLE_1'), null)),
                 'center B should NOT be available for userA, with role 1 '
             ),
            // with scope
            array(
-                true, 
-                in_array($centerA, $ah->getReachableCenters($userA, 
+                true,
+                in_array($centerA, $ah->getReachableCenters($userA,
                     new Role('CHILL_ROLE_1'), $scopeB)),
                 'center A should be available for userA, with role 1, scopeC '
            ),
            array(
-                false, 
-                in_array($centerA, $ah->getReachableCenters($userA, 
+                false,
+                in_array($centerA, $ah->getReachableCenters($userA,
                     new Role('CHILL_ROLE_2'), $scopeC)),
                 'center A should NOT be available for userA, with role 2, scopeA '
            ),
            array(
-                true, 
-                in_array($centerB, $ah->getReachableCenters($userA, 
+                true,
+                in_array($centerB, $ah->getReachableCenters($userA,
                     new Role('CHILL_ROLE_2'), $scopeA)),
                 'center B should be available for userA, with role 2, scopeA '
            ),
         );
-        
+
     }
-    
+
     /**
-     * 
+     *
      * @dataProvider dataProvider_getReachableScopes
      * @param boolean $expectedResult
      * @param Scope $testedScope
@@ -382,11 +476,11 @@ class AuthorizationHelperTest extends KernelTestCase
     {
         $reachableScopes = $this->getAuthorizationHelper()
                 ->getReachableScopes($user, $role, $center);
-        
+
         $this->assertEquals($expectedResult, in_array($testedScope, $reachableScopes),
                 $message);
     }
-    
+
     public function dataProvider_getReachableScopes()
     {
         $centerA = $this->prepareCenter(1, 'center A');
@@ -394,10 +488,10 @@ class AuthorizationHelperTest extends KernelTestCase
         $scopeA = $this->prepareScope(1, 'scope default');
         $scopeB = $this->prepareScope(2, 'scope B');
         $scopeC = $this->prepareScope(3, 'scope C');
-        
+
         $userA = $this->prepareUser(array(
             array(
-                'center' => $centerA, 
+                'center' => $centerA,
                 'permissionsGroup' => array(
                     ['scope' => $scopeB, 'role' => 'CHILL_ROLE_1'],
                     ['scope' => $scopeA, 'role' => 'CHILL_ROLE_2']
@@ -411,9 +505,9 @@ class AuthorizationHelperTest extends KernelTestCase
                      ['scope' => $scopeB, 'role' => 'CHILL_ROLE_2']
                )
             )
-            
+
         ));
-        
+
         return array(
             array(
                 true,
@@ -442,37 +536,30 @@ class AuthorizationHelperTest extends KernelTestCase
             )
         );
     }
-    
+
     public function testGetParentRoles()
     {
         $parentRoles = $this->getAuthorizationHelper()
-            ->getParentRoles(new Role('CHILL_INHERITED_ROLE_1'));
-        
-        $this->assertContains(
-            'CHILL_MASTER_ROLE', 
-            \array_map(
-                function(Role $role) {
-                    return $role->getRole();
-                }, 
-                $parentRoles
-            ), 
+            ->getParentRoles('CHILL_INHERITED_ROLE_1');
+
+        $this->assertContains('CHILL_MASTER_ROLE', $parentRoles,
             "Assert that `CHILL_MASTER_ROLE` is a parent of `CHILL_INHERITED_ROLE_1`");
     }
-    
+
     public function testFindUsersReaching()
     {
         $centerA = static::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository(Center::class)
             ->findOneByName('Center A');
-        
+
         $users = $this->getAuthorizationHelper()
-            ->findUsersReaching(new Role('CHILL_PERSON_SEE'), 
+            ->findUsersReaching(new Role('CHILL_PERSON_SEE'),
                 $centerA);
-        
+
         $usernames = \array_map(function(User $u) { return $u->getUsername(); }, $users);
-        
+
         $this->assertContains('center a_social', $usernames);
     }
-    
+
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
new file mode 100644
index 000000000..851183e3d
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Chill\MainBundle\Tests\Security\Resolver;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+class CenterResolverDispatcherTest extends KernelTestCase
+{
+    private CenterResolverDispatcher $dispatcher;
+
+    protected function setUp()
+    {
+        self::bootKernel();
+        $this->dispatcher = self::$container->get(CenterResolverDispatcher::class);
+    }
+
+    public function testResolveCenter()
+    {
+       $center = new Center();
+
+       $resolved = $this->dispatcher->resolveCenter($center);
+
+       $this->assertSame($center, $resolved);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
new file mode 100644
index 000000000..de6d19b5a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Chill\MainBundle\Tests\Security\Resolver;
+
+use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Security\Resolver\DefaultScopeResolver;
+use PHPUnit\Framework\TestCase;
+
+class DefaultScopeResolverTest extends TestCase
+{
+    private DefaultScopeResolver $scopeResolver;
+
+    public function setUp()
+    {
+        $this->scopeResolver = new DefaultScopeResolver();
+    }
+
+    public function testHasScopeInterface()
+    {
+        $scope = new Scope();
+        $entity = new class($scope) implements HasScopeInterface {
+
+            public function __construct(Scope $scope) {
+                $this->scope = $scope;
+            }
+
+            public function getScope()
+            {
+                return $this->scope;
+            }
+
+        };
+
+        $this->assertTrue($this->scopeResolver->supports($entity));
+        $this->assertTrue($this->scopeResolver->isConcerned($entity));
+        $this->assertSame($scope, $this->scopeResolver->resolveScope($entity));
+    }
+
+    public function testHasScopesInterface()
+    {
+        $entity = new class($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface {
+
+            public function __construct(Scope $scopeA, Scope $scopeB) {
+                $this->scopes = [$scopeA, $scopeB];
+            }
+
+            public function getScopes(): iterable
+            {
+                return $this->scopes;
+            }
+        };
+
+        $this->assertTrue($this->scopeResolver->supports($entity));
+        $this->assertTrue($this->scopeResolver->isConcerned($entity));
+        $this->assertIsArray($this->scopeResolver->resolveScope($entity));
+        $this->assertSame($scopeA, $this->scopeResolver->resolveScope($entity)[0]);
+        $this->assertSame($scopeB, $this->scopeResolver->resolveScope($entity)[1]);
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
new file mode 100644
index 000000000..2a36fd365
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Chill\MainBundle\Tests\Security\Resolver;
+
+use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Security\Resolver\DefaultScopeResolver;
+use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
+use PHPUnit\Framework\TestCase;
+
+class DefaultScopeResolverDispatcherTest extends TestCase
+{
+    private ScopeResolverDispatcher $scopeResolverDispatcher;
+
+    public function setUp()
+    {
+        $this->scopeResolverDispatcher = new ScopeResolverDispatcher([new DefaultScopeResolver()]);
+    }
+
+    public function testHasScopeInterface()
+    {
+        $scope = new Scope();
+        $entity = new class($scope) implements HasScopeInterface {
+
+            public function __construct(Scope $scope) {
+                $this->scope = $scope;
+            }
+
+            public function getScope()
+            {
+                return $this->scope;
+            }
+
+        };
+
+        $this->assertTrue($this->scopeResolverDispatcher->isConcerned($entity));
+        $this->assertSame($scope, $this->scopeResolverDispatcher->resolveScope($entity));
+    }
+
+    public function testHasScopesInterface()
+    {
+        $entity = new class($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface {
+
+            public function __construct(Scope $scopeA, Scope $scopeB) {
+                $this->scopes = [$scopeA, $scopeB];
+            }
+
+            public function getScopes(): iterable
+            {
+                return $this->scopes;
+            }
+        };
+
+        $this->assertTrue($this->scopeResolverDispatcher->isConcerned($entity));
+        $this->assertIsArray($this->scopeResolverDispatcher->resolveScope($entity));
+        $this->assertSame($scopeA, $this->scopeResolverDispatcher->resolveScope($entity)[0]);
+        $this->assertSame($scopeB, $this->scopeResolverDispatcher->resolveScope($entity)[1]);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
index 3dd8c8736..8ee69e96d 100644
--- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
@@ -480,3 +480,34 @@ paths:
           description: "not found"
         401:
           description: "Unauthorized"
+
+  /1.0/main/scope.json:
+    get:
+      tags:
+        - scope
+      summary: return a list of scopes
+      responses:
+        200:
+          description: "ok"
+        401:
+          description: "Unauthorized"
+
+  /1.0/main/scope/{id}.json:
+    get:
+      tags:
+        - scope
+      summary: return a list of scopes
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: The scope id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      responses:
+        200:
+          description: "ok"
+        401:
+          description: "Unauthorized"
diff --git a/src/Bundle/ChillMainBundle/config/services/form.yaml b/src/Bundle/ChillMainBundle/config/services/form.yaml
index bd5c1ece5..f719edb55 100644
--- a/src/Bundle/ChillMainBundle/config/services/form.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/form.yaml
@@ -113,6 +113,10 @@ services:
         tags:
             - { name: form.type }
 
+    Chill\MainBundle\Form\UserType:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Form\PermissionsGroupType:
         tags:
             - { name: form.type }
@@ -123,3 +127,4 @@ services:
             - "@security.token_storage"
         tags:
             - { name: form.type }
+
diff --git a/src/Bundle/ChillMainBundle/config/services/security.yaml b/src/Bundle/ChillMainBundle/config/services/security.yaml
index 474ac0093..0d820220b 100644
--- a/src/Bundle/ChillMainBundle/config/services/security.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/security.yaml
@@ -3,16 +3,45 @@ services:
         autowire: true
         autoconfigure: true
 
+    # do not autowire the directory Security/Resolver
+    Chill\MainBundle\Security\Resolver\CenterResolverDispatcher:
+        arguments:
+            - !tagged_iterator chill_main.center_resolver
+
+    Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher:
+        arguments:
+            - !tagged_iterator chill_main.scope_resolver
+
+    # do not autowire the directory Security/Resolver
+    Chill\MainBundle\Security\Resolver\DefaultCenterResolver:
+        autoconfigure: true
+        autowire: true
+
+    Chill\MainBundle\Security\Resolver\DefaultScopeResolver:
+        autoconfigure: true
+        autowire: true
+
+    # do not autowire the directory Security/Resolver
+    Chill\MainBundle\Security\Resolver\ResolverTwigExtension:
+        autoconfigure: true
+        autowire: true
+
+    # do not autowire the directory Security/Resolver
+    Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory:
+        autowire: true
+
+    # do not autowire the directory Security/Resolver
+    Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface: '@Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory'
+
     chill.main.security.authorization.helper:
         class: Chill\MainBundle\Security\Authorization\AuthorizationHelper
-        arguments:
-            $roleHierarchy: "@security.role_hierarchy"
-            $hierarchy: "%security.role_hierarchy.roles%"
-            $em: '@Doctrine\ORM\EntityManagerInterface'
+        autowire: true
+        autoconfigure: true
     Chill\MainBundle\Security\Authorization\AuthorizationHelper: '@chill.main.security.authorization.helper'
 
     chill.main.role_provider:
         class: Chill\MainBundle\Security\RoleProvider
+    Chill\MainBundle\Security\RoleProvider: '@chill.main.role_provider'
 
     chill.main.user_provider:
         class: Chill\MainBundle\Security\UserProvider\UserProvider
diff --git a/src/Bundle/ChillMainBundle/config/validation.yaml b/src/Bundle/ChillMainBundle/config/validation.yaml
index dd5f8d985..79cf4d8f9 100644
--- a/src/Bundle/ChillMainBundle/config/validation.yaml
+++ b/src/Bundle/ChillMainBundle/config/validation.yaml
@@ -18,6 +18,8 @@ Chill\MainBundle\Entity\User:
                 min: 3
         email:
             - Email: ~
+        label:
+            - NotBlank: ~
     constraints:
         - Callback:
               callback: isGroupCenterPresentOnce
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php b/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php
new file mode 100644
index 000000000..7fe6b8e72
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add metadata on users
+ */
+final class Version20210903144853 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add metadata on users';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE chill_main_user_job_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_main_user_job (id INT NOT NULL, label JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('ALTER TABLE users ADD label VARCHAR(200) NULL DEFAULT NULL');
+        $this->addSql('UPDATE users SET label=username');
+        $this->addSql('ALTER TABLE users ALTER label DROP DEFAULT');
+        $this->addSql('ALTER TABLE users ALTER label SET NOT NULL');
+        $this->addSql('ALTER TABLE users ADD mainCenter_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE users ADD mainScope_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE users ADD userJob_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE users ADD CONSTRAINT FK_1483A5E92C2125C1 FOREIGN KEY (mainCenter_id) REFERENCES centers (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE users ADD CONSTRAINT FK_1483A5E9115E73F3 FOREIGN KEY (mainScope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE users ADD CONSTRAINT FK_1483A5E964B65C5B FOREIGN KEY (userJob_id) REFERENCES chill_main_user_job (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_1483A5E92C2125C1 ON users (mainCenter_id)');
+        $this->addSql('CREATE INDEX IDX_1483A5E9115E73F3 ON users (mainScope_id)');
+        $this->addSql('CREATE INDEX IDX_1483A5E964B65C5B ON users (userJob_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E964B65C5B');
+        $this->addSql('DROP SEQUENCE chill_main_user_job_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_main_user_job');
+        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E92C2125C1');
+        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E9115E73F3');
+        $this->addSql('ALTER TABLE users DROP label');
+        $this->addSql('ALTER TABLE users DROP mainCenter_id');
+        $this->addSql('ALTER TABLE users DROP mainScope_id');
+        $this->addSql('ALTER TABLE users DROP userJob_id');
+        $this->addSql('ALTER TABLE users ALTER usernameCanonical DROP NOT NULL');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index b230b6ac1..f799f20b6 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -74,6 +74,15 @@ address:
     address_homeless: L'adresse est-elle celle d'un domicile fixe ?
     real address: Adresse d'un domicile
     consider homeless: N'est pas l'adresse d'un domicile (SDF)
+address more:
+    floor: ét
+    corridor: coul
+    steps: esc
+    flat: appart
+    buildingName: résidence
+    extra: ''
+    distribution: cedex
+Create a new address: Créer une nouvelle adresse
 
 #serach
 Your search is empty. Please provide search terms.: La recherche est vide. Merci de fournir des termes de recherche.
@@ -177,6 +186,7 @@ Exports list: Liste des exports
 Create an export: Créer un export
 #export creation step 'center' : pick a center
 Pick centers: Choisir les centres
+Pick a center: Choisir un centre
 The export will contains only data from the picked centers.: L'export ne contiendra que les données des centres choisis.
 This will eventually restrict your possibilities in filtering the data.: Les possibilités de filtrages seront adaptées aux droits de consultation pour les centres choisis.
 Go to export options: Vers la préparation de l'export
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
index 2f086c9f5..1bf40d146 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
@@ -73,7 +73,7 @@ class AccompanyingCourseController extends Controller
             }
         }
 
-        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $period);
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::CREATE, $period);
 
         $em->persist($period);
         $em->flush();
@@ -92,6 +92,8 @@ class AccompanyingCourseController extends Controller
      */
     public function indexAction(AccompanyingPeriod $accompanyingCourse): Response
     {
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $accompanyingCourse);
+
         // compute some warnings
         // get persons without household
         $withoutHousehold = [];
@@ -131,6 +133,8 @@ class AccompanyingCourseController extends Controller
      */
     public function editAction(AccompanyingPeriod $accompanyingCourse): Response
     {
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $accompanyingCourse);
+
         return $this->render('@ChillPerson/AccompanyingCourse/edit.html.twig', [
             'accompanyingCourse' => $accompanyingCourse
         ]);
@@ -146,6 +150,8 @@ class AccompanyingCourseController extends Controller
      */
     public function historyAction(AccompanyingPeriod $accompanyingCourse): Response
     {
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $accompanyingCourse);
+
         return $this->render('@ChillPerson/AccompanyingCourse/history.html.twig', [
             'accompanyingCourse' => $accompanyingCourse
         ]);
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
index f31dfa585..255c6d9ba 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
@@ -23,7 +23,10 @@
 namespace Chill\PersonBundle\Controller;
 
 use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\DBAL\Exception;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\AccompanyingPeriodType;
@@ -53,21 +56,24 @@ class AccompanyingPeriodController extends AbstractController
      */
     protected $validator;
 
-    /**
-     * AccompanyingPeriodController constructor.
-     *
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param ValidatorInterface $validator
-     */
-    public function __construct(EventDispatcherInterface $eventDispatcher, ValidatorInterface $validator)
-    {
+    protected AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository;
+
+    public function __construct(
+        AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository,
+        EventDispatcherInterface $eventDispatcher,
+        ValidatorInterface $validator
+    ) {
+        $this->accompanyingPeriodACLAwareRepository = $accompanyingPeriodACLAwareRepository;
         $this->eventDispatcher = $eventDispatcher;
         $this->validator = $validator;
     }
 
-    public function listAction(int $person_id): Response
+    /**
+     * @ParamConverter("person", options={"id"="person_id"})
+     */
+    public function listAction(Person $person): Response
     {
-        $person = $this->_getPerson($person_id);
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $person);
 
         $event = new PrivacyEvent($person, [
             'element_class' => AccompanyingPeriod::class,
@@ -75,9 +81,10 @@ class AccompanyingPeriodController extends AbstractController
         ]);
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
-        $accompanyingPeriods = $person->getAccompanyingPeriodsOrdered();
+        $accompanyingPeriods = $this->accompanyingPeriodACLAwareRepository
+            ->findByPerson($person, AccompanyingPeriodVoter::SEE);
 
-        return $this->render('ChillPersonBundle:AccompanyingPeriod:list.html.twig', [
+        return $this->render('@ChillPerson/AccompanyingPeriod/list.html.twig', [
             'accompanying_periods' => $accompanyingPeriods,
             'person' => $person
         ]);
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index 759f892b2..03da97d5f 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -230,13 +230,16 @@ final class PersonController extends AbstractController
      */
     public function newAction(Request $request)
     {
-        $defaultCenter = $this->security
-                        ->getUser()
-                        ->getGroupCenters()[0]
-                        ->getCenter();
+        $person = new Person();
 
-        $person = (new Person(new \DateTime('now')))
-                ->setCenter($defaultCenter);
+        if (1 === count($this->security->getUser()
+                ->getGroupCenters())) {
+            $person->setCenter(
+                $this->security->getUser()
+                    ->getGroupCenters()[0]
+                    ->getCenter()
+            );
+        }
 
         $form = $this->createForm(CreationPersonType::class, $person, [
             'validation_groups' => ['create']
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
index d6bdce233..848e8f874 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
@@ -24,8 +24,12 @@ namespace Chill\PersonBundle\DataFixtures\ORM;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\PostalCode;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\CenterRepository;
 use Chill\MainBundle\Repository\CountryRepository;
+use Chill\MainBundle\Repository\ScopeRepository;
+use Chill\MainBundle\Repository\UserRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\MaritalStatus;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
@@ -90,12 +94,26 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
 
     protected MaritalStatusRepository $maritalStatusRepository;
 
+    /**
+     * @var array|Scope[]
+     */
+    protected array $cacheScopes = [];
+
+    protected ScopeRepository $scopeRepository;
+
+    /** @var array|User[] */
+    protected array $cacheUsers = [];
+
+    protected UserRepository $userRepository;
+
     public function __construct(
         Registry $workflowRegistry,
         SocialIssueRepository $socialIssueRepository,
         CenterRepository $centerRepository,
         CountryRepository $countryRepository,
-        MaritalStatusRepository $maritalStatusRepository
+        MaritalStatusRepository $maritalStatusRepository,
+        ScopeRepository $scopeRepository,
+        UserRepository $userRepository
     ) {
         $this->faker = Factory::create('fr_FR');
         $this->faker->addProvider($this);
@@ -105,7 +123,8 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         $this->countryRepository = $countryRepository;
         $this->maritalStatusRepository = $maritalStatusRepository;
         $this->loader = new NativeLoader($this->faker);
-
+        $this->scopeRepository = $scopeRepository;
+        $this->userRepository = $userRepository;
     }
 
     public function getOrder()
@@ -220,10 +239,16 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
                     new \DateInterval('P' . \random_int(0, 180) . 'D')
                 )
         );
+        $accompanyingPeriod->setCreatedBy($this->getRandomUser())
+            ->setCreatedAt(new \DateTimeImmutable('now'));
         $person->addAccompanyingPeriod($accompanyingPeriod);
         $accompanyingPeriod->addSocialIssue($this->getRandomSocialIssue());
 
         if (\random_int(0, 10) > 3) {
+            // always add social scope:
+            $accompanyingPeriod->addScope($this->getReference('scope_social'));
+            var_dump(count($accompanyingPeriod->getScopes()));
+
             $accompanyingPeriod->setAddressLocation($this->createAddress());
             $manager->persist($accompanyingPeriod->getAddressLocation());
             $workflow = $this->workflowRegistry->get($accompanyingPeriod);
@@ -231,9 +256,19 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         }
 
         $manager->persist($person);
+        $manager->persist($accompanyingPeriod);
         echo "add person'".$person->__toString()."'\n";
     }
 
+    private function getRandomUser(): User
+    {
+        if (0 === count($this->cacheUsers)) {
+            $this->cacheUsers = $this->userRepository->findAll();
+        }
+
+        return $this->cacheUsers[\array_rand($this->cacheUsers)];
+    }
+
     private function createAddress(): Address
     {
         $objectSet = $this->loader->loadData([
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
index c8593d1fd..18f8e5879 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
@@ -40,13 +40,13 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
         return 9600;
     }
 
-    
+
     public function load(ObjectManager $manager)
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
             $permissionsGroup = $this->getReference($permissionsGroupRef);
             $scopeSocial = $this->getReference('scope_social');
-            
+
             //create permission group
             switch ($permissionsGroup->getName()) {
                 case 'social':
@@ -55,7 +55,7 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
 
                     $permissionsGroup->addRoleScope(
                         (new RoleScope())
-                            ->setRole(AccompanyingPeriodVoter::SEE)
+                            ->setRole(AccompanyingPeriodVoter::FULL)
                             ->setScope($scopeSocial)
                     );
 
@@ -87,7 +87,7 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
                     $manager->persist($roleScopeUpdate);
                     $manager->persist($roleScopeCreate);
                     $manager->persist($roleScopeDuplicate);
-                    
+
                     break;
                 case 'administrative':
                     printf("Adding CHILL_PERSON_SEE to %s permission group \n", $permissionsGroup->getName());
@@ -98,9 +98,9 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
                     $manager->persist($roleScopeSee);
                     break;
             }
-            
+
         }
-        
+
         $manager->flush();
     }
 
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 07d5dc88f..485185ce7 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -18,6 +18,7 @@
 
 namespace Chill\PersonBundle\DependencyInjection;
 
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -60,6 +61,9 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $container->setParameter('chill_person.allow_multiple_simultaneous_accompanying_periods',
                 $config['allow_multiple_simultaneous_accompanying_periods']);
 
+        // register all configuration in a unique parameter
+        $container->setParameter('chill_person', $config);
+
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/widgets.yaml');
@@ -255,14 +259,26 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
      */
     protected function prependRoleHierarchy(ContainerBuilder $container)
     {
-        $container->prependExtensionConfig('security', array(
-           'role_hierarchy' => array(
-              'CHILL_PERSON_UPDATE' => array('CHILL_PERSON_SEE'),
-              'CHILL_PERSON_CREATE' => array('CHILL_PERSON_SEE'),
-              PersonVoter::LISTS => [ ChillExportVoter::EXPORT ],
-              PersonVoter::STATS => [ ChillExportVoter::EXPORT ]
-           )
-        ));
+        $container->prependExtensionConfig('security', [
+            'role_hierarchy' => [
+                PersonVoter::UPDATE => [PersonVoter::SEE],
+                PersonVoter::CREATE => [PersonVoter::SEE],
+                PersonVoter::LISTS => [ChillExportVoter::EXPORT],
+                PersonVoter::STATS => [ChillExportVoter::EXPORT],
+                // accompanying period
+                AccompanyingPeriodVoter::SEE_DETAILS => [AccompanyingPeriodVoter::SEE],
+                AccompanyingPeriodVoter::CREATE => [AccompanyingPeriodVoter::SEE_DETAILS],
+                AccompanyingPeriodVoter::DELETE => [AccompanyingPeriodVoter::SEE_DETAILS],
+                AccompanyingPeriodVoter::EDIT => [AccompanyingPeriodVoter::SEE_DETAILS],
+                // give all ACL for FULL
+                AccompanyingPeriodVoter::FULL => [
+                    AccompanyingPeriodVoter::SEE_DETAILS,
+                    AccompanyingPeriodVoter::CREATE,
+                    AccompanyingPeriodVoter::EDIT,
+                    AccompanyingPeriodVoter::DELETE
+                ]
+            ]
+        ]);
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
index 927612d5f..bf2d18922 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
@@ -43,23 +43,26 @@ class Configuration implements ConfigurationInterface
                     ->arrayNode('validation')
                         ->canBeDisabled()
                         ->children()
+                            ->booleanNode('center_required')
+                                ->info('Enable a center for each person entity. If disabled, you must provide your own center provider')
+                                ->defaultValue(true)
+                            ->end()
                             ->scalarNode('birthdate_not_after')
-                            ->info($this->validationBirthdateNotAfterInfos)
-                            ->defaultValue('P1D')
-                            ->validate()
-                                ->ifTrue(function($period) {
-                                    try {
-                                        $interval = new \DateInterval($period);
-                                    } catch (\Exception $ex) {
-                                        return true;
-                                    }
-                                    return false;
-                                })
-                                ->thenInvalid('Invalid period for birthdate validation : "%s" '
-                                        . 'The parameter should match duration as defined by ISO8601 : '
-                                        . 'https://en.wikipedia.org/wiki/ISO_8601#Durations')
+                                ->info($this->validationBirthdateNotAfterInfos)
+                                    ->defaultValue('P1D')
+                                    ->validate()
+                                        ->ifTrue(function($period) {
+                                            try {
+                                                $interval = new \DateInterval($period);
+                                            } catch (\Exception $ex) {
+                                                return true;
+                                            }
+                                            return false;
+                                        })
+                                        ->thenInvalid('Invalid period for birthdate validation : "%s" '
+                                                . 'The parameter should match duration as defined by ISO8601 : '
+                                                . 'https://en.wikipedia.org/wiki/ISO_8601#Durations')
                             ->end() // birthdate_not_after, parent = children of validation
-
                         ->end() // children for 'validation', parent = validation
                     ->end() //validation, parent = children of root
                 ->end() // children of root, parent = root
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index 1c375d051..14fb26f1a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -24,6 +24,8 @@ namespace Chill\PersonBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Entity\HasCentersInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\Address;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
@@ -52,7 +54,8 @@ use Symfony\Component\Validator\Constraints as Assert;
  *  "accompanying_period"=AccompanyingPeriod::class
  *  })
  */
-class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
+class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface,
+    HasScopesInterface, HasCentersInterface
 {
     /**
      * Mark an accompanying period as "occasional"
@@ -809,14 +812,21 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
+    /**
+     * @return iterable|Collection
+     */
     public function getScopes(): Collection
     {
         return $this->scopes;
     }
 
+
+
     public function addScope(Scope $scope): self
     {
-        $this->scopes[] = $scope;
+        if (!$this->scopes->contains($scope)) {
+            $this->scopes[] = $scope;
+        }
 
         return $this;
     }
@@ -1040,4 +1050,16 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
             return 'none';
         }
     }
+
+    public function getCenters(): ?iterable
+    {
+        foreach ($this->getPersons() as $person) {
+            if (!in_array($person->getCenter(), $centers ?? [])
+                && NULL !== $person->getCenter()) {
+                $centers[] = $person->getCenter();
+            }
+        }
+
+        return $centers ?? null;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php b/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
index 511416a0e..28235b521 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
@@ -8,6 +8,29 @@ use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
+ * This class links a person to the history of his addresses, through
+ * household membership.
+ *
+ * It is optimized on DB side, and compute the start date and end date
+ * of each address by the belonging of household.
+ *
+ * **note**: the start date and end date are the date of belonging to the address,
+ * not the belonging of the household.
+ *
+ * Example:
+ *
+ * * person A is member of household W from 2021-01-01 to 2021-12-01
+ * * person A is member of household V from 2021-12-01, still present after
+ * * household W lives in address Q from 2020-06-01 to 2021-06-01
+ * * household W lives in address R from 2021-06-01 to 2022-06-01
+ * * household V lives in address T from 2021-12-01 to still living there after
+ *
+ * The person A will have those 3 entities:
+ *
+ * 1. 1st entity: from 2021-01-01 to 2021-06-01, household W, address Q;
+ * 2. 2st entity: from 2021-06-01 to 2021-12-01, household W, address R;
+ * 3. 3st entity: from 2021-12-01 to NULL, household V, address T;
+ *
  * @ORM\Entity(readOnly=true)
  * @ORM\Table(name="view_chill_person_household_address")
  */
@@ -45,11 +68,23 @@ class PersonHouseholdAddress
      */
     private $address;
 
+    /**
+     * The start date of the intersection address/household
+     *
+     * (this is not the startdate of the household, not
+     * the startdate of the address)
+     */
     public function getValidFrom(): ?\DateTimeInterface
     {
         return $this->validFrom;
     }
 
+    /**
+     * The end date of the intersection address/household
+     *
+     * (this is not the enddate of the household, not
+     * the enddate of the address)
+     */
     public function getValidTo(): ?\DateTimeImmutable
     {
         return $this->validTo;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 35db2ef83..2b0b5edbd 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -35,6 +35,7 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\PersonBundle\Entity\Person\PersonCurrentAddress;
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\Collection;
@@ -43,6 +44,11 @@ use Doctrine\Common\Collections\Criteria;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
+use Symfony\Component\Validator\Constraints as Assert;
+use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
+use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
+use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter;
+use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential;
 
 /**
  * Person Class
@@ -57,6 +63,12 @@ use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
  * @DiscriminatorMap(typeProperty="type", mapping={
  *   "person"=Person::class
  * })
+ * @PersonHasCenter(
+ *     groups={"general", "creation"}
+ * )
+ * @HouseholdMembershipSequential(
+ *     groups={"household_memberships"}
+ * )
  */
 class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateInterface
 {
@@ -75,6 +87,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var string
      *
      * @ORM\Column(type="string", length=255)
+     * @Assert\NotBlank(
+     *     groups={"general", "creation"}
+     * )
+     * @Assert\Length(
+     *     max=255,
+     *     groups={"general", "creation"}
+     * )
      */
     private $firstName;
 
@@ -83,6 +102,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var string
      *
      * @ORM\Column(type="string", length=255)
+     * @Assert\NotBlank(
+     *     groups={"general", "creation"}
+     * )
+     * @Assert\Length(
+     *     max=255,
+     *     groups={"general", "creation"}
+     * )
      */
     private $lastName;
 
@@ -102,6 +128,12 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var \DateTime
      *
      * @ORM\Column(type="date", nullable=true)
+     * @Assert\Date(
+     *     groups={"general", "creation"}
+     * )
+     * @Birthdate(
+     *     groups={"general", "creation"}
+     * )
      */
     private $birthdate;
 
@@ -110,6 +142,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var \DateTimeImmutable
      *
      * @ORM\Column(type="date_immutable", nullable=true)
+     * @Assert\Date(
+     *     groups={"general", "creation"}
+     * )
      */
     private ?\DateTimeImmutable $deathdate;
 
@@ -150,6 +185,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var string
      *
      * @ORM\Column(type="string", length=9, nullable=true)
+     * @Assert\NotNull(
+     *     groups={"general", "creation"}
+     * )
      */
     private $gender;
 
@@ -179,8 +217,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var \DateTime
      *
      * @ORM\Column(type="date", nullable=true)
+     * @Assert\Date(
+     *     groups={"general", "creation"}
+     * )
      */
-    private $maritalStatusDate;
+    private ?\DateTime $maritalStatusDate;
 
     /**
      * Comment on marital status
@@ -202,6 +243,10 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var string
      *
      * @ORM\Column(type="text", nullable=true)
+     * @Assert\Email(
+     *     checkMX=true,
+     *     groups={"general", "creation"}
+     * )
      */
     private $email = '';
 
@@ -210,6 +255,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var string
      *
      * @ORM\Column(type="text", length=40, nullable=true)
+     * @Assert\Regex(
+     *     pattern="/^([\+{1}])([0-9\s*]{4,20})$/",
+     *     groups={"general", "creation"}
+     * )
+     * @PhonenumberConstraint(
+     *     type="landline",
+     *     groups={"general", "creation"}
+     * )
      */
     private $phonenumber = '';
 
@@ -218,6 +271,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var string
      *
      * @ORM\Column(type="text", length=40, nullable=true)
+     * @Assert\Regex(
+     *     pattern="/^([\+{1}])([0-9\s*]{4,20})$/",
+     *     groups={"general", "creation"}
+     * )
+     * @PhonenumberConstraint(
+     *     type="mobile",
+     *     groups={"general", "creation"}
+     * )
      */
     private $mobilenumber = '';
 
@@ -230,12 +291,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *     cascade={"persist", "remove", "merge", "detach"},
      *     orphanRemoval=true
      * )
+     * @Assert\Valid(
+     *     traverse=true,
+     *     groups={"general", "creation"}
+     * )
      */
     private $otherPhoneNumbers;
 
-    //TO-ADD caseOpeningDate
-    //TO-ADD nativeLanguag
-
     /**
      * The person's spoken languages
      * @var ArrayCollection
@@ -254,7 +316,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var Center
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")
-     * @ORM\JoinColumn(nullable=false)
      */
     private $center;
 
@@ -353,6 +414,18 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private $addresses;
 
     /**
+     * The current person address.
+     *
+     * This is computed through database and is optimized on database side.
+     *
+     * @var PersonCurrentAddress|null
+     * @ORM\OneToOne(targetEntity=PersonCurrentAddress::class, mappedBy="person")
+     */
+    private ?PersonCurrentAddress $currentPersonAddress = null;
+
+    /**
+     * fullname canonical. Read-only field, which is calculated by
+     * the database.
      * @var string
      *
      * @ORM\Column(type="text", nullable=true)
@@ -373,6 +446,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private array $currentHouseholdAt = [];
 
     /**
+     * Read-only field, computed by the database
+     *
      * @ORM\OneToMany(
      *  targetEntity=PersonHouseholdAddress::class,
      *  mappedBy="person"
@@ -390,8 +465,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
 
     /**
      * Person constructor.
-     *
-     * @param \DateTime|null $opening
      */
     public function __construct()
     {
@@ -404,6 +477,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $this->householdAddresses = new ArrayCollection();
         $this->genderComment = new CommentEmbeddable();
         $this->maritalStatusComment = new CommentEmbeddable();
+        $this->periodLocatedOn = new ArrayCollection();
     }
 
     /**
@@ -501,6 +575,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
                 return $participation->getAccompanyingPeriod();
             }
         }
+
+        return null;
     }
 
     /**
@@ -1179,13 +1255,31 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->addresses;
     }
 
+    /**
+     * @deprecated Use `getCurrentPersonAddress` instead
+     * @param DateTime|null $from
+     * @return false|mixed|null
+     * @throws \Exception
+     */
     public function getLastAddress(DateTime $from = null)
     {
-        $from ??= new DateTime('now');
+        return $this->getCurrentPersonAddress($from);
+    }
+
+    /**
+     * get the address associated with the person at the given date
+     *
+     * @param DateTime|null $at
+     * @return Address|null
+     * @throws \Exception
+     */
+    public function getCurrentPersonAddress(?\DateTime $at = null): ?Address
+    {
+        $at ??= new DateTime('now');
 
         /** @var ArrayIterator $addressesIterator */
         $addressesIterator = $this->getAddresses()
-            ->filter(static fn (Address $address): bool => $address->getValidFrom() <= $from)
+            ->filter(static fn (Address $address): bool => $address->getValidFrom() <= $at)
             ->getIterator();
 
         $addressesIterator->uasort(
@@ -1201,6 +1295,10 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * Validation callback that checks if the accompanying periods are valid
      *
      * This method add violation errors.
+     *
+     * @Assert\Callback(
+     *      groups={"accompanying_period_consistent"}
+     * )
      */
     public function isAccompanyingPeriodValid(ExecutionContextInterface $context)
     {
@@ -1246,6 +1344,10 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * two addresses with the same validFrom date)
      *
      * This method add violation errors.
+     *
+     * @Assert\Callback(
+     *     groups={"addresses_consistent"}
+     * )
      */
     public function isAddressesValid(ExecutionContextInterface $context)
     {
@@ -1425,7 +1527,16 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
 
     public function getCurrentHouseholdAddress(?\DateTimeImmutable $at = null): ?Address
     {
-        $at = $at === null ? new \DateTimeImmutable('today') : $at;
+        if (
+            NULL === $at
+            ||
+            $at->format('Ymd') === (new \DateTime('today'))->format('Ymd')
+        ) {
+            return $this->currentPersonAddress instanceof PersonCurrentAddress
+                ? $this->currentPersonAddress->getAddress() : NULL;
+        }
+
+        // if not now, compute the date from history
         $criteria = new Criteria();
         $expr = Criteria::expr();
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
new file mode 100644
index 000000000..e982f8b97
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Chill\PersonBundle\Entity\Person;
+
+use Chill\MainBundle\Entity\Address;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Entity which associate person with his current address, through
+ * household participation.
+ *
+ * The computation is optimized on database side.
+ *
+ * The validFrom and validTo properties are the intersection of
+ * household membership and address validity. See @link{PersonHouseholdAddress}
+ *
+ * @ORM\Entity(readOnly=true)
+ * @ORM\Table("view_chill_person_current_address")
+ */
+class PersonCurrentAddress
+{
+    /**
+     * @ORM\Id
+     * @ORM\OneToOne(targetEntity=Person::class, inversedBy="currentPersonAddress")
+     * @ORM\JoinColumn(name="person_id", referencedColumnName="id")
+     */
+    protected Person $person;
+
+    /**
+     * @ORM\OneToOne(targetEntity=Address::class)
+     */
+    protected Address $address;
+
+    /**
+     * @ORM\Column(name="valid_from", type="date_immutable")
+     */
+    protected \DateTimeImmutable $validFrom;
+
+    /**
+     * @ORM\Column(name="valid_to", type="date_immutable")
+     */
+    protected ?\DateTimeImmutable $validTo;
+
+    /**
+     * @return Person
+     */
+    public function getPerson(): Person
+    {
+        return $this->person;
+    }
+
+    /**
+     * @return Address
+     */
+    public function getAddress(): Address
+    {
+        return $this->address;
+    }
+
+    /**
+     * This date is the intersection of household membership
+     * and address validity
+     *
+     * @return \DateTimeImmutable
+     */
+    public function getValidFrom(): \DateTimeImmutable
+    {
+        return $this->validFrom;
+    }
+
+    /**
+     * This date is the intersection of household membership
+     * and address validity
+     *
+     * @return \DateTimeImmutable|null
+     */
+    public function getValidTo(): ?\DateTimeImmutable
+    {
+        return $this->validTo;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index 32b7a69f2..36d088c25 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -21,7 +21,9 @@
 
 namespace Chill\PersonBundle\Form;
 
+use Chill\MainBundle\Form\Event\CustomizeFormEvent;
 use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -33,6 +35,7 @@ use Chill\PersonBundle\Form\Type\GenderType;
 use Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Form\Type\PersonAltNameType;
+use Chill\MainBundle\Form\Type\Export\PickCenterType;
 
 final class CreationPersonType extends AbstractType
 {
@@ -40,10 +43,6 @@ final class CreationPersonType extends AbstractType
     // TODO: See if this is still valid and update accordingly.
     const NAME = 'chill_personbundle_person_creation';
 
-    const FORM_NOT_REVIEWED = 'not_reviewed';
-    const FORM_REVIEWED = 'reviewed' ;
-    const FORM_BEING_REVIEWED = 'being_reviewed';
-
     /**
      *
      * @var CenterTransformer
@@ -56,12 +55,16 @@ final class CreationPersonType extends AbstractType
      */
     protected $configPersonAltNamesHelper;
 
+    private EventDispatcherInterface $dispatcher;
+
     public function __construct(
         CenterTransformer $centerTransformer,
-        ConfigPersonAltNamesHelper $configPersonAltNamesHelper
+        ConfigPersonAltNamesHelper $configPersonAltNamesHelper,
+        EventDispatcherInterface $dispatcher
      ) {
         $this->centerTransformer = $centerTransformer;
         $this->configPersonAltNamesHelper = $configPersonAltNamesHelper;
+        $this->dispatcher = $dispatcher;
     }
 
     /**
@@ -79,7 +82,9 @@ final class CreationPersonType extends AbstractType
             ->add('gender', GenderType::class, array(
                 'required' => true, 'placeholder' => null
             ))
-            ->add('center', CenterType::class)
+            ->add('center', CenterType::class, [
+                'required' => false
+            ])
         ;
 
         if ($this->configPersonAltNamesHelper->hasAltNames()) {
@@ -87,6 +92,11 @@ final class CreationPersonType extends AbstractType
                     'by_reference' => false
             ]);
         }
+
+        $this->dispatcher->dispatch(
+            new CustomizeFormEvent(static::class, $builder),
+            CustomizeFormEvent::NAME
+        );
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php b/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
index 0cff8ee51..34fd9897e 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
@@ -20,6 +20,9 @@
 
 namespace Chill\PersonBundle\Form\Type;
 
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\MaritalStatus;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Chill\MainBundle\Form\Type\DataTransformer\ObjectToIdTransformer;
@@ -35,15 +38,13 @@ use Chill\MainBundle\Form\Type\Select2ChoiceType;
  */
 class Select2MaritalStatusType extends AbstractType
 {
-    /** @var RequestStack */
-    private $requestStack;
+    private EntityManagerInterface $em;
 
-    /** @var ObjectManager */
-    private $em;
+    private TranslatableStringHelper $translatableStringHelper;
 
-    public function __construct(RequestStack $requestStack,ObjectManager $em)
+    public function __construct(TranslatableStringHelper $translatableStringHelper, EntityManagerInterface $em)
     {
-        $this->requestStack = $requestStack;
+        $this->translatableStringHelper = $translatableStringHelper;
         $this->em = $em;
     }
 
@@ -63,18 +64,17 @@ class Select2MaritalStatusType extends AbstractType
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $locale = $this->requestStack->getCurrentRequest()->getLocale();
         $maritalStatuses = $this->em->getRepository('Chill\PersonBundle\Entity\MaritalStatus')->findAll();
         $choices = array();
 
         foreach ($maritalStatuses as $ms) {
-            $choices[$ms->getId()] = $ms->getName()[$locale];
+            $choices[$ms->getId()] = $this->translatableStringHelper->localize($ms->getName());
         }
 
         asort($choices, SORT_STRING | SORT_FLAG_CASE);
 
         $resolver->setDefaults(array(
-           'class' => 'Chill\PersonBundle\Entity\MaritalStatus',
+           'class' => MaritalStatus::class,
            'choices' => array_combine(array_values($choices),array_keys($choices))
         ));
     }
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index fdb8feb3e..0c83d8a6a 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -18,14 +18,17 @@
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Knp\Menu\MenuItem;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Add menu entrie to person menu.
- * 
+ *
  * Menu entries added :
- * 
+ *
  * - person details ;
  * - accompanying period (if `visible`)
  *
@@ -37,21 +40,25 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
      * @var string 'visible' or 'hidden'
      */
     protected $showAccompanyingPeriod;
-    
+
     /**
      *
      * @var TranslatorInterface
      */
     protected $translator;
-    
+
+    private Security $security;
+
     public function __construct(
-        $showAccompanyingPeriod,
+        ParameterBagInterface $parameterBag,
+        Security $security,
         TranslatorInterface $translator
     ) {
-        $this->showAccompanyingPeriod = $showAccompanyingPeriod;
+        $this->showAccompanyingPeriod = $parameterBag->get('chill_person.accompanying_period');
+        $this->security = $security;
         $this->translator = $translator;
     }
-    
+
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         $menu->addChild($this->translator->trans('Person details'), [
@@ -83,8 +90,10 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
           ->setExtras([
             'order' => 99999
           ]);
-        
-        if ($this->showAccompanyingPeriod === 'visible') {
+
+        if ($this->showAccompanyingPeriod === 'visible'
+            && $this->security->isGranted(AccompanyingPeriodVoter::SEE, $parameters['person'])
+        ) {
             $menu->addChild($this->translator->trans('Accompanying period list'), [
                     'route' => 'chill_person_accompanying_period_list',
                     'routeParameters' => [
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
new file mode 100644
index 000000000..c8cca82f5
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Chill\PersonBundle\Repository;
+
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\Security\Core\Security;
+
+final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodACLAwareRepositoryInterface
+{
+    private AccompanyingPeriodRepository $accompanyingPeriodRepository;
+    private Security $security;
+    private AuthorizationHelper $authorizationHelper;
+    private CenterResolverDispatcher $centerResolverDispatcher;
+
+    public function __construct(AccompanyingPeriodRepository $accompanyingPeriodRepository, Security $security, AuthorizationHelper $authorizationHelper, CenterResolverDispatcher $centerResolverDispatcher)
+    {
+        $this->accompanyingPeriodRepository = $accompanyingPeriodRepository;
+        $this->security = $security;
+        $this->authorizationHelper = $authorizationHelper;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+    }
+
+    public function findByPerson(
+        Person $person,
+        string $role,
+        ?array $orderBy = [],
+        int $limit = null,
+        int $offset = null
+    ): array {
+        $qb = $this->accompanyingPeriodRepository->createQueryBuilder('ap');
+        $scopes = $this->authorizationHelper
+            ->getReachableCircles($this->security->getUser(), $role,
+                $this->centerResolverDispatcher->resolveCenter($person));
+
+        if (0 === count($scopes)) {
+            return [];
+        }
+
+        $qb
+            ->join('ap.participations', 'participation')
+            ->where($qb->expr()->eq('participation.person', ':person'))
+            ->andWhere(
+                $qb->expr()->orX(
+                    'ap.confidential = FALSE',
+                    $qb->expr()->eq('ap.user', ':user')
+                )
+            )
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->neq('ap.step', ':draft'),
+                    $qb->expr()->eq('ap.createdBy', ':creator')
+                )
+            )
+            ->setParameter('draft', AccompanyingPeriod::STEP_DRAFT)
+            ->setParameter('person', $person)
+            ->setParameter('user', $this->security->getUser())
+            ->setParameter('creator', $this->security->getUser())
+        ;
+        // add join condition for scopes
+        $orx = $qb->expr()->orX(
+            $qb->expr()->eq('ap.step', ':draft')
+        );
+
+        foreach ($scopes as $key => $scope) {
+            $orx->add($qb->expr()->isMemberOf(':scope_'.$key, 'ap.scopes'));
+            $qb->setParameter('scope_'.$key, $scope);
+        }
+        $qb->andWhere($orx);
+
+        return $qb->getQuery()->getResult();
+    }
+
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
new file mode 100644
index 000000000..a5798d3e8
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Chill\PersonBundle\Repository;
+
+use Chill\PersonBundle\Entity\Person;
+
+interface AccompanyingPeriodACLAwareRepositoryInterface
+{
+    public function findByPerson(
+        Person $person,
+        string $role,
+        ?array $orderBy = [],
+        int $limit = null,
+        int $offset = null
+    ): array;
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
index f9d1b060f..c9e8397a8 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
@@ -59,6 +59,11 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         return $this->findOneBy($criteria);
     }
 
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
+
     public function getClassName()
     {
         return AccompanyingPeriod::class;
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
new file mode 100644
index 000000000..d15e8cd7a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -0,0 +1,292 @@
+<?php
+
+namespace Chill\PersonBundle\Repository;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Repository\CountryRepository;
+use Chill\MainBundle\Search\ParsingException;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Security\Core\Security;
+
+
+final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterface
+{
+    private Security $security;
+
+    private EntityManagerInterface $em;
+
+    private CountryRepository $countryRepository;
+
+    private AuthorizationHelper $authorizationHelper;
+
+    public function __construct(
+        Security $security,
+        EntityManagerInterface $em,
+        CountryRepository $countryRepository,
+        AuthorizationHelper $authorizationHelper
+    ) {
+        $this->security = $security;
+        $this->em = $em;
+        $this->countryRepository = $countryRepository;
+        $this->authorizationHelper = $authorizationHelper;
+    }
+
+    /**
+     * @return array|Person[]
+     * @throws NonUniqueResultException
+     * @throws ParsingException
+     */
+    public function findBySearchCriteria(
+        int $start,
+        int $limit,
+        bool $simplify = false,
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        ?\DateTime $birthdate = null,
+        ?\DateTime $birthdateBefore = null,
+        ?\DateTime $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null
+    ): array {
+        $qb = $this->createSearchQuery($default, $firstname, $lastname,
+            $birthdate, $birthdateBefore, $birthdateAfter, $gender,
+            $countryCode);
+        $this->addACLClauses($qb, 'p');
+
+        return $this->getQueryResult($qb, 'p', $simplify, $limit, $start);
+    }
+
+    /**
+     * Helper method to prepare and return the search query for PersonACL.
+     *
+     * This method replace the select clause with required parameters, depending on the
+     * "simplify" parameter. It also add query limits.
+     *
+     * The given alias must represent the person alias.
+     *
+     * @return array|Person[]
+     */
+    public function getQueryResult(QueryBuilder $qb, string $alias, bool $simplify, int $limit, int $start): array
+    {
+        if ($simplify) {
+            $qb->select(
+                $alias.'.id',
+                $qb->expr()->concat(
+                    $alias.'.firstName',
+                    $qb->expr()->literal(' '),
+                    $alias.'.lastName'
+                ).'AS text'
+            );
+        } else {
+            $qb->select($alias);
+        }
+
+        $qb
+            ->setMaxResults($limit)
+            ->setFirstResult($start);
+
+        //order by firstname, lastname
+        $qb
+            ->orderBy($alias.'.firstName')
+            ->addOrderBy($alias.'.lastName');
+
+        if ($simplify) {
+            return $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
+        } else {
+            return $qb->getQuery()->getResult();
+        }
+    }
+
+    public function countBySearchCriteria(
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        ?\DateTime $birthdate = null,
+        ?\DateTime $birthdateBefore = null,
+        ?\DateTime $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null
+    ): int {
+        $qb = $this->createSearchQuery($default, $firstname, $lastname,
+            $birthdate, $birthdateBefore, $birthdateAfter, $gender,
+            $countryCode);
+        $this->addACLClauses($qb, 'p');
+
+        return $this->getCountQueryResult($qb,'p');
+    }
+
+    /**
+     * Helper method to prepare and return the count for search query
+     *
+     * This method replace the select clause with required parameters, depending on the
+     * "simplify" parameter.
+     *
+     * The given alias must represent the person alias in the query builder.
+     */
+    public function getCountQueryResult(QueryBuilder $qb, $alias): int
+    {
+        $qb->select('COUNT('.$alias.'.id)');
+
+        return $qb->getQuery()->getSingleScalarResult();
+    }
+
+    public function findBySimilaritySearch(string $pattern, int $firstResult,
+        int $maxResult, bool $simplify = false)
+    {
+        $qb = $this->createSimilarityQuery($pattern);
+        $this->addACLClauses($qb, 'sp');
+
+        return $this->getQueryResult($qb, 'sp', $simplify, $maxResult, $firstResult);
+    }
+
+    public function countBySimilaritySearch(string $pattern)
+    {
+        $qb = $this->createSimilarityQuery($pattern);
+        $this->addACLClauses($qb, 'sp');
+
+        return $this->getCountQueryResult($qb, 'sp');
+    }
+
+    /**
+     * Create a search query without ACL
+     *
+     * The person alias is a "p"
+     *
+     * @param string|null $default
+     * @param string|null $firstname
+     * @param string|null $lastname
+     * @param \DateTime|null $birthdate
+     * @param \DateTime|null $birthdateBefore
+     * @param \DateTime|null $birthdateAfter
+     * @param string|null $gender
+     * @param string|null $countryCode
+     * @return QueryBuilder
+     * @throws NonUniqueResultException
+     * @throws ParsingException
+     */
+    public function createSearchQuery(
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        ?\DateTime $birthdate = null,
+        ?\DateTime $birthdateBefore = null,
+        ?\DateTime $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null
+    ): QueryBuilder {
+
+        if (!$this->security->getUser() instanceof User) {
+            throw new \RuntimeException("Search must be performed by a valid user");
+        }
+        $qb = $this->em->createQueryBuilder();
+        $qb->from(Person::class, 'p');
+
+        if (NULL !== $firstname) {
+            $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(p.firstName))', ':firstname'))
+                ->setParameter('firstname', '%'.$firstname.'%');
+        }
+
+        if (NULL !== $lastname) {
+            $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(p.lastName))', ':lastname'))
+                ->setParameter('lastname', '%'.$lastname.'%');
+        }
+
+        if (NULL !== $birthdate) {
+            $qb->andWhere($qb->expr()->eq('s.birthdate', ':birthdate'))
+                ->setParameter('birthdate', $birthdate);
+        }
+
+        if (NULL !== $birthdateAfter) {
+            $qb->andWhere($qb->expr()->gt('p.birthdate', ':birthdateafter'))
+                ->setParameter('birthdateafter', $birthdateAfter);
+        }
+
+        if (NULL !== $birthdateBefore) {
+            $qb->andWhere($qb->expr()->lt('p.birthdate', ':birthdatebefore'))
+                ->setParameter('birthdatebefore', $birthdateBefore);
+        }
+
+        if (NULL !== $gender) {
+            $qb->andWhere($qb->expr()->eq('p.gender', ':gender'))
+                ->setParameter('gender', $gender);
+        }
+
+        if (NULL !== $countryCode) {
+            try {
+                $country = $this->countryRepository->findOneBy(['countryCode' => $countryCode]);
+            } catch (NoResultException $ex)  {
+                throw new ParsingException('The country code "'.$countryCode.'" '
+                    . ', used in nationality, is unknow', 0, $ex);
+            } catch (NonUniqueResultException $e) {
+                throw $e;
+            }
+
+            $qb->andWhere($qb->expr()->eq('p.nationality', ':nationality'))
+                ->setParameter('nationality', $country);
+        }
+
+        if (NULL !== $default) {
+            $grams = explode(' ', $default);
+
+            foreach($grams as $key => $gram) {
+                $qb->andWhere($qb->expr()
+                    ->like('p.fullnameCanonical', 'UNACCENT(LOWER(:default_'.$key.'))'))
+                    ->setParameter('default_'.$key, '%'.$gram.'%');
+            }
+        }
+
+        return $qb;
+    }
+
+    private function addACLClauses(QueryBuilder $qb, string $personAlias): void
+    {
+        // restrict center for security
+        $reachableCenters = $this->authorizationHelper
+            ->getReachableCenters($this->security->getUser(), 'CHILL_PERSON_SEE');
+        $qb->andWhere(
+            $qb->expr()->orX(
+                $qb->expr()
+                    ->in($personAlias.'.center', ':centers'),
+                $qb->expr()
+                    ->isNull($personAlias.'.center')
+            )
+        );
+        $qb->setParameter('centers', $reachableCenters);
+    }
+
+    /**
+     * Create a query for searching by similarity.
+     *
+     * The person alias is "sp".
+     *
+     * @param $pattern
+     * @return QueryBuilder
+     */
+    public function createSimilarityQuery($pattern): QueryBuilder
+    {
+        $qb = $this->em->createQueryBuilder();
+
+        $qb->from(Person::class, 'sp');
+
+        $grams = explode(' ', $pattern);
+
+        foreach($grams as $key => $gram) {
+            $qb->andWhere('STRICT_WORD_SIMILARITY_OPS(:default_'.$key.', sp.fullnameCanonical) = TRUE')
+                ->setParameter('default_'.$key, '%'.$gram.'%');
+
+            // remove the perfect matches
+            $qb->andWhere($qb->expr()
+                ->notLike('sp.fullnameCanonical', 'UNACCENT(LOWER(:not_default_'.$key.'))'))
+                ->setParameter('not_default_'.$key, '%'.$gram.'%');
+        }
+
+        return $qb;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
new file mode 100644
index 000000000..8e83da03d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Chill\PersonBundle\Repository;
+
+use Chill\MainBundle\Search\ParsingException;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\NonUniqueResultException;
+
+interface PersonACLAwareRepositoryInterface
+{
+
+    /**
+     * @return array|Person[]
+     * @throws NonUniqueResultException
+     * @throws ParsingException
+     */
+    public function findBySearchCriteria(
+        int $start,
+        int $limit,
+        bool $simplify = false,
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        ?\DateTime $birthdate = null,
+        ?\DateTime $birthdateBefore = null,
+        ?\DateTime $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null
+    ): array;
+
+    public function countBySearchCriteria(
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        ?\DateTime $birthdate = null,
+        ?\DateTime $birthdateBefore = null,
+        ?\DateTime $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null
+    );
+
+    public function findBySimilaritySearch(
+        string $pattern,
+        int $firstResult,
+        int $maxResult,
+        bool $simplify = false
+    );
+
+    public function countBySimilaritySearch(string $pattern);
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
index 6686b55b7..0235ccc13 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
@@ -23,9 +23,11 @@ use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ObjectRepository;
+use UnexpectedValueException;
 
 
-final class PersonRepository
+final class PersonRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
@@ -44,6 +46,26 @@ final class PersonRepository
         return $this->repository->findBy(['id' => $ids]);
     }
 
+    public function findAll()
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria)
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    public function getClassName()
+    {
+        return Person::class;
+    }
+
     /**
      * @param $centers
      * @param $firstResult
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
index e621feead..797f246fe 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
@@ -10,6 +10,7 @@
    <origin-demand></origin-demand>
    <requestor></requestor>
    <social-issue></social-issue>
+   <scopes></scopes>
    <referrer></referrer>
    <resources></resources>
    <comment v-if="accompanyingCourse.step === 'DRAFT'"></comment>
@@ -32,6 +33,7 @@ import PersonsAssociated from './components/PersonsAssociated.vue';
 import Requestor from './components/Requestor.vue';
 import SocialIssue from './components/SocialIssue.vue';
 import CourseLocation from './components/CourseLocation.vue';
+import Scopes from './components/Scopes.vue';
 import Referrer from './components/Referrer.vue';
 import Resources from './components/Resources.vue';
 import Comment from './components/Comment.vue';
@@ -47,6 +49,7 @@ export default {
       Requestor,
       SocialIssue,
       CourseLocation,
+      Scopes,
       Referrer,
       Resources,
       Comment,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js
index 52e253ac1..ee4c3e11b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js
@@ -191,7 +191,49 @@ const getListOrigins = () => {
          if (response.ok) { return response.json(); }
          throw { msg: 'Error while retriving origin\'s list.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
       });
-}
+};
+
+const addScope = (id, scope) => {
+  const url = `/api/1.0/person/accompanying-course/${id}/scope.json`;
+  console.log(url);
+  console.log(scope);
+
+  return fetch(url, {
+    method: 'POST',
+    body: JSON.stringify({
+      id: scope.id,
+      type: scope.type,
+    }),
+    headers: {
+      'Content-Type': 'application/json;charset=utf-8'
+    },
+  })
+    .then(response => {
+      if (response.ok) { return response.json(); }
+      throw { msg: 'Error while adding scope', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
+    });
+};
+
+const removeScope = (id, scope) => {
+  const url = `/api/1.0/person/accompanying-course/${id}/scope.json`;
+  console.log(url);
+  console.log(scope);
+
+  return fetch(url, {
+    method: 'DELETE',
+    body: JSON.stringify({
+      id: scope.id,
+      type: scope.type,
+    }),
+    headers: {
+      'Content-Type': 'application/json;charset=utf-8'
+    },
+  })
+    .then(response => {
+      if (response.ok) { return response.json(); }
+      throw { msg: 'Error while adding scope', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
+    });
+};
 
 export {
    getAccompanyingCourse,
@@ -204,5 +246,7 @@ export {
    getUsers,
    whoami,
    getListOrigins,
-   postSocialIssue
+   postSocialIssue,
+   addScope,
+   removeScope,
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
index f4f2f1c78..b9e52f300 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
@@ -54,8 +54,8 @@ export default {
       assignAddress() {
         //console.log('assignAddress id', this.person.current_household_address);
          let payload = {
-            entity: this.context.entity.type,
-            entityId: this.context.entity.id,
+            target: this.context.target.name,
+            targetId: this.context.target.id,
             locationStatusTo: 'person',
             personId: this.person.id
          };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
index 44479831c..b7834039d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
@@ -88,6 +88,10 @@ export default {
             socialIssue: {
                msg: 'confirm.socialIssue_not_valid',
                anchor: '#section-50'
+            },
+            scopes: {
+              msg: 'confirm.set_a_scope',
+              anchor: '#section-65'
             }
          }
       }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 8538db3bc..83bc1126f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -4,7 +4,6 @@
          {{ $t('courselocation.title') }}
       </h2>
 
-      <!-- {# include vue_address component #} -->
       <div v-for="error in displayErrors" class="alert alert-danger my-2">
          {{ error }}
       </div>
@@ -41,8 +40,7 @@
                   :context="context"
                   :key="addAddress.type"
                   :options="addAddress.options"
-                  :result="addAddress.result"
-                  @submitAddress="submitTemporaryAddress"
+                  :addressChangedCallback="submitTemporaryAddress"
                   ref="addAddress">
                </add-address>
             </li>
@@ -89,10 +87,12 @@ export default {
                   edit: 'courselocation.edit_temporary_address'
                },
                /// Display each step in page or Modal
-               bindModal: {
-                  //step1: false, step2: false
-               },
-               hideDateFrom: true
+               openPanesInModal: true,
+               // Use Date fields
+               //useDate: {
+               //   validFrom: true
+               //},
+               hideAddress: true
             }
          }
       }
@@ -118,8 +118,8 @@ export default {
    methods: {
       initAddressContext() {
          let context = {
-            entity: {
-               type: this.accompanyingCourse.type,
+            target: {
+               name: this.accompanyingCourse.type,
                id: this.accompanyingCourse.id
             },
             edit: false,
@@ -132,31 +132,30 @@ export default {
          this.$store.commit('setAddressContext', context);
       },
       removeAddress() {
-        //console.log('remove address');
          let payload = {
-            entity: this.context.entity.type,
-            entityId: this.context.entity.id,
+            target: this.context.target.name,
+            targetId: this.context.target.id,
             locationStatusTo: 'none'
          };
+         //console.log('remove address');
          this.$store.dispatch('updateLocation', payload);
       },
       displayErrors() {
          return this.$refs.addAddress.errorMsg;
       },
-      submitTemporaryAddress() {
-        //console.log('@@@ click on Submit Temporary Address Button');
-         let payload = this.$refs.addAddress.submitNewAddress();
+      submitTemporaryAddress(payload) {
+         //console.log('@@@ click on Submit Temporary Address Button', payload);
          payload['locationStatusTo'] = 'address'; // <== temporary, not none, not person
          this.$store.dispatch('updateLocation', payload);
-         this.$store.commit('setEditContextTrue');
+         this.$store.commit('setEditContextTrue', payload);
       }
    },
-   mounted() {
+   created() {
       this.initAddressContext();
 
-     //console.log('ac.locationStatus', this.accompanyingCourse.locationStatus);
-     //console.log('ac.location (temporary location)', this.accompanyingCourse.location);
-     //console.log('ac.personLocation', this.accompanyingCourse.personLocation);
+      console.log('ac.locationStatus', this.accompanyingCourse.locationStatus);
+      console.log('ac.location (temporary location)', this.accompanyingCourse.location);
+      console.log('ac.personLocation', this.accompanyingCourse.personLocation);
    }
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index 71e0ccd6b..7f01c87e9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -7,7 +7,7 @@
                addLink: false,
                addHouseholdLink: true,
                addAltNames: true,
-               addAge : false,
+               addAge : true,
                hLevel : 3,
             }"
       :person="participation.person"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 1933bfa42..5770e566e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -16,7 +16,7 @@
             addLink: false,
             addId: false,
             addEntity: true,
-            addInfo: true,
+            addInfo: false,
             hLevel: 3,
             isMultiline: true
             }"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index 943666ef4..fe66366f0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -17,7 +17,7 @@
    <third-party-render-box
       v-if="resource.resource.type === 'thirdparty'"
       :thirdparty="resource.resource"
-      :options="{ addLink : false, addId : false, addEntity: true, addInfo: true, hLevel: 3 }"
+      :options="{ addLink : false, addId : false, addEntity: true, addInfo: false, hLevel: 3 }"
       >
       <template v-slot:record-actions>
          <ul class="record_actions">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
new file mode 100644
index 000000000..ca1b36770
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
@@ -0,0 +1,47 @@
+<template>
+  <div class="vue-component">
+    <h2><a name="section-65"></a>{{ $t('scopes.title') }}</h2>
+
+    <ul>
+      <li v-for="s in scopes">
+        <input type="checkbox" v-model="checkedScopes" :value="s" />
+        {{ s.name.fr }}
+      </li>
+    </ul>
+
+    <div v-if="!isScopeValid" class="alert alert-warning separator">
+      {{ $t('scopes.add_at_least_one') }}
+
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { mapState, mapGetters } from 'vuex';
+
+export default {
+  name: "Scopes",
+  computed: {
+    ...mapState([
+        'scopes',
+        'scopesAtStart'
+    ]),
+    ...mapGetters([
+        'isScopeValid'
+    ]),
+    checkedScopes: {
+      get: function() {
+        return this.$store.state.accompanyingCourse.scopes;
+      },
+      set: function(v) {
+        this.$store.dispatch('setScopes', v);
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index d7c01a174..cf3a0fb7e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -86,6 +86,10 @@ const appMessages = {
          person_locator: "Parcours localisé auprès de {0}",
          no_address: "Il n'y a pas d'adresse associée au parcours"
       },
+      scopes: {
+         title: "Services",
+         add_at_least_one: "Indiquez au moins un service",
+      },
       referrer: {
          title: "Référent du parcours",
          label: "Vous pouvez choisir un TMS ou vous assigner directement comme référent",
@@ -113,6 +117,7 @@ const appMessages = {
          participation_not_valid: "sélectionnez au minimum 1 usager",
          socialIssue_not_valid: "sélectionnez au minimum une problématique sociale",
          location_not_valid: "indiquez au minimum une localisation temporaire du parcours",
+         set_a_scope: "indiquez au moins un service",
          sure: "Êtes-vous sûr ?",
          sure_description: "Une fois le changement confirmé, il ne sera plus possible de le remettre à l'état de brouillon !",
          ok: "Confirmer le parcours"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 34a6786fc..5784e8d4c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -1,28 +1,41 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
+import { fetchScopes } from 'ChillMainAssets/lib/api/scope.js';
 import { getAccompanyingCourse,
    patchAccompanyingCourse,
    confirmAccompanyingCourse,
    postParticipation,
    postRequestor,
    postResource,
-   postSocialIssue } from '../api';
+   postSocialIssue,
+   addScope,
+   removeScope,
+} from '../api';
 
 
 const debug = process.env.NODE_ENV !== 'production';
 const id = window.accompanyingCourseId;
 
-let initPromise = getAccompanyingCourse(id)
-   .then(accompanying_course => new Promise((resolve, reject) => {
+let scopesPromise = fetchScopes();
+let accompanyingCoursePromise = getAccompanyingCourse(id);
+
+let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
+  .then(([scopes, accompanyingCourse]) => new Promise((resolve, reject) => {
 
       const store = createStore({
          strict: debug,
          modules: {
          },
          state: {
-            accompanyingCourse: accompanying_course,
+            accompanyingCourse: accompanyingCourse,
             addressContext: {},
-            errorMsg: []
+            errorMsg: [],
+            // all the available scopes
+            scopes: scopes,
+            // the scopes at start. If the user remove all scopes, we re-add those scopes, by security
+            scopesAtStart: accompanyingCourse.scopes.map(scope => scope),
+            // the scope states at server side
+            scopesAtBackend: accompanyingCourse.scopes.map(scope => scope),
          },
          getters: {
             isParticipationValid(state) {
@@ -34,11 +47,16 @@ let initPromise = getAccompanyingCourse(id)
             isLocationValid(state) {
                return state.accompanyingCourse.location !== null;
             },
+            isScopeValid(state) {
+               console.log('is scope valid', state.accompanyingCourse.scopes.length > 0);
+               return state.accompanyingCourse.scopes.length > 0;
+            },
             validationKeys(state, getters) {
                let keys = [];
                if (!getters.isParticipationValid) { keys.push('participation'); }
                if (!getters.isLocationValid) { keys.push('location'); }
                if (!getters.isSocialIssueValid) { keys.push('socialIssue'); }
+               if (!getters.isScopeValid) { keys.push('scopes'); }
                //console.log('getter keys', keys);
                return keys;
             },
@@ -129,14 +147,34 @@ let initPromise = getAccompanyingCourse(id)
                state.addressContext = context;
             },
             updateLocation(state, r) {
-              //console.log('### mutation: set location attributes', r);
-               state.accompanyingCourse.location = r.location;
+               //console.log('### mutation: set location attributes', r);
                state.accompanyingCourse.locationStatus = r.locationStatus;
+               if (r.locationStatus !== 'person') {
+                  state.addressContext.addressId = r.location.address_id;
+                  //console.log('mutation: update context addressId', state.addressContext.addressId);
+               }
+               state.accompanyingCourse.location = r.location;
                state.accompanyingCourse.personLocation = r.personLocation;
             },
-            setEditContextTrue(state) {
-              //console.log('### mutation: set edit context = true');
+            setEditContextTrue(state, payload) {
+               //console.log('### mutation: set edit context true with addressId', payload.addressId);
                state.addressContext.edit = true;
+               state.addressContext.addressId = payload.addressId;
+            },
+            setScopes(state, scopes) {
+               state.accompanyingCourse.scopes = scopes;
+            },
+            addScopeAtBackend(state, scope) {
+               let scopeIds = state.scopesAtBackend.map(s => s.id);
+               if (!scopeIds.includes(scope.id)) {
+                  state.scopesAtBackend.push(scope);
+               }
+            },
+            removeScopeAtBackend(state, scope){
+               let scopeIds = state.scopesAtBackend.map(s => s.id);
+               if (scopeIds.includes(scope.id)) {
+                  state.scopesAtBackend = state.scopesAtBackend.filter(s => s.id !== scope.id);
+               }
             }
          },
          actions: {
@@ -223,6 +261,107 @@ let initPromise = getAccompanyingCourse(id)
                   resolve();
                })).catch((error) => { commit('catchError', error) });
             },
+            /**
+             * Handle the checked/unchecked scopes
+             *
+             * When the user set the scopes in a invalid situation (when no scopes are cheched), this
+             * method will internally re-add the scopes as they were originally when the page was loaded, but
+             * this does not appears for the user (they remains unchecked). When the user re-add a scope, the
+             * scope is back in a valid state, and the store synchronize with the new state (all the original scopes
+             * are removed if necessary, and the new checked scopes is backed).
+             *
+             * So, for instance:
+             *
+             * at load:
+             *
+             * [x] scope A (at backend: [x])
+             * [x] scope B (at backend: [x])
+             * [ ] scope C (at backend: [ ])
+             *
+             * The user uncheck scope A:
+             *
+             * [ ] scope A (at backend: [ ] as soon as the operation finish)
+             * [x] scope B (at backend: [x])
+             * [ ] scope C (at backend: [ ])
+             *
+             * The user uncheck scope B. The state is invalid (no scope checked), so we go back to initial state when
+             * the page loaded):
+             *
+             * [ ] scope A (at backend: [x] as soon as the operation finish)
+             * [ ] scope B (at backend: [x] as soon as the operation finish)
+             * [ ] scope C (at backend: [ ])
+             *
+             * The user check scope C. The scopes are back to valid state. So we go back to synchronization with UI and
+             * backend):
+             *
+             * [ ] scope A (at backend: [ ] as soon as the operation finish)
+             * [ ] scope B (at backend: [ ] as soon as the operation finish)
+             * [x] scope C (at backend: [x] as soon as the operation finish)
+             *
+             * **Warning** There is a problem if the user check/uncheck faster than the backend is synchronized.
+             *
+             * @param commit
+             * @param state
+             * @param dispatch
+             * @param scopes
+             * @returns Promise
+             */
+            setScopes({ commit, state, dispatch }, scopes) {
+               let currentServerScopesIds = state.scopesAtBackend.map(scope => scope.id);
+               let checkedScopesIds = scopes.map(scope => scope.id);
+               let removedScopesIds = currentServerScopesIds.filter(id => !checkedScopesIds.includes(id));
+               let addedScopesIds = checkedScopesIds.filter(id => !currentServerScopesIds.includes(id));
+               let lengthAfterOperation = currentServerScopesIds.length + addedScopesIds.length
+                 - removedScopesIds.length;
+
+               if (lengthAfterOperation > 0 || (lengthAfterOperation === 0 && state.scopesAtStart.length === 0) ) {
+                  return dispatch('updateScopes', {
+                     addedScopesIds, removedScopesIds
+                  }).then(() => {
+                     // warning: when the operation of dispatch are too slow, the user may check / uncheck before
+                     // the end of the synchronisation with the server (done by dispatch operation). Then, it leads to
+                     // check/uncheck in the UI. I do not know of to avoid it.
+                     commit('setScopes', scopes);
+                     return Promise.resolve();
+                  });
+               } else {
+                  return dispatch('setScopes', state.scopesAtStart).then(() => {
+                     commit('setScopes', scopes);
+                     return Promise.resolve();
+                  });
+               }
+            },
+            /**
+             * Internal function for the store to effectively update scopes.
+             *
+             * Return a promise which resolves when all update operation are
+             * successful and finished.
+             *
+             * @param state
+             * @param commit
+             * @param addedScopesIds
+             * @param removedScopesIds
+             * @return Promise
+             */
+            updateScopes({ state, commit }, { addedScopesIds, removedScopesIds }) {
+               let promises = [];
+               state.scopes.forEach(scope => {
+                  if (addedScopesIds.includes(scope.id)) {
+                     promises.push(addScope(state.accompanyingCourse.id, scope).then(() => {
+                        commit('addScopeAtBackend', scope);
+                        return Promise.resolve();
+                     }));
+                  }
+                  if (removedScopesIds.includes(scope.id)) {
+                     promises.push(removeScope(state.accompanyingCourse.id, scope).then(() => {
+                        commit('removeScopeAtBackend', scope);
+                        return Promise.resolve();
+                     }));
+                  }
+               });
+
+               return Promise.all(promises);
+            },
             postFirstComment({ commit }, payload) {
                //console.log('## action: postFirstComment: payload', payload);
                patchAccompanyingCourse(id, { type: "accompanying_period", initialComment: payload })
@@ -260,8 +399,8 @@ let initPromise = getAccompanyingCourse(id)
                })).catch((error) => { commit('catchError', error) });
             },
             updateLocation({ commit }, payload) {
-              //console.log('## action: updateLocation', payload.locationStatusTo);
-               let body = { 'type': payload.entity, 'id': payload.entityId };
+               //console.log('## action: updateLocation', payload.locationStatusTo);
+               let body = { 'type': payload.target, 'id': payload.targetId };
                let location = {};
                if (payload.locationStatusTo === 'person') { // patch for person address (don't remove addressLocation)
                   location = { 'personLocation': { 'type': 'person', 'id': payload.personId }};
@@ -273,7 +412,7 @@ let initPromise = getAccompanyingCourse(id)
                   location = { 'personLocation': null };
                }
                Object.assign(body, location);
-               patchAccompanyingCourse(payload.entityId, body)
+               patchAccompanyingCourse(payload.targetId, body)
                   .then(accompanyingCourse => new Promise((resolve, reject) => {
                      commit('updateLocation', {
                         location: accompanyingCourse.location,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js
deleted file mode 100644
index d62e9add9..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n'
-
-const appMessages = {
-   fr: {
-      select_a_existing_address: 'Sélectionner une adresse existante',
-      create_a_new_address: 'Créer une nouvelle adresse',
-      add_an_address_to_household: 'Enregistrer',
-      validFrom: 'Date du déménagement',
-      move_date: 'Date du déménagement',
-      back_to_the_list: 'Retour à la liste',
-      household_address_move_success: 'La nouvelle adresse du ménage est enregistrée',
-      household_address_edit_success: 'L\'adresse du ménage a été mise à jour',
-      loading: 'chargement en cours...'
-   }
-};
-
-Object.assign(appMessages.fr, addressMessages.fr);
-
-export {
-   appMessages
-};
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index d1aa166b2..bdbacf2bd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -75,7 +75,7 @@
               :key="addAddress.key"
               :options="addAddress.options"
               :result="addAddress.result"
-              @submitAddress="setHouseholdCreatedAddress"
+              @addressChangedCallback="setHouseholdCreatedAddress"
               ref="addAddress">
           </add-address>
         </li>
@@ -186,8 +186,8 @@ export default {
     return {
       addAddress: {
         context: {
-          entity: {
-            type: 'household_create',
+          target: {
+            name: 'household_create',
             id: 0
           },
           edit: false,
@@ -195,9 +195,8 @@ export default {
         },
         key: 'household_new',
         options: {
-          hideDateFrom: true,
-          bindModal: {
-
+          useDate: {
+             validFrom: true
           },
           button: {
             text:  {
@@ -283,8 +282,7 @@ export default {
       console.log('setHouseholdAddress', a);
       this.$store.commit('setHouseholdAddress', a);
     },
-    setHouseholdCreatedAddress() {
-      let payload = this.$refs.addAddress.submitNewAddress();
+    setHouseholdCreatedAddress(payload) {
       console.log('setHouseholdAddress', payload);
       this.$store.dispatch('setHouseholdNewAddress', payload);
     },
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 249162b87..0f397211e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -27,15 +27,18 @@
 
                 </div>
 
-                <p v-if="this.options.addInfo == true" class="moreinfo">
+                <p v-if="options.addInfo == true" class="moreinfo">
                     <i :class="'fa fa-fw ' + getGenderIcon" title="{{ getGender }}"></i>
-                    <time v-if="person.birthdate" datetime="{{ person.birthdate }}" title="{{ birthdate }}">
-                        {{ $t(getGender) + ' ' + $d(birthdate, 'text') }}
+                    <time v-if="person.birthdate && !person.deathdate" datetime="{{ person.birthdate }}" title="{{ birthdate }}">
+                        {{ $t(getGenderTranslation) + ' ' + $d(birthdate, 'text') }}
                     </time>
-                    <time v-else-if="person.deathdate" datetime="{{ person.deathdate }}" title="{{ person.deathdate }}">
+                    <time v-else-if="person.birthdate && person.deathdate" datetime="{{ person.deathdate }}" title="{{ person.deathdate }}">
                         {{ birthdate }} - {{ deathdate }}
                     </time>
-                    <!-- <span class="age">{{ person.age }}</span> -->
+                    <time v-else-if="person.deathdate" datetime="{{ person.deathdate }}" title="{{ person.deathdate }}">
+                        {{ $t('renderbox.deathdate') + ' ' + deathdate }}
+                    </time>
+                    <span v-if="options.addAge && person.birthdate" class="age">{{ getAge }} {{ $t('renderbox.years_old')}}</span>
                 </p>
             </div>
         </div>
@@ -138,7 +141,7 @@ export default {
     },
     props: ['person', 'options', 'render', 'returnPath'],
     computed: {
-        getGender: function() {
+        getGenderTranslation: function() {
             return this.person.gender == 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man';
         },
         isMultiline: function() {
@@ -152,29 +155,57 @@ export default {
             return this.person.gender == 'woman' ? 'fa-venus' : this.person.gender == 'man' ? 'fa-mars' : 'fa-neuter';
         },
         birthdate: function(){
-            var date = new Date(this.person.birthdate.datetime);
-            return dateToISO(date);
-        },
-        deathdate: function(){
-            if (typeof this.person.deathdate !== 'undefined') {
-               var date = new Date(this.person.deathdate.datetime);
-               return dateToISO(date);
+            if(this.person.birthdate !== null){
+            const date = new Date(this.person.birthdate.datetime);
+            return dateToISO(date)
+            } else {
+                return "";
             }
         },
-        altNameLabel: function(){
+        deathdate: function(){
+           // TODO FIX edition conflict:  if null or undefined ?
+           // if (typeof this.person.deathdate !== 'undefined') {
+           //   var date = new Date(this.person.deathdate.datetime);
+           //   return dateToISO(date);
+           //}
+            if(this.person.deathdate !== null){
+               const date = new Date(this.person.deathdate.datetime);
+               return date.toLocaleDateString("fr-FR");
+            } else {
+                return "";
+            }
+        },
+        altNameLabel: function() {
             for(let i = 0; i < this.person.altNames.length; i++){
                 return this.person.altNames[i].label
             }
         },
-        altNameKey: function(){
+        altNameKey: function() {
             for(let i = 0; i < this.person.altNames.length; i++){
                 return this.person.altNames[i].key
             }
         },
-        getUrl() {
-           return `/fr/person/${this.person.id}/general`;
+        getUrl: function() {
+            return `/fr/person/${this.person.id}/general`;
         },
-        getCurrentHouseholdUrl() {
+        getAge: function() {
+            if(this.person.birthdate && !this.person.deathdate){
+                const birthday = new Date(this.person.birthdate.datetime)
+                const now = new Date()
+                return (now.getFullYear() - birthday.getFullYear())
+            } else if(this.person.birthdate && this.person.deathdate){
+                    const birthday = new Date(this.person.birthdate.datetime)
+                    const deathdate = new Date(this.person.deathdate.datetime)
+                    return (deathdate.getFullYear() - birthday.getFullYear())
+            } else if(!this.person.birthdate && this.person.deathdate.datetime) {
+                // todo: change this
+                    return "Age unknown"
+            } else {
+                // todo: change this
+                    return "Age unknown"
+            }
+        },
+        getCurrentHouseholdUrl: function() {
            let returnPath = this.returnPath ? `?returnPath=${this.returnPath}` : ``;
            return `/fr/person/household/${this.person.current_household_id}/summary${returnPath}`
         }
@@ -201,6 +232,12 @@ div.flex-table {
       }
    }
 }
+
+.age{
+    margin-left: 0.5em;
+    &:before { content: '('; }
+    &:after { content: ')'; }
+}
 </style>
 
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 9fd1fbb64..5261b2c81 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -7,6 +7,7 @@
             addInfo: true,
             addEntity: false,
             addAltNames: true,
+            addAge: true,
             addId: true,
             addLink: false,
             hLevel: 3,
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index f210c4a49..be66abe73 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -34,6 +34,9 @@
         </div>
     {% endif %}
 
+    <pre>WIP .. AccompanyingCourse Resume dashboard</pre>
+
+    {#
     <h1>{{ 'Resume Accompanying Course'|trans }}</h1>
 
     <div class="associated-persons mb-5">
@@ -50,11 +53,13 @@
                 {% endif %}
             {% endfor %}
         </div>
+    #}
         {% if 'DRAFT' != accompanyingCourse.step %}
             {% if withoutHousehold|length > 0 %}
                 {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' with {} %}
             {% endif %}
         {% endif %}
+    {#
     </div>
 
     <div class="location mb-5">
@@ -75,12 +80,11 @@
                 </div>
             </div>
         {% endif %}
-
+    #}
         {% if accompanyingCourse.locationStatus == 'address' or accompanyingCourse.locationStatus == 'none' %}
             {% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' with {} %}
         {% endif %}
-
-
+    {#
     </div>
 
     <div class="requestor mb-5">
@@ -128,6 +132,8 @@
             </div>
         {% endif %}
     </div>
+    #}
+    <div class="mt-5"></div>
 
     <div class="social-actions mb-5">
         <h2 class="mb-3">{{ 'Social actions'|trans }}</h2>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig
deleted file mode 100644
index e235aae15..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ /dev/null
@@ -1,75 +0,0 @@
-{#
-    This Twig template include load vue_address component.
-    It push all variables from context in Address/App.vue.
-
-    OPTIONS
-    * mode          string ['edit*'|'new'|'create']
-    * address_id    integer
-    * backUrl       twig route:   path('route', {parameters})
-    * modalTitle    twig translated chain
-    * buttonText    twig translated chain
-    * buttonSize    bootstrap class like 'btn-sm'
-    * buttonDisplayText     bool
-    * binModalStep1         bool
-    * binModalStep2         bool
-
-#}
-<div id="address"></div>
-
-<script type="text/javascript">
-    window.vueRootComponent = 'app';
-
-    {% if person is defined %}
-        window.entityType = 'person';
-        window.entityId = {{ person.id|e('js') }};
-    {% elseif household is defined %}
-        window.entityType = 'household';
-        window.entityId = {{ household.id|e('js') }};
-    {% endif %}
-
-    {% if 'edit' in app.request.get('_route') %}
-        window.addressId = {{ app.request.get('address_id')|e('js') }};
-        window.mode = 'edit';
-    {% elseif mode is defined and mode == 'edit' %}
-        window.addressId = {{ address_id|e('js') }};
-        window.mode = 'edit';
-    {% endif %}
-
-    {% if backUrl is not defined %}
-        {% if person is defined %}
-            window.backUrl = '{{ path('chill_person_address_list', { 'person_id': person.id })|e('js') }}';
-        {% elseif household is defined %}
-            window.backUrl = '{{ path('chill_person_household_addresses', { 'household_id': household.id })|e('js') }}';
-        {% endif %}
-    {% else %}
-        window.backUrl = '{{ backUrl|e('js') }}';
-    {% endif %}
-
-    {% if modalTitle is defined %}
-        window.modalTitle = '{{ modalTitle|trans|e('js') }}';
-    {% endif %}
-
-
-    {% if buttonText is defined %}
-        window.buttonText = '{{ buttonText|trans|e('js') }}';
-    {% endif %}
-
-    {% if buttonSize is defined %}
-        window.buttonSize = '{{ buttonSize|e('js') }}';
-    {% endif %}
-
-    {% if buttonDisplayText is defined and buttonDisplayText == false %}
-        window.buttonDisplayText = false;
-    {% endif %}
-
-    {% if binModalStep1 is defined and binModalStep1 == false %}
-        window.binModalStep1 = false;
-    {% endif %}
-
-    {% if binModalStep2 is defined and binModalStep2 == false %}
-        window.binModalStep2 = false;
-    {% endif %}
-</script>
-
-{{ encore_entry_script_tags('vue_address') }}
-{{ encore_entry_link_tags('vue_address') }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
index 50bc14171..e2e9167b3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
@@ -27,10 +27,13 @@
         <h1>{{ block('title') }}</h1>
 
         {# include vue_address component #}
-        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-            binModalStep1: false,
-            binModalStep2: false,
+        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+            targetEntity: { name: 'person', id: person.id },
+            openPanesInModal: false,
         } %}
+        {#
+            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
+        #}
 
     {% endblock %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
index db136592f..622a8a348 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
@@ -29,7 +29,9 @@
         <li style="margin: auto;">
 
             {# include vue_address component #}
-            {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+            {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                targetEntity: { name: 'person', id: person.id },
+                backUrl: path('chill_person_address_list', { 'person_id': person.id }),
                 mode: 'new',
                 buttonSize: 'btn-lg',
                 buttonText: 'Add an address',
@@ -64,28 +66,30 @@
             {% if address.validTo is not empty and address.validTo < previousRowFrom %}
                 <div class="{{ 'row' ~ row ~ ' ' }}col-a action">
 
-                    {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                    {# include vue_address component #}
                     {#
-                        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-                            address_id: address.id,
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'person', id: person.id },
+                            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
                             mode: 'edit',
-                            binModalStep1: false,
-                            binModalStep2: false,
+                            addressId: address.id,
+                            openPanesInModal: false,
                         } %}
                     #}
 
                 <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
                 <div class="{{ 'row' ~ row ~ ' ' }}col-c action">
 
-                    {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                    {# include vue_address component #}
                     {#
-                        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-                            address_id: address.id,
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'person', id: person.id },
+                            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
                             mode: 'edit',
-                            binModalStep1: false,
-                            binModalStep2: false,
+                            addressId: address.id,
+                            openPanesInModal: false,
                         } %}
                     #}
 
@@ -109,7 +113,6 @@
                     }) }}
                     <ul class="record_actions">
 
-                        {# include vue_address component #}
                         <li><a href="{{ path('chill_person_address_edit', { 'person_id': person.id, 'address_id' : address.id } ) }}" class="btn btn-edit"></a></li>
 
                     </ul>
@@ -160,7 +163,6 @@
             </a>
         </li>
         <li>
-            {# include vue_address component #}
             <a class="btn btn-create"
                 href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}">
                 {{ 'Add an address'|trans }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index 3abd650f5..c88959340 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -27,10 +27,16 @@
         <h1>{{ block('title') }}</h1>
 
         {# include vue_address component #}
-        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-            binModalStep1: false,
-            binModalStep2: false,
+        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+            targetEntity: { name: 'person', id: person.id },
+            stickyActions: true,
+            useValidFrom: true,
         } %}
+        {#
+            useValidTo: true,
+            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
+            openPanesInModal: false,
+        #}
 
     {% endblock %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index f60b7dc9e..612a5609c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -146,10 +146,10 @@
                     {% endif %}
                 {% endif %}
             </li>
-            {% if options['addCenter'] %}
+            {% if options['addCenter'] and person|chill_resolve_center is not null %}
                 <li>
                     <i class="fa fa-li fa-long-arrow-right"></i>
-                    {{ person.center }}
+                    {{ person|chill_resolve_center.name }}
                 </li>
             {% endif %}
         </ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
index 446cd769b..c909e62d3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -7,9 +7,11 @@
 
     <div>
         {# include vue_address component #}
-        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-            binModalStep1: false,
-            binModalStep2: false,
+        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+            targetEntity: { name: 'household', id: household.id },
+            backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
+            stickyActions: true,
+            openPanesInModal: false,
         } %}
     </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
index b2da2097a..2015a8599 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -7,9 +7,11 @@
 
     <div>
         {# include vue_address component #}
-        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-            binModalStep1: false,
-            binModalStep2: false,
+        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+            targetEntity: { name: 'household', id: household.id },
+            backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
+            openPanesInModal: false,
+            stickyActions: true,
         } %}
     </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
index 2acd68731..646463945 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
@@ -15,13 +15,17 @@
             <li style="margin: auto;">
 
                 {# include vue_address component #}
-                {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+                {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                    targetEntity: { name: 'household', id: household.id },
+                    backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
                     mode: 'new',
-                    backUrl: chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }),
                     buttonSize: 'btn-lg',
                     buttonText: 'Move household',
                     modalTitle: 'Move household',
                 } %}
+                {#
+                    useValidFrom: true,
+                #}
 
             </li>
         </ul>
@@ -41,7 +45,6 @@
                 <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
                 <div class="{{ 'row' ~ row ~ ' ' }}col-c action">
 
-                    {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
 
                 <div class="date">
@@ -63,8 +66,6 @@
                 }) }}
                 <ul class="record_actions">
                     <li>
-
-                        {# include vue_address component #}
                         <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}"
                            class="btn btn-edit"></a>
 
@@ -91,7 +92,6 @@
         </li>
         <li>
 
-            {# include vue_address component #}
             <a class="btn btn-create"
                 href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
                 {{ 'Move household'|trans }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 9b553f0f0..ceb835d2e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -16,37 +16,39 @@
 
     {% set address = household.currentAddress %}
 
-    {% if address is empty %}
-        <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
-    {% else %}
-        <div class="row household-resume">
+    <div class="row household-resume">
+        <div class="item-bloc col-5 col-address">
+            <h2>{{ 'Address'|trans }}</h2>
 
-            <div class="item-bloc col-5 col-address">
+            {% if address is empty %}
+                <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
+            {% else %}
+                {{ address|chill_entity_render_box({'multiline': true, 'extended_infos': true }) }}
+            {% endif %}
 
-                <h2>{{ 'Address'|trans }}</h2>
-
-                {{ address|chill_entity_render_box({'multiline': true}) }}
-
-                <ul class="list-inline text-right mt-2">
-                    <li class="list-inline-item">
-                        {# include vue_address component #}
-                        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-                            mode: 'create',
-                            buttonSize: 'btn-sm',
-                            buttonText: 'Move household',
-                            modalTitle: 'Move household',
-                            buttonDisplayText: false
-                        } %}
-                    </li>
-                    <li class="list-inline-item">
-                        <a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"
-                           href="{{ path('chill_person_household_addresses', { 'household_id': household.id } ) }}">
-                            <i class="fa fa-list fa-fw"></i>
-                        </a>
-                    </li>
-                </ul>
-
-            </div>
+            <ul class="list-inline text-right mt-2">
+                <li class="list-inline-item">
+                    {# include vue_address component #}
+                    {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                        targetEntity: { name: 'household', id: household.id },
+                        backUrl: path('chill_person_household_summary', { 'household_id': household.id }),
+                        hideAddress: true,
+                        mode: 'new',
+                        buttonSize: 'btn-sm',
+                        buttonText: 'Move household',
+                        modalTitle: 'Move household',
+                        buttonDisplayText: false,
+                    } %}
+                </li>
+                <li class="list-inline-item">
+                    <a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"
+                       href="{{ path('chill_person_household_addresses', { 'household_id': household.id } ) }}">
+                        <i class="fa fa-list fa-fw"></i>
+                    </a>
+                </li>
+            </ul>
+        </div>
+        {% if address is not empty %}
             <div class="item-bloc col-7 col-comment">
                 {% if form is null %}
 
@@ -101,10 +103,9 @@
                     {{ form_end(form) }}
 
                 {% endif %}
-
             </div>
-        </div>
-    {% endif %}
+        {% endif %}
+    </div>
 
     <h2 class="my-5">{{ 'household.Household members'|trans }}</h2>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig
index d01a53c22..564f1803e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig
@@ -17,11 +17,11 @@
         {%- endif -%}
     </div>
     <div class="text-md-end">
-        {%- if chill_person.fields.spoken_languages == 'visible' -%}
+        {% if person|chill_resolve_center is not null%}
             <span class="open_sansbold">
                 {{ 'Center'|trans|upper}} :
             </span>
-            {{  person.center.name|upper }}
+            {{  person|chill_resolve_center.name|upper }}
         {%- endif -%}
     </div>
 </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index 7056f25a3..bd1042dd7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -76,10 +76,9 @@
 
     {{ form_row(form.gender, { 'label' : 'Gender'|trans }) }}
 
-    <div style="display: none">
-        {# TODO remove this field (vendee) #}
-        {{ form_row(form.center, { 'label' : 'Center'|trans }) }}
-    </div>
+    {% if form.center is defined %}
+        {{ form_row(form.center) }}
+    {% endif %}
 
     <ul class="record_actions sticky-form-buttons">
         <li class="dropdown">
diff --git a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
index fe938999a..f62b90006 100644
--- a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
+++ b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
@@ -20,71 +20,39 @@
 namespace Chill\PersonBundle\Search;
 
 use Chill\MainBundle\Search\AbstractSearch;
-use Doctrine\ORM\EntityManagerInterface;
+use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Search\SearchInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Chill\MainBundle\Search\ParsingException;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Role\Role;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Search\HasAdvancedSearchFormInterface;
-use Doctrine\ORM\Query;
+use Symfony\Component\Templating\EngineInterface;
 
-class PersonSearch extends AbstractSearch implements ContainerAwareInterface,
-    HasAdvancedSearchFormInterface
+class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterface
 {
-    use ContainerAwareTrait;
-
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    private $em;
-
-    /**
-     *
-     * @var \Chill\MainBundle\Entity\User
-     */
-    private $user;
-
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    private $helper;
-
-    /**
-     *
-     * @var PaginatorFactory
-     */
-    protected $paginatorFactory;
+    protected EngineInterface $templating;
+    protected PaginatorFactory $paginatorFactory;
+    protected PersonACLAwareRepositoryInterface $personACLAwareRepository;
 
     const NAME = "person_regular";
 
+    private const POSSIBLE_KEYS = [
+        '_default', 'firstname', 'lastname', 'birthdate', 'birthdate-before',
+        'birthdate-after', 'gender', 'nationality'
+    ];
 
     public function __construct(
-          EntityManagerInterface $em,
-          TokenStorageInterface $tokenStorage,
-          AuthorizationHelper $helper,
-          PaginatorFactory $paginatorFactory)
-    {
-        $this->em = $em;
-        $this->user = $tokenStorage->getToken()->getUser();
-        $this->helper = $helper;
+        EngineInterface $templating,
+        PaginatorFactory $paginatorFactory,
+        PersonACLAwareRepositoryInterface $personACLAwareRepository
+    ) {
+        $this->templating = $templating;
         $this->paginatorFactory = $paginatorFactory;
-
-        // throw an error if user is not a valid user
-        if (!$this->user instanceof \Chill\MainBundle\Entity\User) {
-            throw new \LogicException('The user provided must be an instance'
-                  . ' of Chill\MainBundle\Entity\User');
-        }
+        $this->personACLAwareRepository = $personACLAwareRepository;
     }
 
     /*
@@ -120,12 +88,14 @@ class PersonSearch extends AbstractSearch implements ContainerAwareInterface,
         $paginator = $this->paginatorFactory->create($total);
 
         if ($format === 'html') {
-            return $this->container->get('templating')->render('@ChillPerson/Person/list_with_period.html.twig',
+            return $this->templating->render('@ChillPerson/Person/list_with_period.html.twig',
                     array(
                         'persons' => $this->search($terms, $start, $limit, $options),
-                        'pattern' => $this->recomposePattern($terms, array('nationality',
-                            'firstname', 'lastname', 'birthdate', 'gender',
-                            'birthdate-before','birthdate-after'), $terms['_domain']),
+                        'pattern' => $this->recomposePattern(
+                            $terms,
+                            \array_filter(self::POSSIBLE_KEYS, fn($item) => $item !== '_default'),
+                            $terms['_domain']
+                        ),
                         'total' => $total,
                         'start' => $start,
                         'search_name' => self::NAME,
@@ -152,153 +122,81 @@ class PersonSearch extends AbstractSearch implements ContainerAwareInterface,
      */
     protected function search(array $terms, $start, $limit, array $options = array())
     {
-        $qb = $this->createQuery($terms, 'search');
-        
-        if ($options['simplify'] ?? false) {
-            $qb->select(
-                    'p.id',
-                    $qb->expr()->concat(
-                        'p.firstName',
-                        $qb->expr()->literal(' '),
-                        'p.lastName'
-                        ).'AS text'
-                );
-        } else {
-            $qb->select('p');
+        [
+            '_default' => $default,
+            'firstname' => $firstname,
+            'lastname' => $lastname,
+            'birthdate' => $birthdate,
+            'birthdate-before' => $birthdateBefore,
+            'birthdate-after' => $birthdateAfter,
+            'gender' => $gender,
+            'nationality' => $countryCode,
+
+        ] = $terms + \array_fill_keys(self::POSSIBLE_KEYS, null);
+
+        foreach (['birthdateBefore', 'birthdateAfter', 'birthdate'] as $v) {
+            if (NULL !== ${$v}) {
+                try {
+                    ${$v} = new \DateTime(${$v});
+                } catch (\Exception $e) {
+                    throw new ParsingException('The date is '
+                          . 'not parsable', 0, $e);
+                }
+            }
         }
 
-        $qb
-            ->setMaxResults($limit)
-            ->setFirstResult($start);
-
-        //order by firstname, lastname
-
-        $qb
-            ->orderBy('p.firstName')
-            ->addOrderBy('p.lastName');
-        
-        if ($options['simplify'] ?? false) {
-            return $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
-        } else {
-            return $qb->getQuery()->getResult();
-        }
+        return $this->personACLAwareRepository
+            ->findBySearchCriteria(
+                $start,
+                $limit,
+                $options['simplify'] ?? false,
+                $default,
+                $firstname,
+                $lastname,
+                $birthdate,
+                $birthdateBefore,
+                $birthdateAfter,
+                $gender,
+                $countryCode,
+            );
     }
 
-    protected function count(array $terms)
+    protected function count(array $terms): int
     {
-        $qb = $this->createQuery($terms);
+        [
+            '_default' => $default,
+            'firstname' => $firstname,
+            'lastname' => $lastname,
+            'birthdate' => $birthdate,
+            'birthdate-before' => $birthdateBefore,
+            'birthdate-after' => $birthdateAfter,
+            'gender' => $gender,
+            'nationality' => $countryCode,
 
-        $qb->select('COUNT(p.id)');
+        ] = $terms + \array_fill_keys(self::POSSIBLE_KEYS, null);
 
-        return $qb->getQuery()->getSingleScalarResult();
-    }
-
-
-    private $_cacheQuery = array();
-
-    /**
-     *
-     * @param array $terms
-     * @return \Doctrine\ORM\QueryBuilder
-     */
-    public function createQuery(array $terms)
-    {
-        //get from cache
-        $cacheKey = md5(serialize($terms));
-        if (array_key_exists($cacheKey, $this->_cacheQuery)) {
-            return clone $this->_cacheQuery[$cacheKey];
-        }
-
-        $qb = $this->em->createQueryBuilder();
-
-        $qb->from('ChillPersonBundle:Person', 'p');
-
-        if (array_key_exists('firstname', $terms)) {
-            $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(p.firstName))', ':firstname'))
-                  ->setParameter('firstname', '%'.$terms['firstname'].'%');
-        }
-
-        if (array_key_exists('lastname', $terms)) {
-            $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(p.lastName))', ':lastname'))
-                  ->setParameter('lastname', '%'.$terms['lastname'].'%');
-        }
-
-        foreach (['birthdate', 'birthdate-before', 'birthdate-after'] as $key)
-        if (array_key_exists($key, $terms)) {
-            try {
-                $date = new \DateTime($terms[$key]);
-            } catch (\Exception $ex) {
-                throw new ParsingException('The date is '
-                      . 'not parsable', 0, $ex);
-            }
-
-            switch($key) {
-                case 'birthdate':
-                    $qb->andWhere($qb->expr()->eq('p.birthdate', ':birthdate'))
-                        ->setParameter('birthdate', $date);
-                    break;
-                case 'birthdate-before':
-                    $qb->andWhere($qb->expr()->lt('p.birthdate', ':birthdatebefore'))
-                        ->setParameter('birthdatebefore', $date);
-                    break;
-                case 'birthdate-after':
-                    $qb->andWhere($qb->expr()->gt('p.birthdate', ':birthdateafter'))
-                        ->setParameter('birthdateafter', $date);
-                    break;
-                default:
-                    throw new \LogicException("this case $key should not exists");
-            }
-
-        }
-
-        if (array_key_exists('gender', $terms)) {
-            if (!in_array($terms['gender'], array(Person::MALE_GENDER, Person::FEMALE_GENDER))) {
-                throw new ParsingException('The gender '
-                      .$terms['gender'].' is not accepted. Should be "'.Person::MALE_GENDER
-                      .'" or "'.Person::FEMALE_GENDER.'"');
-            }
-
-            $qb->andWhere($qb->expr()->eq('p.gender', ':gender'))
-              ->setParameter('gender', $terms['gender']);
-        }
-
-        if (array_key_exists('nationality', $terms)) {
-            try {
-                $country = $this->em->createQuery('SELECT c FROM '
-                      . 'ChillMainBundle:Country c WHERE '
-                      . 'LOWER(c.countryCode) LIKE :code')
-                      ->setParameter('code', $terms['nationality'])
-                      ->getSingleResult();
-            } catch (\Doctrine\ORM\NoResultException $ex)  {
-                throw new ParsingException('The country code "'.$terms['nationality'].'" '
-                      . ', used in nationality, is unknow', 0, $ex);
-            }
-
-            $qb->andWhere($qb->expr()->eq('p.nationality', ':nationality'))
-                  ->setParameter('nationality', $country);
-        }
-
-        if ($terms['_default'] !== '') {
-            $grams = explode(' ', $terms['_default']);
-
-            foreach($grams as $key => $gram) {
-                $qb->andWhere($qb->expr()
-                      ->like('p.fullnameCanonical', 'UNACCENT(LOWER(:default_'.$key.'))'))
-                      ->setParameter('default_'.$key, '%'.$gram.'%');
+        foreach (['birthdateBefore', 'birthdateAfter', 'birthdate'] as $v) {
+            if (NULL !== ${$v}) {
+                try {
+                    ${$v} = new \DateTime(${$v});
+                } catch (\Exception $e) {
+                    throw new ParsingException('The date is '
+                        . 'not parsable', 0, $e);
+                }
             }
         }
 
-        //restraint center for security
-        $reachableCenters = $this->helper->getReachableCenters($this->user,
-                new Role('CHILL_PERSON_SEE'));
-        $qb->andWhere($qb->expr()
-                ->in('p.center', ':centers'))
-                ->setParameter('centers', $reachableCenters)
-                ;
-
-        $this->_cacheQuery[$cacheKey] = $qb;
-
-        return clone $qb;
+        return $this->personACLAwareRepository
+            ->countBySearchCriteria(
+                $default,
+                $firstname,
+                $lastname,
+                $birthdate,
+                $birthdateBefore,
+                $birthdateAfter,
+                $gender,
+                $countryCode,
+            );
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -391,4 +289,10 @@ class PersonSearch extends AbstractSearch implements ContainerAwareInterface,
         return 'Search within persons';
     }
 
+    public static function getAlias(): string
+    {
+        return self::NAME;
+    }
+
+
 }
diff --git a/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php b/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php
index ea2c9a5c7..e62c2ee55 100644
--- a/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php
+++ b/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php
@@ -2,90 +2,32 @@
 
 namespace Chill\PersonBundle\Search;
 
-
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Search\AbstractSearch;
 use Chill\MainBundle\Search\SearchInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Role\Role;
+use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
+use Symfony\Component\Templating\EngineInterface;
 
-/**
- * Class SimilarityPersonSearch
- *
- * @package Chill\PersonBundle\Search
- */
 class SimilarityPersonSearch extends AbstractSearch
 {
-    
-    use ContainerAwareTrait;
-    
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    private $em;
-    
-    /**
-     *
-     * @var \Chill\MainBundle\Entity\User
-     */
-    private $user;
-    
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    private $helper;
-    
-    /**
-     *
-     * @var PaginatorFactory
-     */
-    protected $paginatorFactory;
-    
+    protected PaginatorFactory $paginatorFactory;
+
+    private PersonACLAwareRepositoryInterface $personACLAwareRepository;
+
+    private EngineInterface $templating;
+
     const NAME = "person_similarity";
-    
-    /**
-     *
-     * @var PersonSearch
-     */
-    private $personSearch;
-    
-    
-    /**
-     * SimilarityPersonSearch constructor.
-     *
-     * @param EntityManagerInterface $em
-     * @param TokenStorageInterface $tokenStorage
-     * @param AuthorizationHelper $helper
-     * @param PaginatorFactory $paginatorFactory
-     * @param PersonSearch $personSearch
-     */
+
     public function __construct(
-        EntityManagerInterface $em,
-        TokenStorageInterface $tokenStorage,
-        AuthorizationHelper $helper,
         PaginatorFactory $paginatorFactory,
-        PersonSearch $personSearch)
-    {
-        $this->em = $em;
-        $this->user = $tokenStorage->getToken()->getUser();
-        $this->helper = $helper;
+        PersonACLAwareRepositoryInterface $personACLAwareRepository,
+        EngineInterface $templating
+    ) {
         $this->paginatorFactory = $paginatorFactory;
-        $this->personSearch = $personSearch;
-        
-        // throw an error if user is not a valid user
-        if (!$this->user instanceof \Chill\MainBundle\Entity\User) {
-            throw new \LogicException('The user provided must be an instance'
-                . ' of Chill\MainBundle\Entity\User');
-        }
+        $this->personACLAwareRepository = $personACLAwareRepository;
+        $this->templating = $templating;
     }
-    
+
     /*
      * (non-PHPdoc)
      * @see \Chill\MainBundle\Search\SearchInterface::getOrder()
@@ -94,7 +36,7 @@ class SimilarityPersonSearch extends AbstractSearch
     {
         return 200;
     }
-    
+
     /*
      * (non-PHPdoc)
      * @see \Chill\MainBundle\Search\SearchInterface::isActiveByDefault()
@@ -103,30 +45,27 @@ class SimilarityPersonSearch extends AbstractSearch
     {
         return true;
     }
-    
+
     public function supports($domain, $format)
     {
         return 'person' === $domain;
     }
-    
+
     /**
      * @param array $terms
      * @param int $start
      * @param int $limit
      * @param array $options
      * @param string $format
-     * @return array
      */
     public function renderResult(array $terms, $start = 0, $limit = 50, array $options = array(), $format = 'html')
     {
         $total = $this->count($terms);
         $paginator = $this->paginatorFactory->create($total);
-        
-        if ($format === 'html')
-        {
-            if ($total !== 0)
-            {
-                return $this->container->get('templating')->render('ChillPersonBundle:Person:list.html.twig',
+
+        if ($format === 'html') {
+            if ($total !== 0) {
+                return $this->templating->render('ChillPersonBundle:Person:list.html.twig',
                     array(
                         'persons' => $this->search($terms, $start, $limit, $options),
                         'pattern' => $this->recomposePattern($terms, array('nationality',
@@ -143,9 +82,8 @@ class SimilarityPersonSearch extends AbstractSearch
             else {
                 return null;
             }
-        
-        } elseif ($format === 'json')
-        {
+
+        } elseif ($format === 'json') {
             return [
                 'results' => $this->search($terms, $start, $limit, \array_merge($options, [ 'simplify' => true ])),
                 'pagination' => [
@@ -154,8 +92,7 @@ class SimilarityPersonSearch extends AbstractSearch
             ];
         }
     }
-    
-    
+
     /**
      *
      * @param string $pattern
@@ -166,101 +103,12 @@ class SimilarityPersonSearch extends AbstractSearch
      */
     protected function search(array $terms, $start, $limit, array $options = array())
     {
-        $qb = $this->createQuery($terms, 'search');
-        
-        
-        if ($options['simplify'] ?? false) {
-            $qb->select(
-                'sp.id',
-                $qb->expr()->concat(
-                    'sp.firstName',
-                    $qb->expr()->literal(' '),
-                    'sp.lastName'
-                ).'AS text'
-            );
-        } else {
-            $qb->select('sp');
-        }
-        
-        $qb
-            ->setMaxResults($limit)
-            ->setFirstResult($start);
-        
-        //order by firstname, lastname
-        
-        $qb
-            ->orderBy('sp.firstName')
-            ->addOrderBy('sp.lastName');
-        
-        if ($options['simplify'] ?? false) {
-            return $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
-        } else {
-            return $qb->getQuery()->getResult();
-        }
+        return $this->personACLAwareRepository
+            ->findBySimilaritySearch($terms['_default'], $start, $limit, $options['simplify'] ?? false);
     }
-    
-    
+
     protected function count(array $terms)
     {
-        $qb = $this->createQuery($terms);
-
-        
-        $qb->select('COUNT(sp.id)');
-        
-        return $qb->getQuery()->getSingleScalarResult();
+        return $this->personACLAwareRepository->countBySimilaritySearch($terms['_default']);
     }
-    
-    
-    private $_cacheQuery = array();
-    
-    /**
-     *
-     * @param array $terms
-     * @return \Doctrine\ORM\QueryBuilder
-     */
-    protected function createQuery(array $terms)
-    {
-        //get from cache
-        $cacheKey = md5(serialize($terms));
-        if (array_key_exists($cacheKey, $this->_cacheQuery)) {
-            return clone $this->_cacheQuery[$cacheKey];
-        }
-        
-        $qb = $this->em->createQueryBuilder();
-        
-        $qb ->select('sp')
-            ->from('ChillPersonBundle:Person', 'sp');
-        
-        if ($terms['_default'] !== '') {
-            $grams = explode(' ', $terms['_default']);
-            
-            foreach($grams as $key => $gram) {
-                $qb->andWhere('SIMILARITY(sp.fullnameCanonical, UNACCENT(LOWER(:default_'.$key.')) ) >= 0.15')
-                    ->setParameter('default_'.$key, '%'.$gram.'%');
-            }
-            
-            $qb->andWhere($qb->expr()
-                ->notIn(
-                    'sp.id',
-                    $this->personSearch
-                        ->createQuery($terms)
-                        ->addSelect('p.id')
-                        ->getDQL()
-                )
-            );
-        }
-        
-        //restraint center for security
-        $reachableCenters = $this->helper->getReachableCenters($this->user,
-            new Role('CHILL_PERSON_SEE'));
-        $qb->andWhere($qb->expr()
-            ->in('sp.center', ':centers'))
-            ->setParameter('centers', $reachableCenters)
-        ;
-        
-        $this->_cacheQuery[$cacheKey] = $qb;
-        
-        return clone $qb;
-    }
-    
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
index 2801cb8f7..5247df505 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
@@ -4,73 +4,101 @@ namespace Chill\PersonBundle\Security\Authorization;
 
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\MainBundle\Entity\Center;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\Security;
 
 class AccompanyingPeriodVoter extends AbstractChillVoter  implements ProvideRoleHierarchyInterface
 {
-    protected AuthorizationHelper $helper;
-
     public const SEE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE';
+    /**
+     * details are for seeing:
+     *
+     * * SocialIssues
+     */
+    public const SEE_DETAILS = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS';
+    public const CREATE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE';
+    public const EDIT = 'CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE';
+    public const DELETE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_DELETE';
 
     /**
-     * @param AuthorizationHelper $helper
+     * Give all the right above
      */
-    public function __construct(AuthorizationHelper $helper)
-    {
-            $this->helper = $helper;
+    public const FULL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_FULL';
+
+    public const ALL = [
+        self::SEE,
+        self::SEE_DETAILS,
+        self::CREATE,
+        self::EDIT,
+        self::DELETE,
+        self::FULL,
+    ];
+
+    private VoterHelperInterface $voterHelper;
+
+    private Security $security;
+
+    public function __construct(
+        Security $security,
+        VoterHelperFactoryInterface $voterHelperFactory
+    ) {
+        $this->security = $security;
+        $this->voterHelper = $voterHelperFactory
+            ->generate(self::class)
+            ->addCheckFor(null, [self::CREATE])
+            ->addCheckFor(AccompanyingPeriod::class, self::ALL)
+            ->addCheckFor(Person::class, [self::SEE])
+            ->build();
     }
 
     protected function supports($attribute, $subject)
     {
-        return $subject instanceof AccompanyingPeriod;
+        return $this->voterHelper->supports($attribute, $subject);
     }
 
-    protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
+    protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
         if (!$token->getUser() instanceof User) {
             return false;
         }
 
-        // TODO take scopes into account
-        if (count($subject->getPersons()) === 0) {
-            return true;
-        }
-        foreach ($subject->getPersons() as $person) {
-            // give access as soon as on center is reachable
-            if ($this->helper->userHasAccess($token->getUser(), $person->getCenter(), $attribute)) {
-                return true;
+        if ($subject instanceof AccompanyingPeriod) {
+            if (AccompanyingPeriod::STEP_DRAFT === $subject->getStep()) {
+                // only creator can see, edit, delete, etc.
+                if ($subject->getCreatedBy() === $token->getUser()
+                    || NULL === $subject->getCreatedBy()) {
+                    return true;
+                }
+
+                return false;
             }
 
-            return false;
+            // if confidential, only the referent can see it
+            if ($subject->isConfidential()) {
+                return $token->getUser() === $subject->getUser();
+            }
         }
-    }
 
-    private function getAttributes()
-    {
-        return [
-            self::SEE
-        ];
+        return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);
     }
 
     public function getRoles()
     {
-        return $this->getAttributes();
+        return self::ALL;
     }
 
     public function getRolesWithoutScope()
     {
         return [];
     }
-    
+
     public function getRolesWithHierarchy()
     {
-        return [ 'Person' => $this->getRoles() ];
+        return [ 'Accompanying period' => $this->getRoles() ];
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
index f81a6efa1..2d585e80e 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
@@ -22,17 +22,15 @@ namespace Chill\PersonBundle\Security\Authorization;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Entity\Center;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Role\Role;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class PersonVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
     const CREATE = 'CHILL_PERSON_CREATE';
@@ -41,51 +39,31 @@ class PersonVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
     const STATS  = 'CHILL_PERSON_STATS';
     const LISTS  = 'CHILL_PERSON_LISTS';
     const DUPLICATE = 'CHILL_PERSON_DUPLICATE';
-    
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    protected $helper;
-    
-    public function __construct(AuthorizationHelper $helper)
-    {
-        $this->helper = $helper;
+
+    protected VoterHelperInterface $voter;
+
+    public function __construct(
+        VoterHelperFactoryInterface $voterFactory
+    ) {
+        $this->voter = $voterFactory
+            ->generate(self::class)
+            ->addCheckFor(Center::class, [self::STATS, self::LISTS, self::DUPLICATE])
+            ->addCheckFor(Person::class, [self::CREATE, self::UPDATE, self::SEE, self::DUPLICATE])
+            ->addCheckFor(null, [self::CREATE] )
+            ->build()
+            ;
     }
-    
+
     protected function supports($attribute, $subject)
     {
-        if ($subject instanceof Person) {
-            return \in_array($attribute, [
-                self::CREATE, self::UPDATE, self::SEE, self::DUPLICATE
-            ]);
-        } elseif ($subject instanceof Center) {
-            return \in_array($attribute, [
-                self::STATS, self::LISTS, self::DUPLICATE
-            ]);
-        } elseif ($subject === null) {
-            return $attribute === self::CREATE;
-        } else {
-            return false;
-        }
+        return $this->voter->supports($attribute, $subject);
     }
-    
+
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
-        if (!$token->getUser() instanceof User) {
-            return false;
-        }
-        
-        if ($subject === null) {
-            $centers = $this->helper->getReachableCenters($token->getUser(), 
-                new Role($attribute));
-            
-            return count($centers) > 0;
-        }
-        
-        return $this->helper->userHasAccess($token->getUser(), $subject, $attribute);
+        return $this->voter->voteOnAttribute($attribute, $subject, $token);
     }
-    
+
     private function getAttributes()
     {
         return array(self::CREATE, self::UPDATE, self::SEE, self::STATS, self::LISTS, self::DUPLICATE);
@@ -100,7 +78,7 @@ class PersonVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
     {
         return $this->getAttributes();
     }
-    
+
     public function getRolesWithHierarchy()
     {
         return [ 'Person' => $this->getRoles() ];
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php
index 07f9a11be..2b82780c2 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php
@@ -73,6 +73,7 @@ class PersonNormalizer implements
             'firstName' => $person->getFirstName(),
             'lastName' => $person->getLastName(),
             'birthdate' => $this->normalizer->normalize($person->getBirthdate()),
+            'deathdate' => $this->normalizer->normalize($person->getDeathdate()),
             'center' => $this->normalizer->normalize($person->getCenter()),
             'phonenumber' => $person->getPhonenumber(),
             'mobilenumber' => $person->getMobilenumber(),
@@ -130,6 +131,7 @@ class PersonNormalizer implements
 
         foreach ([
             'birthdate' => \DateTime::class,
+            'deathdate' => \DateTime::class,
             'center' => Center::class
         ] as $item => $class) {
             if (\array_key_exists($item, $data)) {
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
index 3f427e811..a24e94bfa 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
@@ -23,6 +23,7 @@
 namespace Chill\PersonBundle\Tests\Controller;
 
 
+use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
@@ -47,6 +48,8 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
 
     protected ?AccompanyingPeriod $period = NULL;
 
+    protected ?int $periodId = NULL;
+
     /**
      * Setup before the first test of this class (see phpunit doc)
      */
@@ -70,15 +73,15 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
      *
      * @dataProvider dataGenerateRandomAccompanyingCourse
      */
-    public function testAccompanyingCourseShow(int $personId, AccompanyingPeriod $period)
+    public function testAccompanyingCourseShow(int $personId, int $periodId)
     {
-        $c = $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $period->getId()));
+        $c = $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId));
         $response = $this->client->getResponse();
 
         $this->assertEquals(200, $response->getStatusCode(), "Test that the response of rest api has a status code ok (200)");
 
         $data = \json_decode($response->getContent());
-        $this->assertEquals($data->id, $period->getId(),
+        $this->assertEquals($data->id, $periodId,
             "test that the response's data contains the id of the period"
         );
         $this->assertGreaterThan(0, $data->participations);
@@ -326,14 +329,16 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
      *
      * @dataProvider dataGenerateRandomAccompanyingCourse
      */
-    public function testAccompanyingPeriodPatch(int $personId, AccompanyingPeriod $period)
+    public function testAccompanyingPeriodPatch(int $personId, int $periodId)
     {
+        $period = self::$container->get(AccompanyingPeriodRepository::class)
+            ->find($periodId);
         $initialValueEmergency = $period->isEmergency();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $this->client->request(
             Request::METHOD_PATCH,
-            sprintf('/api/1.0/person/accompanying-course/%d.json', $period->getId()),
+            sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId),
             [], // parameters
             [], // files
             [], // server parameters
@@ -343,11 +348,10 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
 
         $this->assertEquals(200, $response->getStatusCode());
         $period = $em->getRepository(AccompanyingPeriod::class)
-            ->find($period->getId());
-        $em->refresh($period);
+            ->find($periodId);
         $this->assertEquals(!$initialValueEmergency, $period->isEmergency());
 
-        // restore the initial valud
+        // restore the initial value
         $period->setEmergency($initialValueEmergency);
         $em->flush();
     }
@@ -361,12 +365,32 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
         $em = static::$container->get(EntityManagerInterface::class);
         $center = $em->getRepository(Center::class)
             ->findOneBy(array('name' => 'Center A'));
+        $qb = $em->createQueryBuilder();
 
-        $personIds = $em->createQuery("SELECT p.id FROM ".
-            Person::class." p ".
-            " WHERE p.center = :center")
+        $personIds = $qb
+            ->select('p.id')
+            ->distinct(true)
+            ->from(Person::class, 'p')
+            ->join('p.accompanyingPeriodParticipations', 'participation')
+            ->join('participation.accompanyingPeriod', 'ap')
+            ->where(
+                $qb->expr()->eq(
+                    'p.center',
+                    ':center'
+                )
+            )
+            ->andWhere(
+                $qb->expr()->gt(
+                    'SIZE(p.accompanyingPeriodParticipations)',
+                    0)
+            )
+            ->andWhere(
+                $qb->expr()->eq('ap.step', ':step')
+            )
             ->setParameter('center', $center)
+            ->setParameter('step', AccompanyingPeriod::STEP_CONFIRMED)
             ->setMaxResults($maxResults)
+            ->getQuery()
             ->getScalarResult();
 
         // create a random order
@@ -400,11 +424,11 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
      *
      * @dataProvider dataGenerateRandomAccompanyingCourse
      */
-    public function testAccompanyingCourseAddParticipation(int $personId, AccompanyingPeriod $period)
+    public function testAccompanyingCourseAddParticipation(int $personId, int $periodId)
     {
         $this->client->request(
             Request::METHOD_POST,
-            sprintf('/api/1.0/person/accompanying-course/%d/participation.json', $period->getId()),
+            sprintf('/api/1.0/person/accompanying-course/%d/participation.json', $periodId),
             [], // parameters
             [], // files
             [], // server parameters
@@ -420,7 +444,8 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
 
         // check by deownloading the accompanying cours
 
-        $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $period->getId()));
+        $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId));
+        $this->assertEquals(200, $response->getStatusCode(), "Test that the response of rest api has a status code ok (200)");
 
         $response = $this->client->getResponse();
         $data = \json_decode($response->getContent());
@@ -435,7 +460,7 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
         // check removing the participation
         $this->client->request(
             Request::METHOD_DELETE,
-            sprintf('/api/1.0/person/accompanying-course/%d/participation.json', $period->getId()),
+            sprintf('/api/1.0/person/accompanying-course/%d/participation.json', $periodId),
             [], // parameters
             [], // files
             [], // server parameters
@@ -450,42 +475,6 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
         $this->assertNotNull($data['startDate']);
         $this->assertArrayHasKey('endDate', $data);
         $this->assertNotNull($data['endDate']);
-
-
-        // set to variable for tear down
-        $this->personId = $personId;
-        $this->period = $period;
-    }
-
-    protected function tearDown()
-    {
-        $em = static::$container->get(EntityManagerInterface::class);
-
-        // remove participation if set
-        if ($this->personId && $this->period) {
-            $participation = $em
-                ->getRepository(AccompanyingPeriodParticipation::class)
-                ->findOneBy(['person' => $this->personId, 'accompanyingPeriod' => $this->period])
-                ;
-
-            if (NULL !== $participation) {
-                $em->remove($participation);
-                $em->flush();
-            }
-            $this->personId = NULL;
-            $this->period   = NULL;
-        } elseif ($this->period) {
-            $period = $em
-                ->getRepository(AccompanyingPeriod::class)
-                ->find($this->period->getId()) ;
-
-            if ($period !== NULL) {
-                $em->remove($period);
-                $em->flush();
-            }
-
-            $this->period = null;
-        }
     }
 
     public function dataGenerateRandomAccompanyingCourseWithSocialIssue()
@@ -505,12 +494,32 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
         $em = static::$container->get(EntityManagerInterface::class);
         $center = $em->getRepository(Center::class)
             ->findOneBy(array('name' => 'Center A'));
+        $qb = $em->createQueryBuilder();
 
-        $personIds = $em->createQuery("SELECT p.id FROM ".
-            Person::class." p ".
-            " WHERE p.center = :center")
+        $personIds = $qb
+            ->select('p.id')
+            ->distinct(true)
+            ->from(Person::class, 'p')
+            ->join('p.accompanyingPeriodParticipations', 'participation')
+            ->join('participation.accompanyingPeriod', 'ap')
+            ->where(
+                $qb->expr()->eq(
+                    'p.center',
+                    ':center'
+                )
+            )
+            ->andWhere(
+                $qb->expr()->gt(
+                    'SIZE(p.accompanyingPeriodParticipations)',
+                    0)
+            )
+            ->andWhere(
+                $qb->expr()->eq('ap.step', ':step')
+            )
             ->setParameter('center', $center)
+            ->setParameter('step', AccompanyingPeriod::STEP_CONFIRMED)
             ->setMaxResults($maxResults)
+            ->getQuery()
             ->getScalarResult();
 
         // create a random order
@@ -556,7 +565,10 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
         $qb = $em->createQueryBuilder();
         $personIds = $qb
             ->select('p.id')
+            ->distinct(true)
             ->from(Person::class, 'p')
+            ->join('p.accompanyingPeriodParticipations', 'participation')
+            ->join('participation.accompanyingPeriod', 'ap')
             ->where(
                 $qb->expr()->eq(
                     'p.center',
@@ -568,7 +580,11 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
                     'SIZE(p.accompanyingPeriodParticipations)',
                     0)
                 )
+            ->andWhere(
+                $qb->expr()->eq('ap.step', ':step')
+            )
             ->setParameter('center', $center)
+            ->setParameter('step', AccompanyingPeriod::STEP_CONFIRMED)
             ->setMaxResults($maxResults)
             ->getQuery()
             ->getScalarResult();
@@ -584,7 +600,7 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
                 ->find($id);
             $periods = $person->getAccompanyingPeriods();
 
-            yield [\array_pop($personIds)["id"], $periods[\array_rand($periods)] ];
+            yield [\array_pop($personIds)["id"], $periods[\array_rand($periods)]->getId() ];
 
             $nbGenerated++;
         }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/BirthdateValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/BirthdateValidatorTest.php
deleted file mode 100644
index 57b4c2577..000000000
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/BirthdateValidatorTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace Chill\PersonBundle\Tests\Validator;
-
-use Chill\PersonBundle\Validator\Constraints\BirthdateValidator;
-use Chill\PersonBundle\Validator\Constraints\Birthdate;
-use Prophecy\Argument;
-use Prophecy\Prophet;
-
-/**
- * Test the behaviour of BirthdayValidator
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class BirthdateValidatorTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * A prophecy for \Symfony\Component\Validator\Context\ExecutionContextInterface
-     *
-     * Will reveal \Symfony\Component\Validator\Context\ExecutionContextInterface
-     */
-    private $context;
-    
-    private $prophet;
-    
-    /**
-     *
-     * @var Birthdate
-     */
-    private $constraint;
-    
-    public function setUp()
-    {
-        $this->prophet = new Prophet;
-        
-        $constraintViolationBuilder = $this->prophet->prophesize();
-        $constraintViolationBuilder->willImplement('Symfony\Component\Validator\Violation\ConstraintViolationBuilderInterface');
-
-        $constraintViolationBuilder->setParameter(Argument::any(), Argument::any())
-                ->willReturn($constraintViolationBuilder->reveal());
-        $constraintViolationBuilder->addViolation()
-                ->willReturn($constraintViolationBuilder->reveal());
-        
-        $this->context = $this->prophet->prophesize();
-        $this->context->willImplement('Symfony\Component\Validator\Context\ExecutionContextInterface');
-        $this->context->buildViolation(Argument::type('string'))
-                ->willReturn($constraintViolationBuilder->reveal()); 
-        
-        $this->constraint = new Birthdate();
-    }
-    
-    public function testValidBirthDate()
-    {
-        
-        $date = new \DateTime('2015-01-01');
-        
-        $birthdateValidator = new BirthdateValidator();
-        $birthdateValidator->initialize($this->context->reveal());
-        
-        $birthdateValidator->validate($date, $this->constraint);
-        
-        $this->context->buildViolation(Argument::any())->shouldNotHaveBeenCalled();
-    }
-    
-    public function testInvalidBirthDate()
-    {
-        $date = new \DateTime('tomorrow');
-        
-        $birthdateValidator = new BirthdateValidator();
-        $birthdateValidator->initialize($this->context->reveal());
-        
-        $birthdateValidator->validate($date, $this->constraint);
-        
-        $this->context->buildViolation(Argument::type('string'))->shouldHaveBeenCalled();
-    }
-    
-    public function testInvalidBirthDateWithParameter()
-    {
-        $date = (new \DateTime('today'))->sub(new \DateInterval('P1M'));
-        
-        $birthdateValidator = new BirthdateValidator('P1Y');
-        $birthdateValidator->initialize($this->context->reveal());
-        
-        $birthdateValidator->validate($date, $this->constraint);
-        
-        $this->context->buildViolation(Argument::type('string'))->shouldHaveBeenCalled();
-    }
-    
-    public function tearDown()
-    {
-        $this->prophet->checkPredictions();
-    }
-    
-    
-}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
new file mode 100644
index 000000000..6c726dd1c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Chill\PersonBundle\Tests\Validator\Person;
+
+use Chill\PersonBundle\Validator\Constraints\Person\BirthdateValidator;
+use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+use Chill\PersonBundle\Entity\Person;
+
+/**
+ * Test the behaviour of BirthdayValidator
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
+class BirthdateValidatorTest extends ConstraintValidatorTestCase
+{
+
+    public function testValidateTodayInvalid()
+    {
+        $bornToday = new \DateTime('now');
+        $this->validator->validate($bornToday, $this->createConstraint());
+        $this->buildViolation('msg')
+            ->setParameter('%date%', (new \DateTime('yesterday'))->format('d-m-Y'))
+            ->setCode('3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4')
+            ->assertRaised();
+    }
+
+    public function testValidateYesterdayValid()
+    {
+        $bornYesterday = new \DateTime('yesterday');
+        $this->validator->validate($bornYesterday, $this->createConstraint());
+        $this->assertNoViolation();
+    }
+
+    public function testTomorrowInvalid()
+    {
+        $bornAfter = new \DateTime('+2 days');
+        $this->validator->validate($bornAfter, $this->createConstraint());
+        $this->buildViolation('msg')
+            ->setParameter('%date%', (new \DateTime('yesterday'))->format('d-m-Y'))
+            ->setCode('3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4')
+            ->assertRaised();
+    }
+
+    private function createConstraint()
+    {
+        return new Birthdate([
+            'message' => 'msg'
+        ]);
+    }
+
+
+    protected function createValidator()
+    {
+        return new BirthdateValidator('P1D');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
new file mode 100644
index 000000000..8cd0e6b83
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Validator\Person;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter;
+use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenterValidator;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
+class PersonHasCenterValidatorTest extends \Symfony\Component\Validator\Test\ConstraintValidatorTestCase
+{
+    public function testValidateRequired()
+    {
+        $constraint = $this->getConstraint();
+        $personHasCenter = (new Person())->setCenter(new Center());
+        $personNoCenter = new Person();
+
+        $this->validator->validate($personHasCenter, $constraint);
+        $this->assertNoViolation();
+
+        $this->validator->validate($personNoCenter, $constraint);
+        $this->buildViolation('msg')
+            ->atPath('property.path.center')
+            ->assertRaised();
+    }
+
+    protected function getConstraint()
+    {
+        return new PersonHasCenter([
+            'message' => 'msg'
+        ]);
+    }
+
+    protected function createValidator()
+    {
+        $parameterBag = $this->createMock(ParameterBagInterface::class);
+        $parameterBag
+            ->method('get')
+            ->with($this->equalTo('chill_person'))
+            ->willReturn([
+                'validation' => [
+                    'center_required' => true
+                ]
+            ])
+            ;
+
+        return new PersonHasCenterValidator($parameterBag);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
new file mode 100644
index 000000000..8d6c930d9
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Validator\Person;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
+use Symfony\Component\Validator\Constraints\Length;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+class PersonValidationTest extends KernelTestCase
+{
+    private ValidatorInterface $validator;
+
+    protected function setUp()
+    {
+        self::bootKernel();
+        $this->validator = self::$container->get(ValidatorInterface::class);
+    }
+
+    public function testFirstnameValidation()
+    {
+        $person = (new Person())
+            ->setFirstname(\str_repeat('a', 500));
+        $errors = $this->validator->validate($person, null, ["creation"]);
+        foreach ($errors->getIterator() as $error) {
+            if (Length::TOO_LONG_ERROR === $error->getCode()) {
+                $this->assertTrue(true,
+                "error code for firstname too long is present");
+                return;
+            }
+        }
+        $this->assertTrue(false,
+        "error code for fistname too long is present");
+
+    }
+
+    public function testBirthdateInFuture()
+    {
+        $person = (new Person())
+            ->setBirthdate(new \Datetime('+2 months'));
+        $errors = $this->validator->validate($person, null, ["creation"]);
+        foreach ($errors->getIterator() as $error) {
+            if (Birthdate::BIRTHDATE_INVALID_CODE === $error->getCode()) {
+                $this->assertTrue(true,
+                    "error code for birthdate invalid is present");
+                return;
+            }
+        }
+        $this->assertTrue(false,
+            "error code for birthdate invalid is present");
+
+    }
+
+}
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Birthdate.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
similarity index 85%
rename from src/Bundle/ChillPersonBundle/Validator/Constraints/Birthdate.php
rename to src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
index d09d549fd..20f3ed97b 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Birthdate.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
@@ -17,26 +17,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace Chill\PersonBundle\Validator\Constraints;
+namespace Chill\PersonBundle\Validator\Constraints\Person;
 
 use Symfony\Component\Validator\Constraint;
 
 /**
  * Create a constraint on birth date: the birthdate after today are not allowed.
- * 
- * It is possible to add a delay before today, expressed as described in 
+ *
+ * It is possible to add a delay before today, expressed as described in
  * interval_spec : http://php.net/manual/en/dateinterval.construct.php
  * (this interval_spec itself is based on ISO8601 :
  *  https://en.wikipedia.org/wiki/ISO_8601#Durations)
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @Annotation
  */
 class Birthdate extends Constraint
 {
+    public const BIRTHDATE_INVALID_CODE = '3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4';
+
     public $message = "The birthdate must be before %date%";
-    
-    public function validatedBy()
-    {
-        return 'birthdate_not_before';
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/BirthdateValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
similarity index 93%
rename from src/Bundle/ChillPersonBundle/Validator/Constraints/BirthdateValidator.php
rename to src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
index cba955ef6..238a3d160 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/BirthdateValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
@@ -17,49 +17,50 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace Chill\PersonBundle\Validator\Constraints;
+namespace Chill\PersonBundle\Validator\Constraints\Person;
 
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
 /**
- * 
+ *
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class BirthdateValidator extends ConstraintValidator
 {
     private $interval_spec = null;
-    
+
     public function __construct($interval_spec = null)
     {
         $this->interval_spec = $interval_spec;
     }
-    
+
     public function validate($value, Constraint $constraint)
     {
         if ($value === NULL) {
-            
+
             return;
         }
-        
+
         if (!$value instanceof \DateTime) {
             throw new \LogicException('The input should a be a \DateTime interface,'
                     . (is_object($value) ? get_class($value) : gettype($value)));
         }
-        
+
         $limitDate = $this->getLimitDate();
-        
+
         if ($limitDate < $value) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('%date%', $limitDate->format('d-m-Y'))
+                ->setCode(Birthdate::BIRTHDATE_INVALID_CODE)
                 ->addViolation();
         }
-        
+
     }
-    
+
     /**
-     * 
+     *
      * @return \DateTime
      */
     private function getLimitDate()
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php
new file mode 100644
index 000000000..5cabd8838
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Chill\PersonBundle\Validator\Constraints\Person;
+
+/**
+ * @Annotation
+ */
+class PersonHasCenter extends \Symfony\Component\Validator\Constraint
+{
+    public string $message = "A center is required";
+
+    public function getTargets()
+    {
+        return [
+            self::CLASS_CONSTRAINT
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
new file mode 100644
index 000000000..1738e6ddc
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Chill\PersonBundle\Validator\Constraints\Person;
+
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+
+class PersonHasCenterValidator extends \Symfony\Component\Validator\ConstraintValidator
+{
+    private bool $centerRequired;
+
+    public function __construct(ParameterBagInterface $parameterBag)
+    {
+        $this->centerRequired = $parameterBag->get('chill_person')['validation']['center_required'];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate($person, Constraint $constraint)
+    {
+        if (!$person instanceof Person) {
+            throw new UnexpectedTypeException($constraint, Person::class);
+        }
+
+        if (!$this->centerRequired) {
+            return;
+        }
+
+        if (NULL === $person->getCenter()) {
+            $this
+                ->context
+                ->buildViolation($constraint->message)
+                ->atPath('center')
+                ->addViolation()
+                ;
+        }
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
index 1b2c9cd85..020fa409f 100644
--- a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
@@ -45,7 +45,7 @@ components:
         type:
           type: string
           enum:
-            - 'person'
+            - "person"
         firstName:
           type: string
         lastName:
@@ -55,7 +55,9 @@ components:
           description: a canonical representation for the person name
           readOnly: true
         birthdate:
-          $ref: '#/components/schemas/Date'
+          $ref: "#/components/schemas/Date"
+        deathdate:
+          $ref: "#/components/schemas/Date"
         phonenumber:
           type: string
         mobilenumber:
@@ -78,7 +80,7 @@ components:
         type:
           type: string
           enum:
-            - 'person'
+            - "person"
       required:
         - id
         - type
@@ -96,7 +98,7 @@ components:
         type:
           type: string
           enum:
-            - 'thirdparty'
+            - "thirdparty"
       required:
         - id
         - type
@@ -119,15 +121,15 @@ components:
         type:
           type: string
           enum:
-            - 'accompanying_period_resource'
+            - "accompanying_period_resource"
           readOnly: true
         id:
           type: integer
           readOnly: true
         resource:
           anyOf:
-            - $ref: '#/components/schemas/PersonById'
-            - $ref: '#/components/schemas/ThirdPartyById'
+            - $ref: "#/components/schemas/PersonById"
+            - $ref: "#/components/schemas/ThirdPartyById"
     ResourceById:
       type: object
       properties:
@@ -136,7 +138,7 @@ components:
         type:
           type: string
           enum:
-            - 'accompanying_period_resource'
+            - "accompanying_period_resource"
       required:
         - id
         - type
@@ -146,7 +148,7 @@ components:
         type:
           type: string
           enum:
-            - 'accompanying_period_comment'
+            - "accompanying_period_comment"
           readOnly: true
         id:
           type: integer
@@ -161,7 +163,7 @@ components:
         type:
           type: string
           enum:
-            - 'accompanying_period_comment'
+            - "accompanying_period_comment"
       required:
         - id
         - type
@@ -173,7 +175,7 @@ components:
         type:
           type: string
           enum:
-            - 'social_issue'
+            - "social_issue"
         parent_id:
           type: integer
           readOnly: true
@@ -195,12 +197,12 @@ components:
     Household:
       type: object
       properties:
-          id:
-            type: integer
-          type:
-            type: string
-            enum:
-              - 'household'
+        id:
+          type: integer
+        type:
+          type: string
+          enum:
+            - "household"
     HouseholdPosition:
       type: object
       properties:
@@ -209,7 +211,7 @@ components:
         type:
           type: string
           enum:
-            - 'household_position'
+            - "household_position"
     AccompanyingCourseWork:
       type: object
       properties:
@@ -218,7 +220,7 @@ components:
         type:
           type: string
           enum:
-            - 'accompanying_period_work'
+            - "accompanying_period_work"
         note:
           type: string
         startDate:
@@ -243,15 +245,15 @@ components:
         type:
           type: string
           enum:
-            - 'accompanying_period_work_goal'
+            - "accompanying_period_work_goal"
         note:
           type: string
         goal:
-          $ref: '#/components/schemas/SocialWorkGoalById'
+          $ref: "#/components/schemas/SocialWorkGoalById"
         results:
           type: array
           items:
-            $ref: '#/components/schemas/SocialWorkGoalById'
+            $ref: "#/components/schemas/SocialWorkGoalById"
 
     SocialWorkResultById:
       type: object
@@ -261,7 +263,7 @@ components:
         type:
           type: string
           enum:
-            - 'social_work_result'
+            - "social_work_result"
     SocialWorkGoalById:
       type: object
       properties:
@@ -270,7 +272,7 @@ components:
         type:
           type: string
           enum:
-            - 'social_work_goal'
+            - "social_work_goal"
 
 paths:
   /1.0/person/person/{id}.json:
@@ -308,7 +310,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Person'
+              $ref: "#/components/schemas/Person"
       responses:
         200:
           description: "OK"
@@ -355,18 +357,17 @@ paths:
         422:
           description: "Unprocessable entity (validation errors)"
 
-
   /1.0/person/address/suggest/by-person/{id}.json:
     get:
       tags:
         - address
       summary: get a list of suggested address for a person
       description: >
-          The address are computed from various source. Currently:
+        The address are computed from various source. Currently:
 
-          - the address of course to which the person is participating
+        - the address of course to which the person is participating
 
-          The current person's address is always ignored.
+        The current person's address is always ignored.
       parameters:
         - name: id
           in: path
@@ -390,11 +391,11 @@ paths:
         - address
       summary: get a list of suggested address for a household
       description: >
-          The address are computed from various source. Currently:
+        The address are computed from various source. Currently:
 
-          - the address of course to which the members is participating
+        - the address of course to which the members is participating
 
-          The current household address is always ignored.
+        The current household address is always ignored.
       parameters:
         - name: id
           in: path
@@ -452,7 +453,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/AccompanyingPeriod'
+              $ref: "#/components/schemas/AccompanyingPeriod"
             examples:
               Set the requestor as anonymous:
                 value:
@@ -488,7 +489,7 @@ paths:
                   id: 0
                   personLocation: null
                   addressLocation:
-                      id: 7960
+                    id: 7960
       responses:
         401:
           description: "Unauthorized"
@@ -520,8 +521,8 @@ paths:
           application/json:
             schema:
               oneOf:
-                - $ref: '#/components/schemas/PersonById'
-                - $ref: '#/components/schemas/ThirdPartyById'
+                - $ref: "#/components/schemas/PersonById"
+                - $ref: "#/components/schemas/ThirdPartyById"
             examples:
               add person with id 50:
                 summary: "a person with id 50"
@@ -585,7 +586,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/PersonById'
+              $ref: "#/components/schemas/PersonById"
       responses:
         401:
           description: "Unauthorized"
@@ -614,7 +615,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/PersonById'
+              $ref: "#/components/schemas/PersonById"
       responses:
         401:
           description: "Unauthorized"
@@ -645,7 +646,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Resource'
+              $ref: "#/components/schemas/Resource"
             examples:
               add person with id 50:
                 summary: "a person with id 50"
@@ -690,7 +691,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/ResourceById'
+              $ref: "#/components/schemas/ResourceById"
       responses:
         401:
           description: "Unauthorized"
@@ -721,7 +722,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Comment'
+              $ref: "#/components/schemas/Comment"
             examples:
               a single comment:
                 summary: "a simple comment"
@@ -759,7 +760,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/CommentById'
+              $ref: "#/components/schemas/CommentById"
       responses:
         401:
           description: "Unauthorized"
@@ -790,7 +791,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Scope'
+              $ref: "#/components/schemas/Scope"
             examples:
               add a scope:
                 value:
@@ -824,7 +825,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/ScopeById'
+              $ref: "#/components/schemas/ScopeById"
       responses:
         401:
           description: "Unauthorized"
@@ -855,7 +856,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/SocialIssue'
+              $ref: "#/components/schemas/SocialIssue"
             examples:
               add a social issue:
                 value:
@@ -889,7 +890,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/SocialIssue'
+              $ref: "#/components/schemas/SocialIssue"
       responses:
         401:
           description: "Unauthorized"
@@ -926,11 +927,11 @@ paths:
                 type:
                   type: string
                   enum:
-                    - 'accompanying_period_work'
+                    - "accompanying_period_work"
                 startDate:
-                  $ref: '#/components/schemas/Date'
+                  $ref: "#/components/schemas/Date"
                 endDate:
-                  $ref: '#/components/schemas/Date'
+                  $ref: "#/components/schemas/Date"
             examples:
               create a work:
                 value:
@@ -992,7 +993,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/AccompanyingCourseWork'
+              $ref: "#/components/schemas/AccompanyingCourseWork"
       responses:
         401:
           description: "Unauthorized"
@@ -1029,8 +1030,6 @@ paths:
         400:
           description: "transition cannot be applyed"
 
-
-
   /1.0/person/accompanying-period/origin.json:
     get:
       tags:
@@ -1064,8 +1063,6 @@ paths:
         404:
           description: "Not found"
 
-
-
   /1.0/person/household.json:
     get:
       tags:
@@ -1095,7 +1092,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Household'
+                $ref: "#/components/schemas/Household"
         404:
           description: "not found"
         401:
@@ -1107,9 +1104,9 @@ paths:
         - household
       summary: Return households associated with the given person through accompanying periods
       description: |
-          Return households associated with the given person throught accompanying periods participation.
+        Return households associated with the given person throught accompanying periods participation.
 
-          The current household of the given person is excluded.
+        The current household of the given person is excluded.
       parameters:
         - name: person_id
           in: path
@@ -1125,7 +1122,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Household'
+                $ref: "#/components/schemas/Household"
         404:
           description: "not found"
         401:
@@ -1149,23 +1146,22 @@ paths:
                     type: object
                     properties:
                       person:
-                        $ref: '#/components/schemas/PersonById'
+                        $ref: "#/components/schemas/PersonById"
                       start_date:
-                        $ref: '#/components/schemas/Date'
+                        $ref: "#/components/schemas/Date"
                       position:
-                        $ref: '#/components/schemas/HouseholdPosition'
+                        $ref: "#/components/schemas/HouseholdPosition"
                       holder:
                         type: boolean
                       comment:
                         type: string
                 destination:
-                  $ref: '#/components/schemas/Household'
+                  $ref: "#/components/schemas/Household"
             examples:
               Moving person to a new household:
                 value:
                   concerned:
-                    -
-                      person:
+                    - person:
                         id: 0
                         type: person
                       position:
@@ -1180,8 +1176,7 @@ paths:
               Moving person to a new household and set an address to this household:
                 value:
                   concerned:
-                    -
-                      person:
+                    - person:
                         id: 0
                         type: person
                       position:
@@ -1198,8 +1193,7 @@ paths:
               Moving person to an existing household:
                 value:
                   concerned:
-                    -
-                      person:
+                    - person:
                         id: 0
                         type: person
                       position:
@@ -1215,8 +1209,7 @@ paths:
               Removing a person from any household:
                 value:
                   concerned:
-                    -
-                      person:
+                    - person:
                         id: 0
                         type: person
                       start_date:
@@ -1270,8 +1263,6 @@ paths:
         400:
           description: "transition cannot be applyed"
 
-
-
   /1.0/person/social/social-action.json:
     get:
       tags:
@@ -1349,7 +1340,6 @@ paths:
         404:
           description: not found
 
-
   /1.0/person/social-work/social-issue.json:
     get:
       tags:
@@ -1379,7 +1369,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/SocialIssue'
+                $ref: "#/components/schemas/SocialIssue"
         404:
           description: "not found"
         401:
diff --git a/src/Bundle/ChillPersonBundle/config/services.yaml b/src/Bundle/ChillPersonBundle/config/services.yaml
index c2f60a729..6133068a4 100644
--- a/src/Bundle/ChillPersonBundle/config/services.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services.yaml
@@ -24,14 +24,6 @@ services:
         tags:
             - { name: console.command }
 
-    chill.person.form.type.select2maritalstatus:
-        class: Chill\PersonBundle\Form\Type\Select2MaritalStatusType
-        arguments:
-            - "@request_stack"
-            - "@doctrine.orm.entity_manager"
-        tags:
-            - { name: form.type, alias: select2_chill_marital_status }
-
     chill.person.timeline.accompanying_period_opening:
         class: Chill\PersonBundle\Timeline\TimelineAccompanyingPeriodOpening
         arguments:
@@ -62,23 +54,22 @@ services:
             - { name: security.voter }
             - { name: chill.role }
 
-    chill.person.birthdate_validation:
-        class: Chill\PersonBundle\Validator\Constraints\BirthdateValidator
+    Chill\PersonBundle\Validator\Constraints\:
+        autowire: true
+        autoconfigure: true
+        resource: '../Validator/Constraints/'
+
+    # override default config, must be loaded after resource
+    Chill\PersonBundle\Validator\Constraints\BirthdateValidator:
         arguments:
             - "%chill_person.validation.birtdate_not_before%"
         tags:
             - { name: validator.constraint_validator, alias: birthdate_not_before }
 
-    Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequentialValidator:
-        autowire: true
-        tags:
-            - { name: validator.constraint_validator }
-
     Chill\PersonBundle\Repository\:
         autowire: true
         autoconfigure: true
         resource: '../Repository/'
-        tags: ['doctrine.repository_service']
 
     Chill\PersonBundle\Controller\:
         autowire: true
diff --git a/src/Bundle/ChillPersonBundle/config/services/controller.yaml b/src/Bundle/ChillPersonBundle/config/services/controller.yaml
index 6efdb4640..489168425 100644
--- a/src/Bundle/ChillPersonBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/controller.yaml
@@ -12,9 +12,8 @@ services:
         tags: ['controller.service_arguments']
 
     Chill\PersonBundle\Controller\AccompanyingPeriodController:
-        arguments:
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
-            $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface'
+        autowire: true
+        autoconfigure: true
         tags: ['controller.service_arguments']
 
     Chill\PersonBundle\Controller\PersonAddressController:
diff --git a/src/Bundle/ChillPersonBundle/config/services/form.yaml b/src/Bundle/ChillPersonBundle/config/services/form.yaml
index b61de615d..dacfa41de 100644
--- a/src/Bundle/ChillPersonBundle/config/services/form.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/form.yaml
@@ -1,5 +1,10 @@
 services:
 
+    Chill\PersonBundle\Form\:
+        autowire: true
+        autoconfigure: true
+        resource: '../../Form/'
+
     Chill\PersonBundle\Form\PersonType:
         arguments:
             - '%chill_person.person_fields%'
@@ -7,14 +12,7 @@ services:
         tags:
             - { name: form.type, alias: '@chill.person.form.person_creation' }
 
-    Chill\PersonBundle\Form\CreationPersonType:
-        arguments:
-            - '@chill.main.form.data_transformer.center_transformer'
-            - '@Chill\PersonBundle\Config\ConfigPersonAltNamesHelper'
-        tags:
-            - { name: form.type, alias: '@chill.main.form.person_creation' }
-
-    chill.person.accompanying_period_closing_motive:
+    Chill\PersonBundle\Form\Type\ClosingMotivePickerType:
         class: Chill\PersonBundle\Form\Type\ClosingMotivePickerType
         arguments:
             $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
@@ -28,60 +26,3 @@ services:
             $config: "%chill_person.accompanying_period_fields%"
         tags:
             - { name: form.type }
-
-    chill.person.form.type.pick_person:
-        class: Chill\PersonBundle\Form\Type\PickPersonType
-        arguments:
-            - '@Chill\PersonBundle\Repository\PersonRepository'
-            - "@security.token_storage"
-            - "@chill.main.security.authorization.helper"
-            - '@Symfony\Component\Routing\Generator\UrlGeneratorInterface'
-            - '@Symfony\Component\Translation\TranslatorInterface'
-        tags:
-            - { name: form.type }
-
-    Chill\PersonBundle\Form\Type\PersonAltNameType:
-        arguments:
-            $configHelper: '@Chill\PersonBundle\Config\ConfigPersonAltNamesHelper'
-            $translatableStringHelper: '@chill.main.helper.translatable_string'
-        tags:
-            - { name: form.type }
-
-    Chill\PersonBundle\Form\Type\PersonPhoneType:
-        arguments:
-            $phonenumberHelper: '@Chill\MainBundle\Phonenumber\PhonenumberHelper'
-            $em: '@Doctrine\ORM\EntityManagerInterface'
-        tags:
-            - { name: form.type }
-
-    Chill\PersonBundle\Form\SocialWork\SocialIssueType:
-        arguments:
-            $translatableStringHelper: '@chill.main.helper.translatable_string'
-        tags:
-            - { name: form.type }
-
-    Chill\PersonBundle\Form\SocialWork\SocialActionType:
-        arguments:
-            $translatableStringHelper: '@chill.main.helper.translatable_string'
-        tags:
-            - { name: form.type }
-
-    Chill\PersonBundle\Form\SocialWork\EvaluationType:
-        arguments:
-            $translatableStringHelper: '@chill.main.helper.translatable_string'
-        tags:
-            - { name: form.type }
-
-
-    Chill\PersonBundle\Form\SocialWork\GoalType:
-        arguments:
-            $translatableStringHelper: '@chill.main.helper.translatable_string'
-        tags:
-            - { name: form.type }
-
-
-    Chill\PersonBundle\Form\SocialWork\ResultType:
-        arguments:
-            $translatableStringHelper: '@chill.main.helper.translatable_string'
-        tags:
-            - { name: form.type }
diff --git a/src/Bundle/ChillPersonBundle/config/services/menu.yaml b/src/Bundle/ChillPersonBundle/config/services/menu.yaml
index 344eb2a17..a9f566466 100644
--- a/src/Bundle/ChillPersonBundle/config/services/menu.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/menu.yaml
@@ -19,14 +19,7 @@ services:
               #            - { name: 'chill.menu_builder' }
               #
     Chill\PersonBundle\Menu\PersonMenuBuilder:
-        arguments:
-            $showAccompanyingPeriod: '%chill_person.accompanying_period%'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: 'chill.menu_builder' }
-
-              #    Chill\PersonBundle\Menu\AccompanyingCourseMenuBuilder:
-              #        arguments:
-              #            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
-              #        tags:
-              #            - { name: 'chill.menu_builder' }
diff --git a/src/Bundle/ChillPersonBundle/config/services/repository.yaml b/src/Bundle/ChillPersonBundle/config/services/repository.yaml
index 72ca27e24..b4d179dd1 100644
--- a/src/Bundle/ChillPersonBundle/config/services/repository.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/repository.yaml
@@ -1,6 +1,12 @@
 services:
+    # note: the services.yaml file define some autoloading
+
     chill.person.repository.person:
         class: Chill\PersonBundle\Repository\PersonRepository
         autowire: true
         autoconfigure: true
     Chill\PersonBundle\Repository\PersonRepository: '@chill.person.repository.person'
+
+    Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface: '@Chill\PersonBundle\Repository\PersonACLAwareRepository'
+
+    Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface: '@Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepository'
diff --git a/src/Bundle/ChillPersonBundle/config/services/search.yaml b/src/Bundle/ChillPersonBundle/config/services/search.yaml
index 284773196..6a7cd4496 100644
--- a/src/Bundle/ChillPersonBundle/config/services/search.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/search.yaml
@@ -1,25 +1,11 @@
 services:
-    chill.person.search_person:
-        class: Chill\PersonBundle\Search\PersonSearch
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - "@security.token_storage"
-            - "@chill.main.security.authorization.helper"
-            - "@chill_main.paginator_factory"
-        calls:
-            - ['setContainer', ["@service_container"]]
+    Chill\PersonBundle\Search\PersonSearch:
+        autowire: true
         tags:
             - { name: chill.search, alias: 'person_regular' }
 
     Chill\PersonBundle\Search\SimilarityPersonSearch:
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - "@security.token_storage"
-            - "@chill.main.security.authorization.helper"
-            - "@chill_main.paginator_factory"
-            - '@chill.person.search_person'
-        calls:
-            - ['setContainer', ["@service_container"]]
+        autowire: true
         tags:
             - { name: chill.search, alias: 'person_similarity' }
 
diff --git a/src/Bundle/ChillPersonBundle/config/services/security.yaml b/src/Bundle/ChillPersonBundle/config/services/security.yaml
index 21590fcda..6dc3c92d3 100644
--- a/src/Bundle/ChillPersonBundle/config/services/security.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/security.yaml
@@ -1,16 +1,14 @@
 services:
     chill.person.security.authorization.person:
+        autowire: true
         class: Chill\PersonBundle\Security\Authorization\PersonVoter
-        arguments:
-            - "@chill.main.security.authorization.helper"
         tags:
             - { name: security.voter }
             - { name: chill.role }
 
     Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter:
-        arguments:
-            - "@chill.main.security.authorization.helper"
+        autowire: true
         tags:
             - { name: security.voter }
             - { name: chill.role }
-            
+
diff --git a/src/Bundle/ChillPersonBundle/config/validation.yaml b/src/Bundle/ChillPersonBundle/config/validation.yaml
index 23369a467..c41513778 100644
--- a/src/Bundle/ChillPersonBundle/config/validation.yaml
+++ b/src/Bundle/ChillPersonBundle/config/validation.yaml
@@ -1,70 +1,3 @@
-Chill\PersonBundle\Entity\Person:
-    properties:
-        firstName:
-              - NotBlank:
-                  groups: [general, creation]
-              - Length:
-                  min: 2
-                  max: 255
-                  minMessage: 'This name is too short. It must containt {{ limit }} chars'
-                  maxMessage: 'This name is too long. It must containt {{ limit }} chars'
-                  groups: [general, creation]
-        lastName:
-              - NotBlank:
-                  groups: [general, creation]
-              - Length:
-                  min: 2
-                  max: 255
-                  minMessage: 'This name is too short. It must containt {{ limit }} chars'
-                  maxMessage: 'This name is too long. It must containt {{ limit }} chars'
-                  groups: [general, creation]
-        birthdate:
-              - Date:
-                  message: 'Birthdate not valid'
-                  groups: [general, creation]
-              - Chill\PersonBundle\Validator\Constraints\Birthdate:
-                  groups: [general, creation]
-        gender:
-               - NotNull:
-                  groups: [general, creation]
-        #accompanyingPeriods:
-        #      - Valid:
-        #          traverse: true
-        email:
-             - Email:
-                  groups: [general, creation]
-                  message: 'The email is not valid'
-                  checkMX: true
-        phonenumber:
-             - Regex:
-                  pattern: '/^([\+{1}])([0-9\s*]{4,20})$/'
-                  groups: [general, creation]
-                  message: 'Invalid phone number: it should begin with the international prefix starting with "+", hold only digits and be smaller than 20 characters. Ex: +33123456789'
-             - Chill\MainBundle\Validation\Constraint\PhonenumberConstraint:
-                  type: landline
-                  groups: [ general, creation ]
-        mobilenumber:
-             - Regex:
-                  pattern: '/^([\+{1}])([0-9\s*]{4,20})$/'
-                  groups: [general, creation]
-                  message: 'Invalid phone number: it should begin with the international prefix starting with "+", hold only digits and be smaller than 20 characters. Ex: +33623456789'
-             - Chill\MainBundle\Validation\Constraint\PhonenumberConstraint:
-                  type: mobile
-                  groups: [ general, creation ]
-        otherPhoneNumbers:
-            -   Valid:
-                    traverse: true
-    constraints:
-          - Callback:
-                  callback: isAccompanyingPeriodValid
-                  groups: [accompanying_period_consistent]
-          - Callback:
-                  callback: isAddressesValid
-                  groups: [addresses_consistent]
-          - Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential:
-                  groups: [ 'household_memberships' ]
-
-
 Chill\PersonBundle\Entity\AccompanyingPeriod:
     properties:
         openingDate:
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php b/src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php
new file mode 100644
index 000000000..dd3a60d75
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Allow to create persons without center
+ */
+final class Version20210831140339 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Allow to create persons without center';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_person ALTER center_id DROP NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_person ALTER center_id SET NOT NULL');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php b/src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php
new file mode 100644
index 000000000..82cade6cf
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Optimize trigram index on person fullname: create index for both center_id and fullname
+ */
+final class Version20210910161858 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Optimize trigram index on person fullname: create index for both center_id and fullname';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX fullnamecanonical_trgm_idx');
+        $this->addSql('CREATE INDEX fullnameCanonical_trgm_idx ON chill_person_person USING GIST (center_id, fullnameCanonical gist_trgm_ops)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX fullnamecanonical_trgm_idx');
+        $this->addSql('CREATE INDEX fullnameCanonical_trgm_idx ON chill_person_person USING GIST (fullnameCanonical gist_trgm_ops)');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php b/src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php
new file mode 100644
index 000000000..f285fde47
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Create view for PersonCurrentAddress and related indexes
+ */
+final class Version20210915093624 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create view for PersonCurrentAddress and related indexes';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql("CREATE VIEW view_chill_person_current_address AS
+            SELECT
+                cphm.person_id  AS person_id,
+                cma.id AS address_id,
+                CASE WHEN cphm.startdate > COALESCE(cma.validfrom, '-infinity'::date) THEN cphm.startdate ELSE cma.validfrom END AS valid_from,
+                CASE WHEN COALESCE(cphm.enddate, 'infinity'::date) < COALESCE(cma.validto, 'infinity'::date) THEN cphm.enddate ELSE cma.validto END AS valid_to
+            FROM chill_person_household_members AS cphm
+                     LEFT JOIN chill_person_household_to_addresses AS cphta ON cphta.household_id = cphm.household_id
+                     LEFT JOIN chill_main_address AS cma ON cphta.address_id = cma.id
+            WHERE
+                  cphm.sharedhousehold IS TRUE
+            AND
+                  current_date between cphm.startdate AND coalesce(enddate, 'infinity'::date)
+            AND
+                  current_date between cma.validfrom AND coalesce(validto, 'infinity'::date)
+      ");
+
+        $this->addSql("CREATE INDEX chill_custom_main_address_filtering_idx ON chill_main_address USING btree (id, validfrom ASC, validto DESC)");
+        $this->addSql("CREATE INDEX chill_custom_person_household_members_sharing_idx ON chill_person_household_members USING btree (person_id, startdate ASC, enddate DESC, household_id) WHERE sharedhousehold IS TRUE");
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql("DROP VIEW view_chill_person_current_address");
+        $this->addSql("DROP INDEX chill_custom_main_address_filtering_idx");
+        $this->addSql("DROP INDEX chill_custom_person_household_members_sharing_idx");
+    }
+}
diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
index 8b8bce839..2f760a84b 100644
--- a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
+++ b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
@@ -18,7 +18,12 @@
 
 namespace Chill\TaskBundle\Security\Authorization;
 
+use Chill\EventBundle\Entity\Event;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
+use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 use Chill\TaskBundle\Entity\AbstractTask;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
@@ -32,12 +37,7 @@ use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Chill\TaskBundle\Security\Authorization\AuthorizationEvent;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
+final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
     const CREATE = 'CHILL_TASK_TASK_CREATE';
     const UPDATE = 'CHILL_TASK_TASK_UPDATE';
@@ -51,50 +51,52 @@ class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterf
         self::DELETE
     ];
 
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    protected AuthorizationHelper $authorizationHelper;
 
-    /**
-     *
-     * @var AccessDecisionManagerInterface
-     */
-    protected $accessDecisionManager;
+    protected AccessDecisionManagerInterface $accessDecisionManager;
 
-    /**
-     *
-     * @var LoggerInterface
-     */
-    protected $logger;
-    
-    /**
-     *
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
+    protected LoggerInterface $logger;
+
+    protected EventDispatcherInterface $eventDispatcher;
+
+    protected CenterResolverDispatcher $centerResolverDispatcher;
+
+    protected VoterHelperInterface $voter;
 
     public function __construct(
         AccessDecisionManagerInterface $accessDecisionManager,
         AuthorizationHelper $authorizationHelper,
         EventDispatcherInterface $eventDispatcher,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        CenterResolverDispatcher $centerResolverDispatcher,
+        VoterHelperFactoryInterface $voterFactory
     ) {
         $this->accessDecisionManager = $accessDecisionManager;
         $this->authorizationHelper = $authorizationHelper;
         $this->eventDispatcher = $eventDispatcher;
         $this->logger = $logger;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+
+        $this->voter = $voterFactory
+            ->generate(AbstractTask::class)
+            ->addCheckFor(AbstractTask::class, self::ROLES)
+            ->addCheckFor(Person::class, [self::SHOW])
+            ->addCheckFor(null, [self::SHOW])
+            ->build()
+            ;
     }
 
     public function supports($attribute, $subject)
     {
+        return $this->voter->supports($attribute, $subject);
+       /*
         return ($subject instanceof AbstractTask && in_array($attribute, self::ROLES))
             ||
             ($subject instanceof Person && \in_array($attribute, [ self::CREATE, self::SHOW ]))
             ||
             (NULL === $subject && $attribute === self::SHOW )
             ;
+       */
     }
 
     /**
@@ -111,40 +113,60 @@ class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterf
         if (!$token->getUser() instanceof User) {
             return false;
         }
-        
+
         $event = new AuthorizationEvent($subject, $attribute, $token);
-        
+
         $this->eventDispatcher->dispatch(AuthorizationEvent::VOTE, $event);
-        
+
         if ($event->hasVote()) {
-            
+
             $this->logger->debug("The TaskVoter is overriding by "
                 .AuthorizationEvent::VOTE, [
                     'vote' => $event->getVote(),
                     'task_id' => $subject->getId()
                 ]);
-            
+
             return $event->getVote();
         }
 
+        // do pre-flight check, relying on other decision manager
+        // those pre-flight check concern associated entities
+        if ($subject instanceof AbstractTask) {
+            if (NULL !== $person = $subject->getPerson()) {
+                if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
+                    return false;
+                }
+            } elseif (false) {
+                // here will come the test if the task is associated to an accompanying course
+            }
+        }
+
+        // do regular check.
+        return $this->voter->voteOnAttribute($attribute, $subject, $token);
+
+       /*
         if ($subject instanceof AbstractTask) {
             if ($subject->getPerson() === null) {
                 throw new \LogicException("You should associate a person with task "
                     . "in order to check autorizations");
             }
-            
+
             $person = $subject->getPerson();
         } elseif ($subject instanceof Person) {
             $person = $subject;
         } else {
             // subject is null. We check  that at least one center is reachable
             $centers = $this->authorizationHelper->getReachableCenters($token->getUser(), new Role($attribute));
-            
+
             return count($centers) > 0;
         }
 
         if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
+            return false;
+        }
+        $center = $this->centerResolverDispatcher->resolveCenter($subject);
 
+        if (NULL === $center) {
             return false;
         }
 
@@ -153,6 +175,7 @@ class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterf
             $subject,
             $attribute
             );
+       */
     }
 
     public function getRoles()
diff --git a/src/Bundle/ChillTaskBundle/config/services/security.yaml b/src/Bundle/ChillTaskBundle/config/services/security.yaml
index e58fd19e3..c1d176637 100644
--- a/src/Bundle/ChillTaskBundle/config/services/security.yaml
+++ b/src/Bundle/ChillTaskBundle/config/services/security.yaml
@@ -1,11 +1,7 @@
 services:
     chill_task.task_voter:
         class: Chill\TaskBundle\Security\Authorization\TaskVoter
-        arguments:
-            - "@security.access.decision_manager"
-            - "@chill.main.security.authorization.helper"
-            - '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
-            - "@logger"
+        autowire: true
+        autoconfigure: true
         tags:
-            - { name: security.voter }
             - { name: chill.role }
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
index 7ada8db8e..9b23222c6 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
@@ -8,6 +8,8 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
+use Symfony\Component\HttpFoundation\Request;
+
 
 /**
  * This is the class that loads and manages your bundle configuration.
@@ -42,19 +44,50 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
         $this->preprendRoutes($container);
         $this->prependRoleHierarchy($container);
     }
-    
+
     protected function preprendRoutes(ContainerBuilder $container)
     {
         //declare routes for 3party bundle
         $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
+           'routing' => [
               'resources' => array(
                  '@ChillThirdPartyBundle/config/routes.yaml'
               )
-           )
+              ],
+            'apis' => [
+                [
+                    'class' => \Chill\ThirdPartyBundle\Entity\ThirdParty::class,
+                    'name' => 'thirdparty',
+                    'base_path' => '/api/1.0/thirdparty/thirdparty',
+                    'base_role' => \Chill\ThirdPartyBundle\Security\Authorization\ThirdPartyVoter::class,
+                    //'controller' => \Chill\ThirdPartyBundle\Controller\ThirdPartyApiController::class,
+                    'actions' => [
+                        '_index' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                                Request::METHOD_POST => true,
+                            ],
+                        ],
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                                Request::METHOD_POST=> true,
+                            ],
+                            'roles' => [
+                                Request::METHOD_GET => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::SHOW,
+                                Request::METHOD_HEAD => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::SHOW,
+                                Request::METHOD_POST => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE,
+
+                            ],
+                        ]
+                    ]
+                ]
+            ],
         ));
     }
-    
+
     protected function prependRoleHierarchy(ContainerBuilder $container)
     {
         $container->prependExtensionConfig('security', array(
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 277202324..0b0b3e56b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -30,6 +30,7 @@ use Chill\MainBundle\Entity\Center;
 use Symfony\Component\Validator\Constraints as Assert;
 use Chill\MainBundle\Entity\Address;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * ThirdParty is a party recorded in the database.
@@ -59,6 +60,7 @@ class ThirdParty
      * @var string
      * @ORM\Column(name="name", type="string", length=255)
      * @Assert\Length(min="2")
+     * @Groups({"read"})
      */
     private $name;
 
@@ -128,6 +130,7 @@ class ThirdParty
      * @Assert\Regex("/^([\+{1}])([0-9\s*]{4,20})$/",
      *   message="Invalid phone number: it should begin with the international prefix starting with ""+"", hold only digits and be smaller than 20 characters. Ex: +33123456789"
      * )
+     * @Groups({"read"})
      */
     private $telephone;
 
@@ -135,6 +138,7 @@ class ThirdParty
      * @var string|null
      * @ORM\Column(name="email", type="string", length=255, nullable=true)
      * @Assert\Email(checkMX=false)
+     * @Groups({"read"})
      */
     private $email;
 
@@ -143,10 +147,12 @@ class ThirdParty
      * @ORM\ManyToOne(targetEntity="\Chill\MainBundle\Entity\Address",
      *   cascade={"persist", "remove"})
      * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
+     * @Groups({"read"})
      */
     private $address;
 
     /**
+     * Soft-delete flag
      * @var boolean
      * @ORM\Column(name="active", type="boolean", options={"defaut": true})
      */
@@ -493,11 +499,28 @@ class ThirdParty
         return $this;
     }
 
+    /**
+     * Mechanism to differentiate children and parents
+     */
     public function isLeaf(): bool
     {
         return $this->children->count() !== 0;
     }
 
+    /**
+     * isLeaf aliases
+     */
+    public function isChild():bool
+    {
+        return $this->isLeaf();
+    }
+
+    public function isParent():bool
+    {
+        return !$this->isLeaf();
+    }
+
+
     /**
      * @return Collection
      */
@@ -522,7 +545,8 @@ class ThirdParty
      */
     public function removeChild(ThirdParty $child): self
     {
-        $this->categories->removeElement($child);
+        $this->children->removeElement($child);
+        $this->active = false;
         return $this;
     }
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index 9db5013c3..2ec113eb9 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -2,6 +2,7 @@
 
 namespace Chill\ThirdPartyBundle\Form;
 
+use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
@@ -9,7 +10,9 @@ use Chill\ThirdPartyBundle\Entity\ThirdPartyCivility;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyProfession;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
@@ -21,8 +24,7 @@ use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
-use Chill\MainBundle\Form\Type\AddressType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 
 
 class ThirdPartyType extends AbstractType
@@ -35,16 +37,20 @@ class ThirdPartyType extends AbstractType
 
     protected TranslatableStringHelper $translatableStringHelper;
 
+    protected ObjectManager $om;
+
     public function __construct(
         AuthorizationHelper $authorizationHelper,
         TokenStorageInterface $tokenStorage,
         ThirdPartyTypeManager $typesManager,
-        TranslatableStringHelper $translatableStringHelper
+        TranslatableStringHelper $translatableStringHelper,
+        ObjectManager $om
     ) {
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
         $this->typesManager = $typesManager;
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->om = $om;
     }
 
     /**
@@ -56,6 +62,35 @@ class ThirdPartyType extends AbstractType
         foreach ($this->typesManager->getProviders() as $key => $provider) {
             $types['chill_3party.key_label.'.$key] = $key;
         }
+        if (count($types) === 1) {
+            $builder
+                ->add('type', HiddenType::class, [
+                    'data' => array_values($types)
+                ])
+                ->get('type')
+                    ->addModelTransformer(new CallbackTransformer(
+                    function (?array $typeArray): ?string {
+                        if (null === $typeArray) {
+                            return null;
+                        }
+                        return implode(',', $typeArray);
+                    },
+                    function (?string $typeStr): ?array {
+                        if (null === $typeStr) {
+                            return null;
+                        }
+                        return explode(',', $typeStr);
+                    }
+                ))
+            ;
+        } else {
+            $builder->add('type', ChoiceType::class, [
+                'choices' => $types,
+                'expanded' => true,
+                'multiple' => true,
+                'label'    => 'thirdparty.Type'
+            ]);
+        }
 
         $builder
             ->add('name', TextType::class, [
@@ -75,12 +110,6 @@ class ThirdPartyType extends AbstractType
                 'multiple' => true,
                 'attr' => ['class' => 'select2']
             ])
-            ->add('type', ChoiceType::class, [
-                'choices' => $types,
-                'expanded' => true,
-                'multiple' => true,
-                'label'    => 'thirdparty.Type'
-            ])
             ->add('telephone', TextType::class, [
                 'label' => 'Phonenumber',
                 'required' => false
@@ -88,11 +117,6 @@ class ThirdPartyType extends AbstractType
             ->add('email', EmailType::class, [
                 'required' => false
             ])
-            ->add('address', AddressType::class, [
-                'has_valid_from' => false,
-                'null_if_empty' => true,
-                'required' => false
-            ])
             ->add('active', ChoiceType::class, [
                 'label' => 'thirdparty.Status',
                 'choices' => [
@@ -113,8 +137,29 @@ class ThirdPartyType extends AbstractType
             ])
         ;
 
+        $builder
+            ->add('address', HiddenType::class)
+            ->get('address')
+                ->addModelTransformer(new CallbackTransformer(
+                    function (?Address $address): string {
+                        if (null === $address) {
+                            return '';
+                        }
+                        return $address->getId();
+                    },
+                    function (?string $addressId): ?Address {
+                        if (null === $addressId) {
+                            return null;
+                        }
+                        return $this->om
+                            ->getRepository(Address::class)
+                            ->findOneBy(['id' => (int) $addressId]);
+                    }
+                ))
+        ;
+
         // Contact Person ThirdParty (child)
-        if ($options['data']->isLeaf()) {
+        if ($options['data']->isChild()) {
             $builder
                 ->add('civility', EntityType::class, [
                     'label' => 'thirdparty.Civility',
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js
new file mode 100644
index 000000000..ed91ef415
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js
@@ -0,0 +1,36 @@
+/*
+* GET a thirdparty by id
+*/
+const getThirdparty = (id) => {
+   const url = `/api/1.0/thirdparty/thirdparty/${id}.json`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { 
+             return response.json(); 
+            }
+         throw Error('Error with request resource response');
+      });
+};
+
+/*
+* POST a new person
+*/
+const postThirdparty = (body) => {
+   const url = `/api/1.0/thirdparty/thirdparty.json`;
+   return fetch(url, {
+         method: 'POST',
+         headers: {
+           'Content-Type': 'application/json;charset=utf-8'
+         },
+         body: JSON.stringify(body)
+      })
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response');
+      });
+};
+   
+export { 
+   getThirdparty, 
+   postThirdparty 
+};
\ No newline at end of file
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index c710cedfb..720d9903b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -26,7 +26,7 @@
                     <time v-else-if="thirdparty.deathdate" datetime="{{ thirdparty.deathdate.datetime }}" title="{{ thirdparty.deathdate }}">
                         {{ birthdate }} - {{ deathdate }}
                     </time>
-                    <span class="age">{{ thirdparty.age }}</span>
+                    <span v-if="options.addAge == true" class="age">{{ thirdparty.age }}</span>
                 </p>
             </div>
         </div>
@@ -53,8 +53,8 @@
                  </ul>
               </div>
            </div>
-
         </div>
+
     </div>
     </section>
 </div>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 19f81c01c..1b1207131 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -1,22 +1,109 @@
 <template>
-   <div v-if="action === 'show'">
-      show
-      thirdparty
-      {{ id }}
+  <div v-if="action === 'show'">
+      <div class="flex-table">
+         <third-party-render-box
+            :thirdparty="thirdparty"
+            :options="{
+               addInfo: true,
+               addEntity: false,
+               addAltNames: true,
+               addId: true,
+               addLink: false,
+               addAge: false,
+               hLevel: 3,
+               addCenter: true,
+               addNoData: true,
+               isMultiline: true
+            }"
+         ></third-party-render-box>
+      </div>
    </div>
    <div v-else-if="action === 'edit' || action === 'create'">
-      {{ action }}
-      thirdparty
-      {{ id }}
+      
+      <div class="form-floating mb-3">
+         <input class="form-control form-control-lg" id="firstname" v-model="thirdparty.firstName" v-bind:placeholder="$t('thirdparty.firstname')" />
+         <label for="firstname">{{ $t('thirdparty.firstname') }}</label>
+      </div>
+
+      <div class="form-floating mb-3">
+         <input class="form-control form-control-lg" id="lastname" v-model="thirdparty.lastName" v-bind:placeholder="$t('thirdparty.lastname')" />
+         <label for="lastname">{{ $t('thirdparty.lastname') }}</label>
+      </div>
+
+      <div class="input-group mb-3">
+         <span class="input-group-text" id="email"><i class="fa fa-fw fa-envelope"></i></span>
+         <input class="form-control form-control-lg"
+            v-model="thirdparty.email"
+            v-bind:placeholder="$t('thirdparty.email')"
+            v-bind:aria-label="$t('thirdparty.email')"
+            aria-describedby="email" />
+      </div>
+
+      <div class="input-group mb-3">
+         <span class="input-group-text" id="phonenumber"><i class="fa fa-fw fa-phone"></i></span>
+         <input class="form-control form-control-lg"
+            v-model="thirdparty.phonenumber"
+            v-bind:placeholder="$t('thirdparty.phonenumber')"
+            v-bind:aria-label="$t('thirdparty.phonenumber')"
+            aria-describedby="phonenumber" />
+      </div>
+
    </div>
 </template>
 
 <script>
+import ThirdPartyRenderBox from '../Entity/ThirdPartyRenderBox.vue';
+import { getThirdparty, postThirdparty } from '../../_api/OnTheFly';
+
 export default {
    name: "OnTheFlyThirdParty",
-   props: ['id', 'type', 'action']
+   props: ['id', 'type', 'action'],
+   components: {
+      ThirdPartyRenderBox,
+   },
+   data: function() {
+      return {
+         thirdparty: {
+            type: 'thirdparty'
+         }
+      }
+   },
+   methods: {
+      loadThirdparty(){
+         getThirdparty(this.id).then(thirdparty => new Promise((resolve, reject) => {
+            this.thirdparty = thirdparty;
+            resolve();
+         }));
+      },
+      postData() {
+         postThirdparty(this.thirdparty).then(thirdparty => new Promise((resolve, reject) => {
+            this.thirdparty = thirdparty;
+            resolve();
+         }))
+      }
+   },
+   mounted() {
+      if (this.action !== 'create'){
+         this.loadThirdparty();
+      }
+   },
 }
 </script>
 
-<style lang="css" scoped>
+<style lang="scss" scoped>
+div.flex-table {
+   div.item-bloc {
+      div.item-row {
+         div.item-col:last-child {
+            justify-content: flex-start;
+         }
+      }
+   }
+}
+dl {
+   dd {
+      margin-left: 1em;
+   }
+}
 </style>
+
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
index 265931e81..fa9ad8b8b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
@@ -26,7 +26,7 @@
                     <span>{{ pagination.totalItems }}</span> {{ 'third parties'|trans }}
                 </label>
 
-                <table class="table table-striped table-hover align-middle">
+                <table class="table table-bordered border-dark table-striped align-middle">
                     <thead>
                         <tr>
                             <th class="chill-pink" style="width: 35px;"></th>
@@ -69,12 +69,12 @@
                                 <ul class="record_actions">
                                     {% if is_granted('CHILL_3PARTY_3PARTY_UPDATE', tp) %}
                                         <li>
-                                            <a href="{{ chill_path_add_return_path('chill_3party_3party_update', { 'thirdparty_id': tp.id }) }}" class="btn btn-update"></a>
+                                            <a href="{{ chill_path_add_return_path('chill_3party_3party_update', { 'thirdparty_id': tp.id }) }}" class="btn btn-sm btn-update"></a>
                                         </li>
                                     {% endif %}
                                     {% if is_granted('CHILL_3PARTY_3PARTY_SHOW', tp) %}
                                         <li>
-                                            <a href="{{ chill_path_add_return_path('chill_3party_3party_show', { 'thirdparty_id': tp.id }) }}" class="btn btn-show"></a>
+                                            <a href="{{ chill_path_add_return_path('chill_3party_3party_show', { 'thirdparty_id': tp.id }) }}" class="btn btn-sm btn-show"></a>
                                         </li>
                                     {% endif %}
                                 </ul>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
index 1997466c2..002cc87e8 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
@@ -26,12 +26,39 @@
                 {{ form_row(form.profession) }}
             {% endif %}
 
-            {{ form_row(form.categories) }}
             {{ form_row(form.type) }}
+            {{ form_row(form.categories) }}
 
             {{ form_row(form.telephone) }}
             {{ form_row(form.email) }}
-            {{ form_row(form.address) }}
+
+            <div class="mb-3 row">
+                {{ form_label(form.address) }}
+                {{ form_widget(form.address) }}
+                <div class="col-sm-8">
+                    {% if thirdParty.address %}
+                        {# include vue_address component #}
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'thirdparty', id: thirdParty.id },
+                            mode: 'edit',
+                            addressId: thirdParty.address.id,
+                            buttonSize: 'btn-sm',
+                        } %}
+                        {#
+                            backUrl: path('chill_3party_3party_new'),
+                        #}
+                    {% else %}
+                        {# include vue_address component #}
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'thirdparty', id: thirdParty.id },
+                            mode: 'new',
+                            buttonSize: 'btn-sm',
+                            buttonText: 'Create a new address',
+                            modalTitle: 'Create a new address',
+                        } %}
+                    {% endif %}
+                </div>
+            </div>
 
             {{ form_row(form.comment) }}
             {{ form_row(form.centers) }}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
index 6f647f6b6..d711bdefa 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
@@ -82,7 +82,7 @@
                     {% if thirdParty.address == null %}
                         <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
                     {%  else %}
-                        {{ thirdParty.address|chill_entity_render_box({'with_valid_from': false }) }}
+                        {{ thirdParty.address|chill_entity_render_box({'with_valid_from': false, 'extended_infos': true }) }}
                     {% endif %}
                 </dd>
 
@@ -103,7 +103,7 @@
             <ul class="record_actions sticky-form-buttons">
                 <li class="cancel">
                     <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_3party_3party_index') }}">
-                        {{ 'Cancel'|trans }}
+                        {{ 'Back to the list'|trans }}
                     </a>
                 </li>
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index 85c8dd41d..01837db05 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -5,7 +5,7 @@
 {% block content %}
 <div class="thirdparty-edit my-5">
     <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
+        <div class="col-md-10">
 
             <h1>
                 {{ 'Update third party %name%'|trans({ '%name%': thirdParty.name }) }}
@@ -43,12 +43,39 @@
                 {{ form_row(form.profession) }}
             {% endif %}
 
-            {{ form_row(form.categories) }}
             {{ form_row(form.type) }}
+            {{ form_row(form.categories) }}
 
             {{ form_row(form.telephone) }}
             {{ form_row(form.email) }}
-            {{ form_row(form.address) }}
+
+            <div class="mb-3 row">
+                {{ form_label(form.address) }}
+                {{ form_widget(form.address) }}
+                <div class="col-sm-8">
+                    {% if thirdParty.address %}
+                        {# include vue_address component #}
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'thirdparty', id: thirdParty.id },
+                            mode: 'edit',
+                            addressId: thirdParty.address.id,
+                            buttonSize: 'btn-sm',
+                        } %}
+                        {#
+                            backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty.id }),
+                        #}
+                    {% else %}
+                        {# include vue_address component #}
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'thirdparty', id: thirdParty.id },
+                            mode: 'new',
+                            buttonSize: 'btn-sm',
+                            buttonText: 'Create a new address',
+                            modalTitle: 'Create a new address',
+                        } %}
+                    {% endif %}
+                </div>
+            </div>
 
             {{ form_row(form.comment) }}
             {{ form_row(form.centers) }}
diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
index 203331cb7..b8c3e2827 100644
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -21,6 +21,8 @@ class ThirdPartyNormalizer implements NormalizerInterface, NormalizerAwareInterf
         $data['id'] = $thirdParty->getId();
         $data['address'] = $this->normalizer->normalize($thirdParty->getAddress(), $format,
             [ 'address_rendering' => 'short' ]);
+        $data['phonenumber'] = $thirdParty->getTelephone();
+        $data['email'] = $thirdParty->getEmail();
 
         return $data;
     }
diff --git a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
new file mode 100644
index 000000000..957bf9324
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
@@ -0,0 +1,43 @@
+---
+openapi: "3.0.0"
+info:
+  version: "1.0.0"
+  title: "Chill api"
+  description: "Api documentation for chill. Currently, work in progress"
+servers:
+  - url: "/api"
+    description: "Your current dev server"
+
+paths:
+  /1.0/thirdparty/thirdparty.json:
+    get:
+      tags:
+        - thirdparty
+      summary: Return a list of all thirdparty items
+      responses:
+        200:
+          description: "ok"
+        401:
+          description: "Unauthorized"
+
+  /1.0/thirdparty/thirdparty/{id}.json:
+    get:
+      tags:
+        - thirdparty
+      summary: Return a thirdparty item by id
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: The thirdparty id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      responses:
+        200:
+          description: "ok"
+        404:
+          description: "not found"
+        401:
+          description: "Unauthorized"
diff --git a/src/Bundle/ChillThirdPartyBundle/config/services/form.yaml b/src/Bundle/ChillThirdPartyBundle/config/services/form.yaml
index de62b197c..8ff604769 100644
--- a/src/Bundle/ChillThirdPartyBundle/config/services/form.yaml
+++ b/src/Bundle/ChillThirdPartyBundle/config/services/form.yaml
@@ -5,6 +5,7 @@ services:
             $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
             $typesManager: '@Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager'
             $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
+            $om: '@doctrine.orm.entity_manager'
         tags:
             - { name: form.type }
 
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index dd4cef51f..7878ec196 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -12,7 +12,7 @@ thirdparty.No_phonenumber: Aucun numéro de téléphone
 thirdparty.No_email: Aucun email
 thirdparty.No_comment: Aucun commentaire
 
-thirdparty.NameCompany:  Raison sociale
+thirdparty.NameCompany:  Service/Département
 thirdparty.Acronym:  Sigle
 thirdparty.Categories:  Catégories
 thirdparty.Child:  Personne de contact