diff --git a/lib/classes/eventsmanager/broker.class.php b/lib/classes/eventsmanager/broker.class.php
index 4f3ea9fbf6..b8643a74db 100644
--- a/lib/classes/eventsmanager/broker.class.php
+++ b/lib/classes/eventsmanager/broker.class.php
@@ -12,10 +12,16 @@ class eventsmanager_broker
    * @var appbox
    */
   protected $appbox;
+  /**
+   *
+   * @var \Alchemy\Phrasea\Core 
+   */
+  protected $core;
 
   private function __construct(appbox &$appbox)
   {
     $this->appbox = $appbox;
+    $this->core = bootstrap::getCore();
 
     return $this;
   }
@@ -50,7 +56,7 @@ class eventsmanager_broker
         {
           continue;
         }
-        $this->pool_classes[$classname] = new $classname($this->appbox, $this->appbox->get_registry(), $this);
+        $this->pool_classes[$classname] = new $classname($this->appbox, $this->core, $this);
 
         foreach ($this->pool_classes[$classname]->get_events() as $event)
           $this->bind($event, $classname);
@@ -100,7 +106,7 @@ class eventsmanager_broker
             {
               continue;
             }
-            $obj = new $classname($this->appbox, $this->appbox->get_registry(), $this);
+            $obj = new $classname($this->appbox, $this->core, $this);
 
             $ret[$classname] = $obj->get_name();
           }
diff --git a/lib/classes/eventsmanager/eventAbstract.class.php b/lib/classes/eventsmanager/eventAbstract.class.php
index 40373f8d44..b1f97412a3 100644
--- a/lib/classes/eventsmanager/eventAbstract.class.php
+++ b/lib/classes/eventsmanager/eventAbstract.class.php
@@ -15,6 +15,11 @@ abstract class eventsmanager_eventAbstract
    * @var registryInterface
    */
   protected $registry;
+  /**
+   *
+   * @var \Alchemy\Phrasea\Core 
+   */
+  protected $core;
   /**
    *
    * @var eventsmanager
@@ -22,10 +27,11 @@ abstract class eventsmanager_eventAbstract
   protected $broker;
 
 
-  public function __construct(appbox &$appbox, registryInterface $registry, eventsmanager_broker &$broker)
+  public function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
   {
     $this->appbox = $appbox;
-    $this->registry = $registry;
+    $this->registry = $core->getRegistry();
+    $this->core = $core;
     $this->broker = $broker;
 
     return $this;
diff --git a/lib/classes/eventsmanager/notify/orderdeliver.class.php b/lib/classes/eventsmanager/notify/orderdeliver.class.php
index b441f88e1f..1470b49d6a 100644
--- a/lib/classes/eventsmanager/notify/orderdeliver.class.php
+++ b/lib/classes/eventsmanager/notify/orderdeliver.class.php
@@ -28,10 +28,10 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
    *
    * @return notify_orderdeliver
    */
-  function __construct(appbox &$appbox, registryInterface &$registry, eventsmanager_broker &$broker)
+  function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
   {
     $this->group = _('Commande');
-    parent::__construct($appbox, $registry, $broker);
+    parent::__construct($appbox, $core, $broker);
 
     return $this;
   }
@@ -147,7 +147,10 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
 
     try
     {
-      $basket = basket_adapter::getInstance($this->appbox, $ssel_id, $this->appbox->get_session()->get_usr_id());
+      $em = $this->core->getEntityManager();
+      $repository = $em->getRepository('\Entities\Basket');
+      
+      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser());
     }
     catch (Exception $e)
     {
@@ -159,7 +162,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
                 $sender, $n,
                 '<a href="/lightbox/compare/'
                 . (string) $sx->ssel_id . '/" target="_blank">'
-                . $basket->get_name() . '</a>'
+                . $basket->getName() . '</a>'
         )
         , 'class' => ''
     );
@@ -196,7 +199,10 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
   {
     try
     {
-      $basket = basket_adapter::getInstance($this->appbox, $ssel_id, $this->appbox->get_session()->get_usr_id());
+      $em = $this->core->getEntityManager();
+      $repository = $em->getRepository('\Entities\Basket');
+      
+      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser());
     }
     catch (Exception $e)
     {
@@ -204,7 +210,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
     }
     $subject = sprintf(
                     _('push::mail:: Reception de votre commande %s'),
-                    $basket->get_name()
+                    $basket->getName()
     );
 
     $body = "<div>"
diff --git a/lib/classes/eventsmanager/notify/ordernotdelivered.class.php b/lib/classes/eventsmanager/notify/ordernotdelivered.class.php
index 537d32ecdb..a1e737983e 100644
--- a/lib/classes/eventsmanager/notify/ordernotdelivered.class.php
+++ b/lib/classes/eventsmanager/notify/ordernotdelivered.class.php
@@ -24,10 +24,10 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac
    */
   public $events = array('__ORDER_NOT_DELIVERED__');
 
