diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 23f25184b..82632cef5 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -193,6 +193,7 @@ return array(
     'Combodo\\iTop\\Application\\Helper\\FormHelper' => $baseDir . '/sources/Application/Helper/FormHelper.php',
     'Combodo\\iTop\\Application\\Helper\\Session' => $baseDir . '/sources/Application/Helper/Session.php',
     'Combodo\\iTop\\Application\\Helper\\WebResourcesHelper' => $baseDir . '/sources/Application/Helper/WebResourcesHelper.php',
+    'Combodo\\iTop\\Application\\Newsroom\\iTopNewsroomProvider' => $baseDir . '/sources/Application/Newsroom/iTopNewsroomProvider.php',
     'Combodo\\iTop\\Application\\Search\\AjaxSearchException' => $baseDir . '/sources/Application/Search/ajaxsearchexception.class.inc.php',
     'Combodo\\iTop\\Application\\Search\\CriterionConversionAbstract' => $baseDir . '/sources/Application/Search/criterionconversionabstract.class.inc.php',
     'Combodo\\iTop\\Application\\Search\\CriterionConversion\\CriterionToOQL' => $baseDir . '/sources/Application/Search/CriterionConversion/criteriontooql.class.inc.php',
@@ -392,6 +393,7 @@ return array(
     'Combodo\\iTop\\Controller\\Base\\Layout\\ActivityPanelController' => $baseDir . '/sources/Controller/Base/Layout/ActivityPanelController.php',
     'Combodo\\iTop\\Controller\\Base\\Layout\\ObjectController' => $baseDir . '/sources/Controller/Base/Layout/ObjectController.php',
     'Combodo\\iTop\\Controller\\Links\\LinkSetController' => $baseDir . '/sources/Controller/Links/LinkSetController.php',
+    'Combodo\\iTop\\Controller\\Newsroom\\iTopNewsroomController' => $baseDir . '/sources/Controller/Newsroom/iTopNewsroomController.php',
     'Combodo\\iTop\\Controller\\OAuth\\OAuthLandingController' => $baseDir . '/sources/Controller/OAuth/OAuthLandingController.php',
     'Combodo\\iTop\\Controller\\PreferencesController' => $baseDir . '/sources/Controller/PreferencesController.php',
     'Combodo\\iTop\\Controller\\TemporaryObjects\\TemporaryObjectController' => $baseDir . '/sources/Controller/TemporaryObjects/TemporaryObjectController.php',
@@ -3128,8 +3130,6 @@ return array(
     'iSelfRegister' => $baseDir . '/core/userrights.class.inc.php',
     'iTopConfigParser' => $baseDir . '/core/iTopConfigParser.php',
     'iTopMutex' => $baseDir . '/core/mutex.class.inc.php',
-    'iTopNewsroomController' => $baseDir . '/sources/Controller/Newsroom/iTopNewsroomController.php',
-    'iTopNewsroomProvider' => $baseDir . '/sources/Application/Newsroom/iTopNewsroomProvider.php',
     'iTopOwnershipLock' => $baseDir . '/core/ownershiplock.class.inc.php',
     'iTopOwnershipToken' => $baseDir . '/core/ownershiplock.class.inc.php',
     'iTopStandardURLMaker' => $baseDir . '/application/applicationcontext.class.inc.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 66e4e8c2d..8b2aab3af 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -567,6 +567,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Application\\Helper\\FormHelper' => __DIR__ . '/../..' . '/sources/Application/Helper/FormHelper.php',
         'Combodo\\iTop\\Application\\Helper\\Session' => __DIR__ . '/../..' . '/sources/Application/Helper/Session.php',
         'Combodo\\iTop\\Application\\Helper\\WebResourcesHelper' => __DIR__ . '/../..' . '/sources/Application/Helper/WebResourcesHelper.php',
+        'Combodo\\iTop\\Application\\Newsroom\\iTopNewsroomProvider' => __DIR__ . '/../..' . '/sources/Application/Newsroom/iTopNewsroomProvider.php',
         'Combodo\\iTop\\Application\\Search\\AjaxSearchException' => __DIR__ . '/../..' . '/sources/Application/Search/ajaxsearchexception.class.inc.php',
         'Combodo\\iTop\\Application\\Search\\CriterionConversionAbstract' => __DIR__ . '/../..' . '/sources/Application/Search/criterionconversionabstract.class.inc.php',
         'Combodo\\iTop\\Application\\Search\\CriterionConversion\\CriterionToOQL' => __DIR__ . '/../..' . '/sources/Application/Search/CriterionConversion/criteriontooql.class.inc.php',
@@ -766,6 +767,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Controller\\Base\\Layout\\ActivityPanelController' => __DIR__ . '/../..' . '/sources/Controller/Base/Layout/ActivityPanelController.php',
         'Combodo\\iTop\\Controller\\Base\\Layout\\ObjectController' => __DIR__ . '/../..' . '/sources/Controller/Base/Layout/ObjectController.php',
         'Combodo\\iTop\\Controller\\Links\\LinkSetController' => __DIR__ . '/../..' . '/sources/Controller/Links/LinkSetController.php',
+        'Combodo\\iTop\\Controller\\Newsroom\\iTopNewsroomController' => __DIR__ . '/../..' . '/sources/Controller/Newsroom/iTopNewsroomController.php',
         'Combodo\\iTop\\Controller\\OAuth\\OAuthLandingController' => __DIR__ . '/../..' . '/sources/Controller/OAuth/OAuthLandingController.php',
         'Combodo\\iTop\\Controller\\PreferencesController' => __DIR__ . '/../..' . '/sources/Controller/PreferencesController.php',
         'Combodo\\iTop\\Controller\\TemporaryObjects\\TemporaryObjectController' => __DIR__ . '/../..' . '/sources/Controller/TemporaryObjects/TemporaryObjectController.php',
@@ -3502,8 +3504,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'iSelfRegister' => __DIR__ . '/../..' . '/core/userrights.class.inc.php',
         'iTopConfigParser' => __DIR__ . '/../..' . '/core/iTopConfigParser.php',
         'iTopMutex' => __DIR__ . '/../..' . '/core/mutex.class.inc.php',
-        'iTopNewsroomController' => __DIR__ . '/../..' . '/sources/Controller/Newsroom/iTopNewsroomController.php',
-        'iTopNewsroomProvider' => __DIR__ . '/../..' . '/sources/Application/Newsroom/iTopNewsroomProvider.php',
         'iTopOwnershipLock' => __DIR__ . '/../..' . '/core/ownershiplock.class.inc.php',
         'iTopOwnershipToken' => __DIR__ . '/../..' . '/core/ownershiplock.class.inc.php',
         'iTopStandardURLMaker' => __DIR__ . '/../..' . '/application/applicationcontext.class.inc.php',
diff --git a/sources/Application/Newsroom/iTopNewsroomProvider.php b/sources/Application/Newsroom/iTopNewsroomProvider.php
index bc10318ed..fb5f808b5 100644
--- a/sources/Application/Newsroom/iTopNewsroomProvider.php
+++ b/sources/Application/Newsroom/iTopNewsroomProvider.php
@@ -1,6 +1,13 @@
 <?php
 
+namespace Combodo\iTop\Application\Newsroom;
+
+use Combodo\iTop\Controller\Newsroom\iTopNewsroomController;
 use Combodo\iTop\Service\Router\Router;
+use Dict;
+use MetaModel;
+use NewsroomProviderBase;
+use User;
 
 /**
  *  Class iTopNewsroomProvider
diff --git a/sources/Controller/Newsroom/iTopNewsroomController.php b/sources/Controller/Newsroom/iTopNewsroomController.php
index 99ebd2a6b..c187782e0 100644
--- a/sources/Controller/Newsroom/iTopNewsroomController.php
+++ b/sources/Controller/Newsroom/iTopNewsroomController.php
@@ -1,8 +1,20 @@
 <?php
 
+namespace Combodo\iTop\Controller\Newsroom;
+
+use ArchivedObjectException;
 use Combodo\iTop\Application\Branding;
 use Combodo\iTop\Application\TwigBase\Controller\Controller;
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\JsonPPage;
 use Combodo\iTop\Service\Router\Router;
+use CoreException;
+use DBObjectSearch;
+use DBObjectSet;
+use DisplayBlock;
+use MetaModel;
+use UserRights;
+use utils;
 
 
 /**
@@ -17,7 +29,7 @@ class iTopNewsroomController extends Controller
 	public const ROUTE_NAMESPACE = 'itopnewsroom';
 
 	/**
-	 * @return \iTopWebPage
+	 * @return iTopWebPage
 	 * @throws \ApplicationException
 	 * @throws \CoreException
 	 * @throws \OQLException
@@ -30,11 +42,12 @@ class iTopNewsroomController extends Controller
 		$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, []);
 		$oBlock->Display($oPage, 0);
 		$oPage->add("<div class='sf_results_area ibo-add-margin-top-250' data-target='search_results'>");
+
 		return $oPage;
 	}
 
 	/**
-	 * @return \JsonPPage
+	 * @return JsonPPage
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
 	 * @throws \CoreUnexpectedValue
@@ -48,13 +61,12 @@ class iTopNewsroomController extends Controller
 
 		$aMessages = [];
 		$iContactId = UserRights::GetContactId();
-		
-		if (\utils::IsNotNullOrEmptyString($iContactId)) {
+
+		if (utils::IsNotNullOrEmptyString($iContactId)) {
 			$oSearch = DBObjectSearch::FromOQL('SELECT EventiTopNotification WHERE contact_id = :contact_id AND read = "no"');
 			$oSet = new DBObjectSet($oSearch, array(), array('contact_id' => $iContactId));
 
-			while($oMessage = $oSet->Fetch())
-			{
+			while ($oMessage = $oSet->Fetch()) {
 				$sTitle = $oMessage->Get('title');
 				$sMessage = $oMessage->Get('message');
 				$sText = <<<HTML
@@ -64,22 +76,23 @@ class iTopNewsroomController extends Controller
 $sMessage
 HTML;
 
-				$sIcon = $oMessage->Get('icon') !== null ? 
-					$oMessage->Get('icon')->GetDisplayURL('EventiTopNotification', $oMessage->GetKey(), 'icon') : 
+				$sIcon = $oMessage->Get('icon') !== null ?
+					$oMessage->Get('icon')->GetDisplayURL('EventiTopNotification', $oMessage->GetKey(), 'icon') :
 					Branding::GetCompactMainLogoAbsoluteUrl();
 				$aMessages[] = array(
-					'id' => $oMessage->GetKey(),
-					'text' => $sText,
-					'url' => Router::GetInstance()->GenerateUrl(self::ROUTE_NAMESPACE . '.view_event', ['event_id' => $oMessage->GetKey()]),
+					'id'         => $oMessage->GetKey(),
+					'text'       => $sText,
+					'url'        => Router::GetInstance()->GenerateUrl(self::ROUTE_NAMESPACE.'.view_event', ['event_id' => $oMessage->GetKey()]),
 					'start_date' => $oMessage->Get('date'),
-					'priority' => $oMessage->Get('priority'),
-					'image' => $sIcon,
+					'priority'   => $oMessage->Get('priority'),
+					'image'      => $sIcon,
 				);
 			}
 
 		}
 		$oPage->SetData($aMessages);
 		$oPage->SetOutputDataOnly(true);
+
 		return $oPage;
 	}
 
@@ -97,20 +110,20 @@ HTML;
 	{
 		$iCount = 0;
 		$iContactId = UserRights::GetContactId();
-		
 
-		if (\utils::IsNotNullOrEmptyString($iContactId)) {
+
+		if (utils::IsNotNullOrEmptyString($iContactId)) {
 			$oSearch = DBObjectSearch::FromOQL('SELECT EventiTopNotification WHERE contact_id = :contact_id AND read = "no"');
 			$oSet = new DBObjectSet($oSearch, array(), array('contact_id' => $iContactId));
 
-			while($oEvent = $oSet->Fetch())
-			{
+			while ($oEvent = $oSet->Fetch()) {
 				$oEvent->Set('read', 'yes');
 				$oEvent->SetCurrentDate('read_date');
 				$oEvent->DBWrite();
 				$iCount++;
 			}
 		}
+
 		return $iCount;
 	}
 
@@ -125,12 +138,13 @@ HTML;
 	 * @throws \OQLException
 	 * @throws \Exception
 	 */
-	public function OperationViewEvent(){
+	public function OperationViewEvent()
+	{
 		$sEventId = utils::ReadParam('event_id', 0);
-		if($sEventId > 0) {
+		if ($sEventId > 0) {
 			try {
 				$oEvent = MetaModel::GetObject('EventiTopNotification', $sEventId);
-				if($oEvent !== null && $oEvent->Get('contact_id') === UserRights::GetContactId()){
+				if ($oEvent !== null && $oEvent->Get('contact_id') === UserRights::GetContactId()) {
 					$oEvent->Set('read', 'yes');
 					$oEvent->SetCurrentDate('read_date');
 					$oEvent->DBWrite();