diff --git a/application/Espo/Entities/ArrayValue.php b/application/Espo/Entities/ArrayValue.php
index 889f1c6faa..eb07c775be 100644
--- a/application/Espo/Entities/ArrayValue.php
+++ b/application/Espo/Entities/ArrayValue.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class ArrayValue extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'ArrayValue';
 }
diff --git a/application/Espo/Entities/Attachment.php b/application/Espo/Entities/Attachment.php
index 5ee08ead7c..646780bf14 100644
--- a/application/Espo/Entities/Attachment.php
+++ b/application/Espo/Entities/Attachment.php
@@ -33,6 +33,8 @@ use Espo\Core\ORM\Entity;
 
 class Attachment extends Entity
 {
+    public const ENTITY_TYPE = 'Attachment';
+
     public function getSourceId(): ?string
     {
         $sourceId = $this->get('sourceId');
diff --git a/application/Espo/Entities/AuthLogRecord.php b/application/Espo/Entities/AuthLogRecord.php
index d42a5ea8fd..4e6cfb234c 100644
--- a/application/Espo/Entities/AuthLogRecord.php
+++ b/application/Espo/Entities/AuthLogRecord.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class AuthLogRecord extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'AuthLogRecord';
 }
diff --git a/application/Espo/Entities/AuthToken.php b/application/Espo/Entities/AuthToken.php
index 53ce7c4ecf..d3caff0740 100644
--- a/application/Espo/Entities/AuthToken.php
+++ b/application/Espo/Entities/AuthToken.php
@@ -36,32 +36,34 @@ use Espo\Core\{
 
 class AuthToken extends BaseEntity implements AuthTokenInterface
 {
-    public function getToken() : string
+    public const ENTITY_TYPE = 'AuthToken';
+
+    public function getToken(): string
     {
         return $this->get('token');
     }
 
-    public function getUserId() : string
+    public function getUserId(): string
     {
         return $this->get('userId');
     }
 
-    public function getPortalId() : ?string
+    public function getPortalId(): ?string
     {
         return $this->get('portalId');
     }
 
-    public function getSecret() : ?string
+    public function getSecret(): ?string
     {
         return $this->get('secret');
     }
 
-    public function isActive() : bool
+    public function isActive(): bool
     {
         return $this->get('isActive');
     }
 
-    public function getHash() : ?string
+    public function getHash(): ?string
     {
         return $this->get('hash');
     }
diff --git a/application/Espo/Entities/Autofollow.php b/application/Espo/Entities/Autofollow.php
index b56e8d4583..3d2fb7f1f7 100644
--- a/application/Espo/Entities/Autofollow.php
+++ b/application/Espo/Entities/Autofollow.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class Autofollow extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'Autofollow';
 }
diff --git a/application/Espo/Entities/Currency.php b/application/Espo/Entities/Currency.php
index 585b9af3e8..9ef561354c 100644
--- a/application/Espo/Entities/Currency.php
+++ b/application/Espo/Entities/Currency.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class Currency extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'Currency';
 }
diff --git a/application/Espo/Entities/DashboardTemplate.php b/application/Espo/Entities/DashboardTemplate.php
index b48e939717..28ca7ae5dc 100644
--- a/application/Espo/Entities/DashboardTemplate.php
+++ b/application/Espo/Entities/DashboardTemplate.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class DashboardTemplate extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'DashboardTemplate';
 }