-  function __construct(appbox &$appbox, registryInterface &$registry, eventsmanager_broker &$broker)
+  function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
   {
     $this->group = _('Commande');
-    parent::__construct($appbox, $registry, $broker);
+    parent::__construct($appbox, $core, $broker);
 
     return $this;
   }
diff --git a/lib/classes/eventsmanager/notify/validate.class.php b/lib/classes/eventsmanager/notify/validate.class.php
index 2de351364e..ebe965a58a 100644
--- a/lib/classes/eventsmanager/notify/validate.class.php
+++ b/lib/classes/eventsmanager/notify/validate.class.php
@@ -28,10 +28,10 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
    *
    * @return notify_validate
    */
-  function __construct(appbox &$appbox, registryInterface &$registry, eventsmanager_broker &$broker)
+  function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
   {
     $this->group = _('Validation');
-    parent::__construct($appbox, $registry, $broker);
+    parent::__construct($appbox, $core, $broker);
 
     return $this;
   }
@@ -140,9 +140,12 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
 
     try
     {
-      $basket = basket_adapter::getInstance($this->appbox, $ssel_id,$this->appbox->get_session()->get_usr_id());
-      $basket_name = (trim($basket->get_name()) != '' ?
-                      $basket->get_name() : _('Une selection'));
+      $em = $this->core->getEntityManager();
+      $repository = $em->getRepository('\Entities\Basket');
+      
+      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser());
+
+      $basket_name = trim($basket->getName()) ?: _('Une selection');
     }
     catch (Exception $e)
     {
diff --git a/lib/classes/eventsmanager/notify/validationdone.class.php b/lib/classes/eventsmanager/notify/validationdone.class.php
index 107409993e..172ece27f8 100644
--- a/lib/classes/eventsmanager/notify/validationdone.class.php
+++ b/lib/classes/eventsmanager/notify/validationdone.class.php
@@ -28,10 +28,10 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
    *
    * @return notify_validationdone
    */
-  function __construct(appbox &$appbox, registryInterface &$registry, eventsmanager_broker &$broker)
+  function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
   {
     $this->group = _('Validation');
-    parent::__construct($appbox, $registry, $broker);
+    parent::__construct($appbox, $core, $broker);
 
     return $this;
   }
@@ -143,7 +143,10 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
 
     try
     {
-      $basket = basket_adapter::getInstance($this->appbox, $ssel_id,$this->appbox->get_session()->get_usr_id());
+      $em = $this->core->getEntityManager();
+      $repository = $em->getRepository('\Entities\Basket');
+      
+      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser());
     }
     catch (Exception $e)
     {
@@ -156,7 +159,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
                 $sender,
                 '<a href="/lightbox/validate/'
                 . (string) $sx->ssel_id . '/" target="_blank">'
-                . $basket->get_name() . '</a>'
+                . $basket->getName() . '</a>'
         )
         , 'class' => ''
     );
@@ -193,7 +196,10 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
   {
     try
     {
-      $basket = basket_adapter::getInstance($this->appbox, $ssel_id,$this->appbox->get_session()->get_usr_id());
+      $em = $this->core->getEntityManager();
+      $repository = $em->getRepository('\Entities\Basket');
+      
+      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser());
     }
     catch (Exception $e)
     {
@@ -203,7 +209,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
     $subject = sprintf(
                     _('push::mail:: Rapport de validation de %1$s pour %2$s'),
                     $to['name'],
-                    $basket->get_name()
+                    $basket->getName()
     );
 
     $body = "<div>" . sprintf(
diff --git a/lib/classes/eventsmanager/notify/validationreminder.class.php b/lib/classes/eventsmanager/notify/validationreminder.class.php
index 934b87eccc..548bb48a6b 100644
--- a/lib/classes/eventsmanager/notify/validationreminder.class.php
+++ b/lib/classes/eventsmanager/notify/validationreminder.class.php
@@ -28,10 +28,10 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
    *
    * @return notify_validationreminder
    */
-  function __construct(appbox &$appbox, registryInterface &$registry, eventsmanager_broker &$broker)
+  function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
   {
     $this->group = _('Validation');
-    parent::__construct($appbox, $registry, $broker);
+    parent::__construct($appbox, $core, $broker);
 
     return $this;
   }
@@ -156,9 +156,12 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
 
     try
     {
-      $basket = basket_adapter::getInstance($this->appbox, $ssel_id, $this->appbox->get_session()->get_usr_id());
-      $basket_name = (trim($basket->get_name()) != '' ?
-                      $basket->get_name() : _('Une selection'));
+      $em = $this->core->getEntityManager();
+      $repository = $em->getRepository('\Entities\Basket');
+      
+      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser());
+      
+      $basket_name = trim($basket->getName()) ? : _('Une selection');
     }
     catch (Exception $e)
     {