diff --git a/src/CoreBundle/Controller/AccountController.php b/src/CoreBundle/Controller/AccountController.php
index 34707dbf93..6db4443bea 100644
--- a/src/CoreBundle/Controller/AccountController.php
+++ b/src/CoreBundle/Controller/AccountController.php
@@ -5,6 +5,7 @@
 namespace Chamilo\CoreBundle\Controller;
 
 use Chamilo\CoreBundle\Repository\IllustrationRepository;
+use Chamilo\CoreBundle\Traits\ControllerTrait;
 use Chamilo\ThemeBundle\Model\UserInterface;
 use Chamilo\UserBundle\Form\ProfileType;
 use FOS\UserBundle\Model\UserManagerInterface;
@@ -21,6 +22,8 @@ use Symfony\Component\Routing\Annotation\Route;
  */
 class AccountController extends BaseController
 {
+    use ControllerTrait;
+
     /**
      * @Route("/home", methods={"GET"}, name="chamilo_core_account_home")
      */
diff --git a/src/CoreBundle/Controller/ChatController.php b/src/CoreBundle/Controller/ChatController.php
index 18798a1f48..55e02fa0db 100644
--- a/src/CoreBundle/Controller/ChatController.php
+++ b/src/CoreBundle/Controller/ChatController.php
@@ -5,7 +5,9 @@
 namespace Chamilo\CoreBundle\Controller;
 
 use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
+use Chamilo\CoreBundle\Traits\ControllerTrait;
 use Chamilo\CoreBundle\Traits\CourseControllerTrait;
+use Chamilo\CoreBundle\Traits\ResourceControllerTrait;
 use Chamilo\CourseBundle\Controller\CourseControllerInterface;
 use Chamilo\CourseBundle\Repository\CChatConversationRepository;
 use Event;
@@ -19,6 +21,8 @@ use Symfony\Component\Routing\Annotation\Route;
  */
 class ChatController extends AbstractResourceController implements CourseControllerInterface
 {
+    use ControllerTrait;
+    use ResourceControllerTrait;
     use CourseControllerTrait;
 
     /**
diff --git a/src/CoreBundle/Controller/EditorController.php b/src/CoreBundle/Controller/EditorController.php
index 2397de0df5..f0904ee18b 100644
--- a/src/CoreBundle/Controller/EditorController.php
+++ b/src/CoreBundle/Controller/EditorController.php
@@ -14,6 +14,9 @@ use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
 use Chamilo\CoreBundle\Entity\Resource\AbstractResource;
 use Chamilo\CoreBundle\Repository\ResourceFactory;
 use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter;
+use Chamilo\CoreBundle\Traits\ControllerTrait;
+use Chamilo\CoreBundle\Traits\CourseControllerTrait;
+use Chamilo\CoreBundle\Traits\ResourceControllerTrait;
 use Chamilo\SettingsBundle\Manager\SettingsManager;
 use FM\ElfinderBundle\Connector\ElFinderConnector;
 use Symfony\Component\HttpFoundation\Request;
@@ -29,6 +32,10 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class EditorController extends BaseController
 {
+    use ControllerTrait;
+    use ResourceControllerTrait;
+    use CourseControllerTrait;
+
     /**
      * Get templates (left column when creating a document).
      *
diff --git a/src/CoreBundle/Controller/NewsController.php b/src/CoreBundle/Controller/NewsController.php
index 4503307b86..ef7648283d 100644
--- a/src/CoreBundle/Controller/NewsController.php
+++ b/src/CoreBundle/Controller/NewsController.php
@@ -4,6 +4,7 @@
 
 namespace Chamilo\CoreBundle\Controller;
 
+use Chamilo\CoreBundle\Traits\ControllerTrait;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
@@ -15,6 +16,8 @@ use Symfony\Component\Routing\Annotation\Route;
  */
 class NewsController extends BaseController
 {
+    use ControllerTrait;
+
     /**
      * @Route("/", name="news_index", methods={"GET"}, options={"expose"=true})
      */
diff --git a/src/CoreBundle/Entity/Resource/ResourceNode.php b/src/CoreBundle/Entity/Resource/ResourceNode.php
index 3105c22415..c4235e3eb8 100644
--- a/src/CoreBundle/Entity/Resource/ResourceNode.php
+++ b/src/CoreBundle/Entity/Resource/ResourceNode.php
@@ -147,7 +147,7 @@ class ResourceNode
     protected $illustration;
 
     /**
-     * @var ResourceComment[]
+     * @var ResourceComment[]|ArrayCollection
      *
      * @ORM\OneToMany(targetEntity="ResourceComment", mappedBy="resourceNode", cascade={"persist", "remove"})
      */
diff --git a/src/PageBundle/Controller/PageController.php b/src/PageBundle/Controller/PageController.php
index 93effe7419..6338ee9687 100644
--- a/src/PageBundle/Controller/PageController.php
+++ b/src/PageBundle/Controller/PageController.php
@@ -5,6 +5,7 @@
 namespace Chamilo\PageBundle\Controller;
 
 use Chamilo\CoreBundle\Controller\BaseController;
+use Chamilo\CoreBundle\Traits\ControllerTrait;
 use Chamilo\PageBundle\Entity\Block;
 use Chamilo\PageBundle\Entity\Page;
 use Chamilo\PageBundle\Entity\Snapshot;
@@ -25,6 +26,8 @@ use Symfony\Component\Routing\Annotation\Route;
  */
 class PageController extends BaseController
 {
+    use ControllerTrait;
+
     /**
      * @Route("/cms/page/latest/{number}")
      *