diff --git a/application/Espo/Entities/Email.php b/application/Espo/Entities/Email.php
index c08b2ecaad..6445de9d0f 100644
--- a/application/Espo/Entities/Email.php
+++ b/application/Espo/Entities/Email.php
@@ -37,6 +37,8 @@ use Espo\Services\Email as EmailService;
 
 class Email extends \Espo\Core\ORM\Entity
 {
+    public const ENTITY_TYPE = 'Email';
+
     protected function _getSubject()
     {
         return $this->get('name');
diff --git a/application/Espo/Entities/EmailAccount.php b/application/Espo/Entities/EmailAccount.php
index 106cfdd738..b95d68f12c 100644
--- a/application/Espo/Entities/EmailAccount.php
+++ b/application/Espo/Entities/EmailAccount.php
@@ -31,7 +31,6 @@ namespace Espo\Entities;
 
 class EmailAccount extends \Espo\Core\ORM\Entity
 {
-
-
+    public const ENTITY_TYPE = 'EmailAccount';
 }
 
diff --git a/application/Espo/Entities/EmailAddress.php b/application/Espo/Entities/EmailAddress.php
index 841a28ad31..805a5d69a9 100644
--- a/application/Espo/Entities/EmailAddress.php
+++ b/application/Espo/Entities/EmailAddress.php
@@ -35,6 +35,8 @@ use Espo\Core\ORM\Entity;
 
 class EmailAddress extends Entity
 {
+    public const ENTITY_TYPE = 'EmailAddress';
+
     protected function _setName($value)
     {
         if (empty($value)) {
diff --git a/application/Espo/Entities/EmailFilter.php b/application/Espo/Entities/EmailFilter.php
index 301fa63e7d..45a0c00d96 100644
--- a/application/Espo/Entities/EmailFilter.php
+++ b/application/Espo/Entities/EmailFilter.php
@@ -31,6 +31,6 @@ namespace Espo\Entities;
 
 class EmailFilter extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'EmailFilter';
 }
 
diff --git a/application/Espo/Entities/EmailFolder.php b/application/Espo/Entities/EmailFolder.php
index bbe6a7c867..a41e5c550e 100644
--- a/application/Espo/Entities/EmailFolder.php
+++ b/application/Espo/Entities/EmailFolder.php
@@ -31,6 +31,6 @@ namespace Espo\Entities;
 
 class EmailFolder extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'EmailFolder';
 }
 
diff --git a/application/Espo/Entities/EmailTemplate.php b/application/Espo/Entities/EmailTemplate.php
index 447514502d..a4a0eed4f9 100644
--- a/application/Espo/Entities/EmailTemplate.php
+++ b/application/Espo/Entities/EmailTemplate.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class EmailTemplate extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'EmailTemplate';
 }
diff --git a/application/Espo/Entities/EmailTemplateCategory.php b/application/Espo/Entities/EmailTemplateCategory.php
index 3c672b0af6..44cdc898b8 100644
--- a/application/Espo/Entities/EmailTemplateCategory.php
+++ b/application/Espo/Entities/EmailTemplateCategory.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class EmailTemplateCategory extends \Espo\Core\Templates\Entities\CategoryTree
 {
-
+    public const ENTITY_TYPE = 'EmailTemplateCategory';
 }
diff --git a/application/Espo/Entities/Extension.php b/application/Espo/Entities/Extension.php
index 7c04f63522..ebef22f418 100644
--- a/application/Espo/Entities/Extension.php
+++ b/application/Espo/Entities/Extension.php
@@ -31,6 +31,6 @@ namespace Espo\Entities;
 
 class Extension extends \Espo\Core\ORM\Entity
 {
-    
+    public const ENTITY_TYPE = 'Extension';
 }
 
diff --git a/application/Espo/Entities/ExternalAccount.php b/application/Espo/Entities/ExternalAccount.php
index 0960658bce..08a7357c1d 100644
--- a/application/Espo/Entities/ExternalAccount.php
+++ b/application/Espo/Entities/ExternalAccount.php
@@ -31,4 +31,5 @@ namespace Espo\Entities;
 
 class ExternalAccount extends Integration
 {
+    public const ENTITY_TYPE = 'ExternalAccount';
 }
diff --git a/application/Espo/Entities/Import.php b/application/Espo/Entities/Import.php
index f1693bce31..94380e56ba 100644
--- a/application/Espo/Entities/Import.php
+++ b/application/Espo/Entities/Import.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class Import extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'Import';
 }
diff --git a/application/Espo/Entities/InboundEmail.php b/application/Espo/Entities/InboundEmail.php
index f8804249c6..d6ff9e8fde 100644
--- a/application/Espo/Entities/InboundEmail.php
+++ b/application/Espo/Entities/InboundEmail.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class InboundEmail extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'InboundEmail';
 }
