diff --git a/application/Espo/Core/EntryPoint/Traits/NoAuth.php b/application/Espo/Core/EntryPoint/Traits/NoAuth.php
new file mode 100644
index 0000000000..37058fa303
--- /dev/null
+++ b/application/Espo/Core/EntryPoint/Traits/NoAuth.php
@@ -0,0 +1,39 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\EntryPoint\Traits;
+
+/**
+ * Auth is not required for entry point.
+ * To be used with EntryPoint interface.
+ */
+trait NoAuth
+{
+    public static $noAuth = true;
+}
diff --git a/application/Espo/Core/EntryPoint/Traits/NotStrictAuth.php b/application/Espo/Core/EntryPoint/Traits/NotStrictAuth.php
new file mode 100644
index 0000000000..322f282fc5
--- /dev/null
+++ b/application/Espo/Core/EntryPoint/Traits/NotStrictAuth.php
@@ -0,0 +1,38 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\EntryPoint\Traits;
+
+/**
+ * To be used with EntryPoint interface.
+ */
+trait NotStrictAuth
+{
+    public static $notStrictAuth = true;
+}
diff --git a/application/Espo/Core/EntryPoints/NoAuth.php b/application/Espo/Core/EntryPoints/NoAuth.php
index 1497a9add5..4b6739e901 100644
--- a/application/Espo/Core/EntryPoints/NoAuth.php
+++ b/application/Espo/Core/EntryPoints/NoAuth.php
@@ -29,7 +29,10 @@
 
 namespace Espo\Core\EntryPoints;
 
+/**
+ * @deprecated Use `Espo\Core\EntryPoint\Traits\NoAuth` instead.
+ */
 trait NoAuth
 {
-    public static $noAuth = true;
+    use \Espo\Core\EntryPoint\Traits\NoAuth;
 }
diff --git a/application/Espo/Core/EntryPoints/NotStrictAuth.php b/application/Espo/Core/EntryPoints/NotStrictAuth.php
index 380da36e76..226c04967f 100644
--- a/application/Espo/Core/EntryPoints/NotStrictAuth.php
+++ b/application/Espo/Core/EntryPoints/NotStrictAuth.php
@@ -29,7 +29,10 @@
 
 namespace Espo\Core\EntryPoints;
 
+/**
+ * @deprecated Use `Espo\Core\EntryPoint\Traits\NotStrictAuth` instead.
+ */
 trait NotStrictAuth
 {
-    public static $notStrictAuth = true;
+    use \Espo\Core\EntryPoint\Traits\NotStrictAuth;
 }
diff --git a/application/Espo/EntryPoints/ChangePassword.php b/application/Espo/EntryPoints/ChangePassword.php
index 1bd0696d0d..be7a838735 100644
--- a/application/Espo/EntryPoints/ChangePassword.php
+++ b/application/Espo/EntryPoints/ChangePassword.php
@@ -32,12 +32,9 @@ namespace Espo\EntryPoints;
 use Espo\Core\Exceptions\NotFound;
 use Espo\Core\Exceptions\BadRequest;
 
