diff --git a/main/admin/extra_field_workflow.php b/main/admin/extra_field_workflow.php
index 0feb2fdf26..9a7411619a 100644
--- a/main/admin/extra_field_workflow.php
+++ b/main/admin/extra_field_workflow.php
@@ -4,7 +4,7 @@
 /**
  *  @package chamilo.admin
  */
-
+use \ChamiloSession as Session;
 // Language files that need to be included.
 $language_file = array('admin');
 
@@ -122,7 +122,7 @@ $options[0] = get_lang('SelectAnOption');
 ksort($options);
 $form->addElement('select', 'status', get_lang('SelectRole'), $options, array('onclick' => 'changeStatus(this)'));
 
-$checks = $app['orm.em']->getRepository('ChamiloLMS\Entity\ExtraFieldOptionRelFieldOption')->findBy(array('fieldId' => $field_id, 'roleId' => $roleId));
+$checks = Database::getManager()->getRepository('ChamiloLMSCoreBundle:ExtraFieldOptionRelFieldOption')->findBy(array('fieldId' => $field_id, 'roleId' => $roleId));
 $includedFields = array();
 if (!empty($checks)) {
     foreach ($checks as $availableField) {
@@ -173,10 +173,11 @@ $form->display();
 if ($form->validate()) {
     $values = $form->getSubmitValues();
     $result = $values['hidden_extra_field_status'];
+    $em = Database::getManager();
     if (!empty($result)) {
         foreach ($result as $id => $items) {
             foreach ($items as $subItemId => $value) {
-                $extraFieldOptionRelFieldOption = $app['orm.em']->getRepository('ChamiloLMS\Entity\ExtraFieldOptionRelFieldOption')->findOneBy(
+                $extraFieldOptionRelFieldOption = $em->getRepository('ChamiloLMSCoreBundle:ExtraFieldOptionRelFieldOption')->findOneBy(
                     array(
                     'fieldId' => $field_id,
                     'fieldOptionId' => $subItemId,
@@ -187,23 +188,23 @@ if ($form->validate()) {
 
                 if ($value == 1) {
                     if (empty($extraFieldOptionRelFieldOption)) {
-                        $extraFieldOptionRelFieldOption = new \ChamiloLMS\Entity\ExtraFieldOptionRelFieldOption();
+                        $extraFieldOptionRelFieldOption = new \ChamiloLMSCoreBundle:ExtraFieldOptionRelFieldOption();
                         $extraFieldOptionRelFieldOption->setFieldId($field_id);
                         $extraFieldOptionRelFieldOption->setFieldOptionId($subItemId);
                         $extraFieldOptionRelFieldOption->setRelatedFieldOptionId($id);
                         $extraFieldOptionRelFieldOption->setRoleId($roleId);
-                        $app['orm.ems']['db_write']->persist($extraFieldOptionRelFieldOption);
+                        $em->persist($extraFieldOptionRelFieldOption);
                     }
                 } else {
 
                     if ($extraFieldOptionRelFieldOption) {
-                        $app['orm.ems']['db_write']->remove($extraFieldOptionRelFieldOption);
+                        $em->remove($extraFieldOptionRelFieldOption);
                     }
                 }
 
             }
         }
-        $app['orm.ems']['db_write']->flush();
+        $em->flush();
         header('Location:'.api_get_self().'?'.$params);
         exit;
     }
diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php
index 40b87536b1..fd8c4b67ca 100644
--- a/main/admin/user_edit.php
+++ b/main/admin/user_edit.php
@@ -301,7 +301,7 @@ if ($expiration_date == '0000-00-00 00:00:00') {
     $user_data['expiration_date']['i'] = substr($expiration_date, 14, 2);
 }
 
-$user = $app['orm.em']->getRepository('ChamiloLMS\Entity\User')->find($user_data['user_id']);
+$user = Database::getManager()->getRepository('ChamiloLMSCoreBundle:User')->find($user_data['user_id']);
 
 $roles = $user->getRoles();
 
diff --git a/main/inc/lib/extra_field_value.lib.php b/main/inc/lib/extra_field_value.lib.php
index 86971f169f..5b04b5ade4 100644
--- a/main/inc/lib/extra_field_value.lib.php
+++ b/main/inc/lib/extra_field_value.lib.php
@@ -290,8 +290,8 @@ class ExtraFieldValue extends Model
                             $extraFieldValue->setFieldValue($params['field_value']);
                             $extraFieldValue->setFieldId($params['field_id']);
                             $extraFieldValue->setTms(api_get_utc_datetime(null, false, true));
-                            $app['orm.ems']['db_write']->persist($extraFieldValue);
-                            $app['orm.ems']['db_write']->flush();
+                            Database::getManager()->persist($extraFieldValue);
+                            Database::getManager()->flush();
                         }
                     }
                 } else {
@@ -323,22 +323,22 @@ class ExtraFieldValue extends Model
                     global $app;
                     switch($this->type) {
                         case 'question':
-                            $extraFieldValue = $app['orm.ems']['db_write']->getRepository('ChamiloLMSCoreBundle:QuestionFieldValues')->find($field_values['id']);
+                            $extraFieldValue = Database::getManager()->getRepository('ChamiloLMSCoreBundle:QuestionFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setQuestionId($params[$this->handler_id]);
                             break;
                         case 'course':
-                            $extraFieldValue = $app['orm.ems']['db_write']->getRepository('ChamiloLMSCoreBundle:CourseFieldValues')->find($field_values['id']);
+                            $extraFieldValue = Database::getManager()->getRepository('ChamiloLMSCoreBundle:CourseFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setCourseCode($params[$this->handler_id]);
                             break;
                         case 'user':
-                            $extraFieldValue = $app['orm.ems']['db_write']->getRepository('ChamiloLMSCoreBundle:UserFieldValues')->find($field_values['id']);
+                            $extraFieldValue = Database::getManager()->getRepository('ChamiloLMSCoreBundle:UserFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setAuthorId(api_get_user_id());
                             break;
                         case 'session':
-                            $extraFieldValue = $app['orm.ems']['db_write']->getRepository('ChamiloLMSCoreBundle:SessionFieldValues')->find($field_values['id']);
+                            $extraFieldValue = Database::getManager()->getRepository('ChamiloLMSCoreBundle:SessionFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setSessionId($params[$this->handler_id]);
                             break;
@@ -361,8 +361,8 @@ class ExtraFieldValue extends Model
                             $extraFieldValue->setFieldValue($params['field_value']);
                             $extraFieldValue->setFieldId($params['field_id']);
                             $extraFieldValue->setTms(api_get_utc_datetime(null, false, true));
-                            $app['orm.ems']['db_write']->persist($extraFieldValue);
-                            $app['orm.ems']['db_write']->flush();
+                            Database::getManager()->persist($extraFieldValue);
+                            Database::getManager()->flush();
                         }
                     }
                 } else {
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index acb0ff213d..97d05e4f6e 100644
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -790,12 +790,11 @@ class UserManager
             self::change_active_state($user_id, $active);
         }
 
-        global $app;
         // Adding user
         /** @var ChamiloLMS\Entity\User $user */
-        $em = $app['orm.ems']['db_write'];
-        $user = $em->getRepository('ChamiloLMS\Entity\User')->find($user_id);
-        $role = $em->getRepository('ChamiloLMS\Entity\Role')->find($status);
+        $em = Database::getManager()
+        $user = $em->getRepository('ChamiloLMSCoreBundle:User')->find($user_id);
+        $role = $em->getRepository('ChamiloLMSCoreBundle:Role')->find($status);
 
         $user->getRolesObj()->remove(0);
         $user->getRolesObj()->add($role);