diff --git a/application/Espo/Entities/Integration.php b/application/Espo/Entities/Integration.php
index 01a05bc299..a1b8416e6e 100644
--- a/application/Espo/Entities/Integration.php
+++ b/application/Espo/Entities/Integration.php
@@ -35,6 +35,8 @@ use StdClass;
 
 class Integration extends Entity
 {
+    public const ENTITY_TYPE = 'Integration';
+
     public function get(string $name, $params = [])
     {
         if ($name == 'id') {
diff --git a/application/Espo/Entities/Job.php b/application/Espo/Entities/Job.php
index 5435fbf431..47b8a79079 100644
--- a/application/Espo/Entities/Job.php
+++ b/application/Espo/Entities/Job.php
@@ -35,6 +35,8 @@ use StdClass;
 
 class Job extends Entity
 {
+    public const ENTITY_TYPE = 'Job';
+
     /**
      * Get a status.
      */
diff --git a/application/Espo/Entities/LayoutRecord.php b/application/Espo/Entities/LayoutRecord.php
index 66912c2e42..7233c940e4 100644
--- a/application/Espo/Entities/LayoutRecord.php
+++ b/application/Espo/Entities/LayoutRecord.php
@@ -31,4 +31,5 @@ namespace Espo\Entities;
 
 class LayoutRecord extends \Espo\Core\ORM\Entity
 {
+    public const ENTITY_TYPE = 'LayoutRecord';
 }
diff --git a/application/Espo/Entities/LayoutSet.php b/application/Espo/Entities/LayoutSet.php
index 97e24edf88..72b36915fa 100644
--- a/application/Espo/Entities/LayoutSet.php
+++ b/application/Espo/Entities/LayoutSet.php
@@ -31,4 +31,5 @@ namespace Espo\Entities;
 
 class LayoutSet extends \Espo\Core\ORM\Entity
 {
+    public const ENTITY_TYPE = 'LayoutSet';
 }
diff --git a/application/Espo/Entities/LeadCapture.php b/application/Espo/Entities/LeadCapture.php
index 7541206335..6f1aa13635 100644
--- a/application/Espo/Entities/LeadCapture.php
+++ b/application/Espo/Entities/LeadCapture.php
@@ -31,7 +31,9 @@ namespace Espo\Entities;
 
 class LeadCapture extends \Espo\Core\ORM\Entity
 {
-    public function isToSubscribeContactIfExists() : bool
+    public const ENTITY_TYPE = 'LeadCapture';
+
+    public function isToSubscribeContactIfExists(): bool
     {
         return $this->get('subscribeToTargetList') && $this->get('subscribeContactToTargetList');
     }
diff --git a/application/Espo/Entities/LeadCaptureLogRecord.php b/application/Espo/Entities/LeadCaptureLogRecord.php
index 936c2162b1..5b98eb0630 100644
--- a/application/Espo/Entities/LeadCaptureLogRecord.php
+++ b/application/Espo/Entities/LeadCaptureLogRecord.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class LeadCaptureLogRecord extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'LeadCaptureLogRecord';
 }
diff --git a/application/Espo/Entities/NextNumber.php b/application/Espo/Entities/NextNumber.php
index 85035426b6..5aae630dd5 100644
--- a/application/Espo/Entities/NextNumber.php
+++ b/application/Espo/Entities/NextNumber.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class NextNumber extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'NextNumber';
 }
diff --git a/application/Espo/Entities/Note.php b/application/Espo/Entities/Note.php
index 259fcd5eb0..2d934c079e 100644
--- a/application/Espo/Entities/Note.php
+++ b/application/Espo/Entities/Note.php
@@ -33,6 +33,8 @@ use Espo\Core\ORM\Entity;
 
 class Note extends Entity
 {
+    public const ENTITY_TYPE = 'Note';
+
     public const TARGET_SELF = 'self';
 
     public const TARGET_ALL = 'all';
diff --git a/application/Espo/Entities/Notification.php b/application/Espo/Entities/Notification.php
index 65ec237d2f..37a3183f4c 100644
--- a/application/Espo/Entities/Notification.php
+++ b/application/Espo/Entities/Notification.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class Notification extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'Notification';
 }
diff --git a/application/Espo/Entities/PasswordChangeRequest.php b/application/Espo/Entities/PasswordChangeRequest.php
index 9b8541a49e..5fdacbcff4 100644
--- a/application/Espo/Entities/PasswordChangeRequest.php
+++ b/application/Espo/Entities/PasswordChangeRequest.php
@@ -31,6 +31,5 @@ namespace Espo\Entities;
 
 class PasswordChangeRequest extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'PasswordChangeRequest';
 }
-
diff --git a/application/Espo/Entities/PhoneNumber.php b/application/Espo/Entities/PhoneNumber.php
index e1872fa7f5..d30a4c1715 100644
--- a/application/Espo/Entities/PhoneNumber.php
+++ b/application/Espo/Entities/PhoneNumber.php
@@ -35,6 +35,8 @@ use Espo\Core\ORM\Entity;
 
 class PhoneNumber extends Entity
 {
+    public const ENTITY_TYPE = 'PhoneNumber';
+
     protected function _setName($value)
     {
         if (empty($value)) {
diff --git a/application/Espo/Entities/Portal.php b/application/Espo/Entities/Portal.php
index 46520d1eff..dcdce32aa0 100644
--- a/application/Espo/Entities/Portal.php
+++ b/application/Espo/Entities/Portal.php
@@ -31,6 +31,8 @@ namespace Espo\Entities;
 
 class Portal extends \Espo\Core\ORM\Entity
 {
+    public const ENTITY_TYPE = 'Portal';
+
     protected $settingsAttributeList = [
         'companyLogoId',
         'tabList',
@@ -46,7 +48,7 @@ class Portal extends \Espo\Core\ORM\Entity
         'defaultCurrency',
     ];
 
-    public function getSettingsAttributeList()
+    public function getSettingsAttributeList(): array
     {
         return $this->settingsAttributeList;
     }
diff --git a/application/Espo/Entities/PortalRole.php b/application/Espo/Entities/PortalRole.php
index 94c0fdea33..9035c8aa23 100644
--- a/application/Espo/Entities/PortalRole.php
+++ b/application/Espo/Entities/PortalRole.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class PortalRole extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'PortalRole';
 }
diff --git a/application/Espo/Entities/Preferences.php b/application/Espo/Entities/Preferences.php
index dcf0ea855d..08840ac0e0 100644
--- a/application/Espo/Entities/Preferences.php
+++ b/application/Espo/Entities/Preferences.php
@@ -31,7 +31,9 @@ namespace Espo\Entities;
 
 class Preferences extends \Espo\Core\ORM\Entity
 {
-    public function getSmtpParams() : ?array
+    public const ENTITY_TYPE = 'Preferences';
+
+    public function getSmtpParams(): ?array
     {
         $smtpParams = [];
         $smtpParams['server'] = $this->get('smtpServer');
diff --git a/application/Espo/Entities/Role.php b/application/Espo/Entities/Role.php
index c99b65854a..0ccbd49b9d 100644
--- a/application/Espo/Entities/Role.php
+++ b/application/Espo/Entities/Role.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class Role extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'Role';
 }
diff --git a/application/Espo/Entities/ScheduledJob.php b/application/Espo/Entities/ScheduledJob.php
index 7c6ddc2af5..4405af13a0 100644
--- a/application/Espo/Entities/ScheduledJob.php
+++ b/application/Espo/Entities/ScheduledJob.php
@@ -33,17 +33,19 @@ use Espo\Core\ORM\Entity;
 
 class ScheduledJob extends Entity
 {
-    public function getName() : ?string
+    public const ENTITY_TYPE = 'ScheduledJob';
+
+    public function getName(): ?string
     {
         return $this->get('name');
     }
 
-    public function getScheduling() : ?string
+    public function getScheduling(): ?string
     {
         return $this->get('scheduling');
     }
 
-    public function getJob() : ?string
+    public function getJob(): ?string
     {
         return $this->get('job');
     }
diff --git a/application/Espo/Entities/ScheduledJobLogRecord.php b/application/Espo/Entities/ScheduledJobLogRecord.php
index d3f7b1fd93..9532e3f147 100644
--- a/application/Espo/Entities/ScheduledJobLogRecord.php
+++ b/application/Espo/Entities/ScheduledJobLogRecord.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class ScheduledJobLogRecord extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'ScheduledJobLogRecord';
 }
diff --git a/application/Espo/Entities/Settings.php b/application/Espo/Entities/Settings.php
index e90c815e60..cdf872495a 100644
--- a/application/Espo/Entities/Settings.php
+++ b/application/Espo/Entities/Settings.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class Settings extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'Settings';
 }
diff --git a/application/Espo/Entities/Team.php b/application/Espo/Entities/Team.php
index 7bde7d9053..7e2b23a4ba 100644
--- a/application/Espo/Entities/Team.php
+++ b/application/Espo/Entities/Team.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class Team extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'Team';
 }
diff --git a/application/Espo/Entities/Template.php b/application/Espo/Entities/Template.php
index b4526ae66d..b7d3c6c7b2 100644
--- a/application/Espo/Entities/Template.php
+++ b/application/Espo/Entities/Template.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class Template extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'Template';
 }
diff --git a/application/Espo/Entities/UniqueId.php b/application/Espo/Entities/UniqueId.php
index 0c947fc565..edae9d95cf 100644
--- a/application/Espo/Entities/UniqueId.php
+++ b/application/Espo/Entities/UniqueId.php
@@ -31,7 +31,9 @@ namespace Espo\Entities;
 
 class UniqueId extends \Espo\Core\ORM\Entity
 {
-    public function getIdValue() : ?string
+    public const ENTITY_TYPE = 'UniqueId';
+
+    public function getIdValue(): ?string
     {
         return $this->get('name');
     }
diff --git a/application/Espo/Entities/User.php b/application/Espo/Entities/User.php
index 247f251d07..4caf135968 100644
--- a/application/Espo/Entities/User.php
+++ b/application/Espo/Entities/User.php
@@ -33,6 +33,8 @@ use Espo\Core\Entities\Person;
 
 class User extends Person
 {
+    public const ENTITY_TYPE = 'User';
+
     public function isActive(): bool
     {
         return (bool) $this->get('isActive');
diff --git a/application/Espo/Entities/UserData.php b/application/Espo/Entities/UserData.php
index b12c3c2d64..14955985b6 100644
--- a/application/Espo/Entities/UserData.php
+++ b/application/Espo/Entities/UserData.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class UserData extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'UserData';
 }
diff --git a/application/Espo/Entities/Webhook.php b/application/Espo/Entities/Webhook.php
index 852fc33fe1..0da45bd729 100644
--- a/application/Espo/Entities/Webhook.php
+++ b/application/Espo/Entities/Webhook.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class Webhook extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'Webhook';
 }
diff --git a/application/Espo/Entities/WebhookEventQueueItem.php b/application/Espo/Entities/WebhookEventQueueItem.php
index 83d0710cb5..47d6ae6395 100644
--- a/application/Espo/Entities/WebhookEventQueueItem.php
+++ b/application/Espo/Entities/WebhookEventQueueItem.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class WebhookEventQueueItem extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'WebhookEventQueueItem';
 }
diff --git a/application/Espo/Entities/WebhookQueueItem.php b/application/Espo/Entities/WebhookQueueItem.php
index fa505bfe50..e37f79f8f0 100644
--- a/application/Espo/Entities/WebhookQueueItem.php
+++ b/application/Espo/Entities/WebhookQueueItem.php
@@ -31,5 +31,5 @@ namespace Espo\Entities;
 
 class WebhookQueueItem extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'WebhookQueueItem';
 }
diff --git a/application/Espo/Modules/Crm/Entities/Account.php b/application/Espo/Modules/Crm/Entities/Account.php
index 2c54784d9e..25ae594e12 100644
--- a/application/Espo/Modules/Crm/Entities/Account.php
+++ b/application/Espo/Modules/Crm/Entities/Account.php
@@ -38,22 +38,24 @@ use Espo\Core\{
 
 class Account extends Entity
 {
-    public function getEmailAddressGroup() : EmailAddressGroup
+    public const ENTITY_TYPE = 'Account';
+
+    public function getEmailAddressGroup(): EmailAddressGroup
     {
         return $this->getValueObject('emailAddress');
     }
 
-    public function getPhoneNumberGroup() : PhoneNumberGroup
+    public function getPhoneNumberGroup(): PhoneNumberGroup
     {
         return $this->getValueObject('phoneNumber');
     }
 
-    public function setEmailAddressGroup(EmailAddressGroup $group) : void
+    public function setEmailAddressGroup(EmailAddressGroup $group): void
     {
         $this->setValueObject('emailAddress', $group);
     }
 
-    public function setPhoneNumberGroup(PhoneNumberGroup $group) : void
+    public function setPhoneNumberGroup(PhoneNumberGroup $group): void
     {
         $this->setValueObject('phoneNumber', $group);
     }
@@ -63,7 +65,7 @@ class Account extends Entity
         return $this->getValueObject('billingAddress');
     }
 
-    public function setBillingAddress(Address $address) : void
+    public function setBillingAddress(Address $address): void
     {
         $this->setValueObject('billingAddress', $address);
     }
@@ -73,7 +75,7 @@ class Account extends Entity
         return $this->getValueObject('shippingAddress');
     }
 
-    public function setShippingAddress(Address $address) : void
+    public function setShippingAddress(Address $address): void
     {
         $this->setValueObject('shippingAddress', $address);
     }
diff --git a/application/Espo/Modules/Crm/Entities/Call.php b/application/Espo/Modules/Crm/Entities/Call.php
index bb1932e0a1..f4309f07cb 100644
--- a/application/Espo/Modules/Crm/Entities/Call.php
+++ b/application/Espo/Modules/Crm/Entities/Call.php
@@ -36,22 +36,24 @@ use Espo\Core\{
 
 class Call extends Entity
 {
-    public function getDateStart() : ?DateTime
+    public const ENTITY_TYPE = 'Call';
+
+    public function getDateStart(): ?DateTime
     {
         return $this->getValueObject('dateStart');
     }
 
-    public function setDateStart(?DateTime $dateStart) : void
+    public function setDateStart(?DateTime $dateStart): void
     {
         $this->setValueObject('dateStart', $dateStart);
     }
 
-    public function getDateEnd() : ?DateTime
+    public function getDateEnd(): ?DateTime
     {
         return $this->getValueObject('dateEnd');
     }
 
-    public function setDateEnd(?DateTime $dateEnd) : void
+    public function setDateEnd(?DateTime $dateEnd): void
     {
         $this->setValueObject('dateEnd', $dateEnd);
     }
diff --git a/application/Espo/Modules/Crm/Entities/Campaign.php b/application/Espo/Modules/Crm/Entities/Campaign.php
index cefe14152d..47ad988eb3 100644
--- a/application/Espo/Modules/Crm/Entities/Campaign.php
+++ b/application/Espo/Modules/Crm/Entities/Campaign.php
@@ -31,5 +31,5 @@ namespace Espo\Modules\Crm\Entities;
 
 class Campaign extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'Campaign';
 }
diff --git a/application/Espo/Modules/Crm/Entities/CampaignLogRecord.php b/application/Espo/Modules/Crm/Entities/CampaignLogRecord.php
index f4b255aeaf..74fc711bbf 100644
--- a/application/Espo/Modules/Crm/Entities/CampaignLogRecord.php
+++ b/application/Espo/Modules/Crm/Entities/CampaignLogRecord.php
@@ -31,5 +31,5 @@ namespace Espo\Modules\Crm\Entities;
 
 class CampaignLogRecord extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'CampaignLogRecord';
 }
diff --git a/application/Espo/Modules/Crm/Entities/CampaignTrackingUrl.php b/application/Espo/Modules/Crm/Entities/CampaignTrackingUrl.php
index 408828e2a6..f125796385 100644
--- a/application/Espo/Modules/Crm/Entities/CampaignTrackingUrl.php
+++ b/application/Espo/Modules/Crm/Entities/CampaignTrackingUrl.php
@@ -31,6 +31,8 @@ namespace Espo\Modules\Crm\Entities;
 
 class CampaignTrackingUrl extends \Espo\Core\ORM\Entity
 {
+    public const ENTITY_TYPE = 'CampaignTrackingUrl';
+
     protected function _getUrlToUse()
     {
         return '{trackingUrl:' . $this->id . '}';
diff --git a/application/Espo/Modules/Crm/Entities/CaseObj.php b/application/Espo/Modules/Crm/Entities/CaseObj.php
index c915a07bac..cc8e91b43b 100644
--- a/application/Espo/Modules/Crm/Entities/CaseObj.php
+++ b/application/Espo/Modules/Crm/Entities/CaseObj.php
@@ -31,7 +31,7 @@ namespace Espo\Modules\Crm\Entities;
 
 class CaseObj extends \Espo\Core\ORM\Entity
 {
+    public const ENTITY_TYPE = 'Case';
 
     protected $entityType = 'Case';
-
 }
diff --git a/application/Espo/Modules/Crm/Entities/Contact.php b/application/Espo/Modules/Crm/Entities/Contact.php
index 84b42998af..37a3c72b2b 100644
--- a/application/Espo/Modules/Crm/Entities/Contact.php
+++ b/application/Espo/Modules/Crm/Entities/Contact.php
@@ -31,5 +31,5 @@ namespace Espo\Modules\Crm\Entities;
 
 class Contact extends \Espo\Core\Entities\Person
 {
-
+    public const ENTITY_TYPE = 'Contact';
 }
diff --git a/application/Espo/Modules/Crm/Entities/Document.php b/application/Espo/Modules/Crm/Entities/Document.php
index b60068df1d..e0861f84b9 100644
--- a/application/Espo/Modules/Crm/Entities/Document.php
+++ b/application/Espo/Modules/Crm/Entities/Document.php
@@ -31,6 +31,6 @@ namespace Espo\Modules\Crm\Entities;
 
 class Document extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'Document';
 }
 
diff --git a/application/Espo/Modules/Crm/Entities/DocumentFolder.php b/application/Espo/Modules/Crm/Entities/DocumentFolder.php
index e280cc256d..4d65c20043 100644
--- a/application/Espo/Modules/Crm/Entities/DocumentFolder.php
+++ b/application/Espo/Modules/Crm/Entities/DocumentFolder.php
@@ -31,6 +31,6 @@ namespace Espo\Modules\Crm\Entities;
 
 class DocumentFolder extends \Espo\Core\Templates\Entities\CategoryTree
 {
-
+    public const ENTITY_TYPE = 'DocumentFolder';
 }
 
diff --git a/application/Espo/Modules/Crm/Entities/EmailQueueItem.php b/application/Espo/Modules/Crm/Entities/EmailQueueItem.php
index 66c67ef1f1..e0e88af911 100644
--- a/application/Espo/Modules/Crm/Entities/EmailQueueItem.php
+++ b/application/Espo/Modules/Crm/Entities/EmailQueueItem.php
@@ -31,5 +31,5 @@ namespace Espo\Modules\Crm\Entities;
 
 class EmailQueueItem extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'EmailQueueItem';
 }
diff --git a/application/Espo/Modules/Crm/Entities/KnowledgeBaseArticle.php b/application/Espo/Modules/Crm/Entities/KnowledgeBaseArticle.php
index 602ad80dd6..b3c63137dc 100644
--- a/application/Espo/Modules/Crm/Entities/KnowledgeBaseArticle.php
+++ b/application/Espo/Modules/Crm/Entities/KnowledgeBaseArticle.php
@@ -31,6 +31,6 @@ namespace Espo\Modules\Crm\Entities;
 
 class KnowledgeBaseArticle extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'KnowledgeBaseArticle';
 }
 
diff --git a/application/Espo/Modules/Crm/Entities/KnowledgeBaseCategory.php b/application/Espo/Modules/Crm/Entities/KnowledgeBaseCategory.php
index 84761d4830..48ed3c6913 100644
--- a/application/Espo/Modules/Crm/Entities/KnowledgeBaseCategory.php
+++ b/application/Espo/Modules/Crm/Entities/KnowledgeBaseCategory.php
@@ -31,6 +31,6 @@ namespace Espo\Modules\Crm\Entities;
 
 class KnowledgeBaseCategory extends \Espo\Core\Templates\Entities\CategoryTree
 {
-
+    public const ENTITY_TYPE = 'KnowledgeBaseCategory';
 }
 
diff --git a/application/Espo/Modules/Crm/Entities/Lead.php b/application/Espo/Modules/Crm/Entities/Lead.php
index 7f753b79ce..4e1d602b8a 100644
--- a/application/Espo/Modules/Crm/Entities/Lead.php
+++ b/application/Espo/Modules/Crm/Entities/Lead.php
@@ -31,6 +31,8 @@ namespace Espo\Modules\Crm\Entities;
 
 class Lead extends \Espo\Core\Entities\Person
 {
+    public const ENTITY_TYPE = 'Lead';
+
     protected function _getName()
     {
         if (!$this->hasInContainer('name') || !$this->getFromContainer('name')) {
diff --git a/application/Espo/Modules/Crm/Entities/MassEmail.php b/application/Espo/Modules/Crm/Entities/MassEmail.php
index 2b0715cb92..0dc10446a0 100644
--- a/application/Espo/Modules/Crm/Entities/MassEmail.php
+++ b/application/Espo/Modules/Crm/Entities/MassEmail.php
@@ -31,5 +31,5 @@ namespace Espo\Modules\Crm\Entities;
 
 class MassEmail extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'MassEmail';
 }
diff --git a/application/Espo/Modules/Crm/Entities/Meeting.php b/application/Espo/Modules/Crm/Entities/Meeting.php
index 038b2c7753..e8d5a90da9 100644
--- a/application/Espo/Modules/Crm/Entities/Meeting.php
+++ b/application/Espo/Modules/Crm/Entities/Meeting.php
@@ -36,22 +36,24 @@ use Espo\Core\{
 
 class Meeting extends Entity
 {
-    public function getDateStart() : ?DateTimeOptional
+    public const ENTITY_TYPE = 'Meeting';
+
+    public function getDateStart(): ?DateTimeOptional
     {
         return $this->getValueObject('dateStart');
     }
 
-    public function setDateStart(?DateTimeOptional $dateStart) : void
+    public function setDateStart(?DateTimeOptional $dateStart): void
     {
         $this->setValueObject('dateStart', $dateStart);
     }
 
-    public function getDateEnd() : ?DateTimeOptional
+    public function getDateEnd(): ?DateTimeOptional
     {
         return $this->getValueObject('dateEnd');
     }
 
-    public function setDateEnd(?DateTimeOptional $dateEnd) : void
+    public function setDateEnd(?DateTimeOptional $dateEnd): void
     {
         $this->setValueObject('dateEnd', $dateEnd);
     }
diff --git a/application/Espo/Modules/Crm/Entities/Opportunity.php b/application/Espo/Modules/Crm/Entities/Opportunity.php
index dedbc7f674..b14ddb936f 100644
--- a/application/Espo/Modules/Crm/Entities/Opportunity.php
+++ b/application/Espo/Modules/Crm/Entities/Opportunity.php
@@ -37,6 +37,8 @@ use Espo\Core\{
 
 class Opportunity extends Entity
 {
+    public const ENTITY_TYPE = 'Opportunity';
+
     public function getAmount() : ?Currency
     {
         return $this->getValueObject('amount');
diff --git a/application/Espo/Modules/Crm/Entities/Reminder.php b/application/Espo/Modules/Crm/Entities/Reminder.php
index 11b64e2a0c..5b87355d8d 100644
--- a/application/Espo/Modules/Crm/Entities/Reminder.php
+++ b/application/Espo/Modules/Crm/Entities/Reminder.php
@@ -31,5 +31,5 @@ namespace Espo\Modules\Crm\Entities;
 
 class Reminder extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'Reminder';
 }
diff --git a/application/Espo/Modules/Crm/Entities/Target.php b/application/Espo/Modules/Crm/Entities/Target.php
index 7b9e1fe1c2..090782cfba 100644
--- a/application/Espo/Modules/Crm/Entities/Target.php
+++ b/application/Espo/Modules/Crm/Entities/Target.php
@@ -31,6 +31,6 @@ namespace Espo\Modules\Crm\Entities;
 
 class Target extends \Espo\Core\Entities\Person
 {
-    
+    public const ENTITY_TYPE = 'Target';
 }
 
diff --git a/application/Espo/Modules/Crm/Entities/TargetList.php b/application/Espo/Modules/Crm/Entities/TargetList.php
index f21eace4b7..8650e0c9d9 100644
--- a/application/Espo/Modules/Crm/Entities/TargetList.php
+++ b/application/Espo/Modules/Crm/Entities/TargetList.php
@@ -31,5 +31,5 @@ namespace Espo\Modules\Crm\Entities;
 
 class TargetList extends \Espo\Core\ORM\Entity
 {
-
+    public const ENTITY_TYPE = 'TargetList';
 }
diff --git a/application/Espo/Modules/Crm/Entities/Task.php b/application/Espo/Modules/Crm/Entities/Task.php
index 3f02c9acc9..6ceac025dd 100644
--- a/application/Espo/Modules/Crm/Entities/Task.php
+++ b/application/Espo/Modules/Crm/Entities/Task.php
@@ -36,6 +36,8 @@ use Espo\Core\{
 
 class Task extends Entity
 {
+    public const ENTITY_TYPE = 'Task';
+
     public function getDateStart() : ?DateTimeOptional
     {
         return $this->getValueObject('dateStart');
diff --git a/application/Espo/Tools/EntityManager/EntityManager.php b/application/Espo/Tools/EntityManager/EntityManager.php
index 8e77788366..172d4b0fcd 100644
--- a/application/Espo/Tools/EntityManager/EntityManager.php
+++ b/application/Espo/Tools/EntityManager/EntityManager.php
@@ -297,7 +297,8 @@ class EntityManager
             "namespace Espo\Custom\Entities;\n\n".
             "class {$normalizedName} extends {$templateNamespace}\Entities\\{$type}\n".
             "{\n".
-            "    protected \$entityType = \"$name\";\n".
+            "    public const ENTITY_TYPE = '{$name}';\n\n".
+            "    protected \$entityType = '{$name}';\n".
             "}\n";
 
         $filePath = "custom/Espo/Custom/Entities/{$normalizedName}.php";