-use Espo\Core\EntryPoints\{
-    NoAuth,
-};
-
 use Espo\Core\{
     EntryPoint\EntryPoint,
+    EntryPoint\Traits\NoAuth,
     Utils\Config,
     Utils\ClientManager,
     ORM\EntityManager,
diff --git a/application/Espo/EntryPoints/ConfirmOptIn.php b/application/Espo/EntryPoints/ConfirmOptIn.php
index cc62cba932..6d7ff6a280 100644
--- a/application/Espo/EntryPoints/ConfirmOptIn.php
+++ b/application/Espo/EntryPoints/ConfirmOptIn.php
@@ -29,15 +29,11 @@
 
 namespace Espo\EntryPoints;
 
-use Espo\Core\Exceptions\BadRequest;
-use Espo\Core\Exceptions\Error;
-
-use Espo\Core\EntryPoints\{
-    NoAuth,
-};
-
 use Espo\Core\{
+    Exceptions\BadRequest,
+    Exceptions\Error,
     EntryPoint\EntryPoint,
+    EntryPoint\Traits\NoAuth,
     Utils\ClientManager,
     ServiceFactory,
     Api\Request,
diff --git a/application/Espo/EntryPoints/LogoImage.php b/application/Espo/EntryPoints/LogoImage.php
index 0375331e6d..8b8fcc27a2 100644
--- a/application/Espo/EntryPoints/LogoImage.php
+++ b/application/Espo/EntryPoints/LogoImage.php
@@ -29,12 +29,9 @@
 
 namespace Espo\EntryPoints;
 
-use Espo\Core\EntryPoints\{
-    NoAuth,
-};
-
 use Espo\Core\{
     Exceptions\NotFound,
+    EntryPoint\Traits\NoAuth,
     Api\Request,
     Api\Response,
 };
diff --git a/application/Espo/EntryPoints/OauthCallback.php b/application/Espo/EntryPoints/OauthCallback.php
index 255425a50e..81538a5090 100644
--- a/application/Espo/EntryPoints/OauthCallback.php
+++ b/application/Espo/EntryPoints/OauthCallback.php
@@ -29,12 +29,9 @@
 
 namespace Espo\EntryPoints;
 
-use Espo\Core\EntryPoints\{
-    NoAuth,
-};
-
 use Espo\Core\{
     EntryPoint\EntryPoint,
+    EntryPoint\Traits\NoAuth,
     Api\Request,
     Api\Response,
 };
diff --git a/application/Espo/Modules/Crm/EntryPoints/CampaignTrackOpened.php b/application/Espo/Modules/Crm/EntryPoints/CampaignTrackOpened.php
index 608722a28f..8365198c7c 100644
--- a/application/Espo/Modules/Crm/EntryPoints/CampaignTrackOpened.php
+++ b/application/Espo/Modules/Crm/EntryPoints/CampaignTrackOpened.php
@@ -29,14 +29,11 @@
 
 namespace Espo\Modules\Crm\EntryPoints;
 
-use Espo\Core\EntryPoints\{
-    NoAuth,
-};
-
 use Espo\Core\{
     Exceptions\NotFound,
     Exceptions\BadRequest,
     EntryPoint\EntryPoint,
+    EntryPoint\Traits\NoAuth,
     Api\Request,
     Api\Response,
     ORM\EntityManager,
diff --git a/application/Espo/Modules/Crm/EntryPoints/CampaignUrl.php b/application/Espo/Modules/Crm/EntryPoints/CampaignUrl.php
index 15649979c5..ac960105dd 100644
--- a/application/Espo/Modules/Crm/EntryPoints/CampaignUrl.php
+++ b/application/Espo/Modules/Crm/EntryPoints/CampaignUrl.php
@@ -34,14 +34,11 @@ use Espo\{
     Modules\Crm\Entities\CampaignTrackingUrl,
 };
 
-use Espo\Core\EntryPoints\{
-    NoAuth,
-};
-
 use Espo\Core\{
     Exceptions\NotFoundSilent,
     Exceptions\BadRequest,
     EntryPoint\EntryPoint,
+    EntryPoint\Traits\NoAuth,
     Api\Request,
     Api\Response,
     ORM\EntityManager,
diff --git a/application/Espo/Modules/Crm/EntryPoints/EventConfirmation.php b/application/Espo/Modules/Crm/EntryPoints/EventConfirmation.php
index b8f3bbf075..191ac3188e 100644
--- a/application/Espo/Modules/Crm/EntryPoints/EventConfirmation.php
+++ b/application/Espo/Modules/Crm/EntryPoints/EventConfirmation.php
@@ -29,15 +29,12 @@
 
 namespace Espo\Modules\Crm\EntryPoints;
 
-use Espo\Core\EntryPoints\{
-    NoAuth,
-};
-
 use Espo\Core\{
     Exceptions\NotFound,
     Exceptions\BadRequest,
     Exceptions\Error,
     EntryPoint\EntryPoint,
+    EntryPoint\Traits\NoAuth,
     Api\Request,
     Api\Response,
     ORM\EntityManager,
diff --git a/application/Espo/Modules/Crm/EntryPoints/SubscribeAgain.php b/application/Espo/Modules/Crm/EntryPoints/SubscribeAgain.php
index 3ec90b097e..e0271cece1 100644
--- a/application/Espo/Modules/Crm/EntryPoints/SubscribeAgain.php
+++ b/application/Espo/Modules/Crm/EntryPoints/SubscribeAgain.php
@@ -29,16 +29,13 @@
 
 namespace Espo\Modules\Crm\EntryPoints;
 
-use Espo\Core\EntryPoints\{
-    NoAuth,
-};
-
 use Espo\Core\{
     Exceptions\NotFound,
     Exceptions\BadRequest,
     Api\Request,
     Api\Response,
     EntryPoint\EntryPoint,
+    EntryPoint\Traits\NoAuth,
     ORM\EntityManager,
     Utils\ClientManager,
     HookManager,
diff --git a/application/Espo/Modules/Crm/EntryPoints/Unsubscribe.php b/application/Espo/Modules/Crm/EntryPoints/Unsubscribe.php
index d1f2d2d27c..9f79e3313c 100644
--- a/application/Espo/Modules/Crm/EntryPoints/Unsubscribe.php
+++ b/application/Espo/Modules/Crm/EntryPoints/Unsubscribe.php
@@ -29,14 +29,11 @@
 
 namespace Espo\Modules\Crm\EntryPoints;
 
-use Espo\Core\EntryPoints\{
-    NoAuth,
-};
-
 use Espo\Core\{
     Exceptions\NotFound,
     Exceptions\BadRequest,
     EntryPoint\EntryPoint,
+    EntryPoint\Traits\NoAuth,
     Api\Request,
     Api\Response,
     ORM\EntityManager,