diff --git a/app/modules/api/Controllers/Account/CreateController.php b/app/modules/api/Controllers/Account/CreateController.php
index 6e350541..f6fb832f 100644
--- a/app/modules/api/Controllers/Account/CreateController.php
+++ b/app/modules/api/Controllers/Account/CreateController.php
@@ -57,7 +57,7 @@ final class CreateController extends AccountBase
                 'create.account',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Account created'))
                         ->addDetail(__u('Name'), $accountDetails->getName())
                         ->addDetail(__u('Client'), $accountDetails->getClientName())
diff --git a/app/modules/api/Controllers/Account/DeleteController.php b/app/modules/api/Controllers/Account/DeleteController.php
index e95cb44b..f8f6d812 100644
--- a/app/modules/api/Controllers/Account/DeleteController.php
+++ b/app/modules/api/Controllers/Account/DeleteController.php
@@ -54,7 +54,7 @@ final class DeleteController extends AccountBase
                 'delete.account',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Account removed'))
                         ->addDetail(__u('Name'), $accountDetails->getName())
                         ->addDetail(__u('Client'), $accountDetails->getClientName())
diff --git a/app/modules/api/Controllers/Account/EditController.php b/app/modules/api/Controllers/Account/EditController.php
index 92a8a2b0..8c2da65f 100644
--- a/app/modules/api/Controllers/Account/EditController.php
+++ b/app/modules/api/Controllers/Account/EditController.php
@@ -55,7 +55,7 @@ final class EditController extends AccountBase
                 'edit.account',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Account updated'))
                         ->addDetail(__u('Name'), $accountDetails->getName())
                         ->addDetail(__u('Client'), $accountDetails->getClientName())
diff --git a/app/modules/api/Controllers/Account/EditPassController.php b/app/modules/api/Controllers/Account/EditPassController.php
index e84584a2..34928643 100644
--- a/app/modules/api/Controllers/Account/EditPassController.php
+++ b/app/modules/api/Controllers/Account/EditPassController.php
@@ -57,7 +57,7 @@ final class EditPassController extends AccountBase
                 'edit.account.pass',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Password updated'))
                         ->addDetail(__u('Name'), $accountDetails->getName())
                         ->addDetail(__u('Client'), $accountDetails->getClientName())
diff --git a/app/modules/api/Controllers/Account/ViewController.php b/app/modules/api/Controllers/Account/ViewController.php
index 4ae34c1f..1e7be6ba 100644
--- a/app/modules/api/Controllers/Account/ViewController.php
+++ b/app/modules/api/Controllers/Account/ViewController.php
@@ -68,7 +68,7 @@ final class ViewController extends AccountBase
                 'show.account',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Account displayed'))
                         ->addDetail(__u('Name'), $accountDetails->getName())
                         ->addDetail(__u('Client'), $accountDetails->getClientName())
diff --git a/app/modules/api/Controllers/Account/ViewPassController.php b/app/modules/api/Controllers/Account/ViewPassController.php
index 422a5d95..b3e594b3 100644
--- a/app/modules/api/Controllers/Account/ViewPassController.php
+++ b/app/modules/api/Controllers/Account/ViewPassController.php
@@ -61,7 +61,7 @@ final class ViewPassController extends AccountBase
                 'show.account.pass',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Password viewed'))
                         ->addDetail(__u('Name'), $accountDetails->getName())
                         ->addDetail(__u('Client'), $accountDetails->getClientName())
diff --git a/app/modules/api/Controllers/Category/CreateController.php b/app/modules/api/Controllers/Category/CreateController.php
index 4280ff47..5f292695 100644
--- a/app/modules/api/Controllers/Category/CreateController.php
+++ b/app/modules/api/Controllers/Category/CreateController.php
@@ -56,7 +56,7 @@ final class CreateController extends CategoryBase
                 'create.category',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Category added'))
                         ->addDetail(__u('Name'), $categoryData->getName())
                         ->addDetail('ID', $id)
diff --git a/app/modules/api/Controllers/Category/DeleteController.php b/app/modules/api/Controllers/Category/DeleteController.php
index f4827134..76aa3279 100644
--- a/app/modules/api/Controllers/Category/DeleteController.php
+++ b/app/modules/api/Controllers/Category/DeleteController.php
@@ -54,7 +54,7 @@ final class DeleteController extends CategoryBase
                 'delete.category',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Category deleted'))
                         ->addDetail(__u('Name'), $categoryData->getName())
                         ->addDetail('ID', $categoryData->getId())
diff --git a/app/modules/api/Controllers/Category/EditController.php b/app/modules/api/Controllers/Category/EditController.php
index cedf517b..d8c63adc 100644
--- a/app/modules/api/Controllers/Category/EditController.php
+++ b/app/modules/api/Controllers/Category/EditController.php
@@ -51,7 +51,7 @@ final class EditController extends CategoryBase
                 'edit.category',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Category updated'))
                         ->addDetail(__u('Name'), $categoryData->getName())
                         ->addDetail('ID', $categoryData->getId())
diff --git a/app/modules/api/Controllers/Category/ViewController.php b/app/modules/api/Controllers/Category/ViewController.php
index 9bfe4833..4be63e12 100644
--- a/app/modules/api/Controllers/Category/ViewController.php
+++ b/app/modules/api/Controllers/Category/ViewController.php
@@ -57,7 +57,7 @@ final class ViewController extends CategoryBase
                 'show.category',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Category displayed'))
                         ->addDetail(__u('Name'), $categoryData->getName())
                         ->addDetail('ID', $id)
diff --git a/app/modules/api/Controllers/Client/CreateController.php b/app/modules/api/Controllers/Client/CreateController.php
index 9fbf737e..2d7e16d5 100644
--- a/app/modules/api/Controllers/Client/CreateController.php
+++ b/app/modules/api/Controllers/Client/CreateController.php
@@ -56,7 +56,7 @@ final class CreateController extends ClientBase
                 'create.client',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Client added'))
                         ->addDetail(__u('Name'), $clientData->getName())
                         ->addDetail('ID', $id)
diff --git a/app/modules/api/Controllers/Client/DeleteController.php b/app/modules/api/Controllers/Client/DeleteController.php
index 2c5a7ca1..237caae3 100644
--- a/app/modules/api/Controllers/Client/DeleteController.php
+++ b/app/modules/api/Controllers/Client/DeleteController.php
@@ -54,7 +54,7 @@ final class DeleteController extends ClientBase
                 'delete.client',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Client deleted'))
                         ->addDetail(__u('Name'), $clientData->getName())
                         ->addDetail('ID', $id)
diff --git a/app/modules/api/Controllers/Client/EditController.php b/app/modules/api/Controllers/Client/EditController.php
index 30beb3fb..492465e1 100644
--- a/app/modules/api/Controllers/Client/EditController.php
+++ b/app/modules/api/Controllers/Client/EditController.php
@@ -54,7 +54,7 @@ final class EditController extends ClientBase
                 'edit.client',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Client updated'))
                         ->addDetail(__u('Name'), $clientData->getName())
                         ->addDetail('ID', $clientData->getId())
diff --git a/app/modules/api/Controllers/Client/ViewController.php b/app/modules/api/Controllers/Client/ViewController.php
index d7984c9a..f84deabc 100644
--- a/app/modules/api/Controllers/Client/ViewController.php
+++ b/app/modules/api/Controllers/Client/ViewController.php
@@ -57,7 +57,7 @@ final class ViewController extends ClientBase
                 'show.client',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Client displayed'))
                         ->addDetail(__u('Name'), $clientData->getName())
                         ->addDetail('ID', $id)
diff --git a/app/modules/api/Controllers/Config/BackupController.php b/app/modules/api/Controllers/Config/BackupController.php
index 1f68a1fc..fa27bc99 100644
--- a/app/modules/api/Controllers/Config/BackupController.php
+++ b/app/modules/api/Controllers/Config/BackupController.php
@@ -85,7 +85,7 @@ final class BackupController extends ControllerBase
                 'run.backup.end',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Application and database backup completed successfully'))
                         ->addDetail(__u('Path'), $path)
                 )
diff --git a/app/modules/api/Controllers/Config/ExportController.php b/app/modules/api/Controllers/Config/ExportController.php
index 9b696a56..55e91162 100644
--- a/app/modules/api/Controllers/Config/ExportController.php
+++ b/app/modules/api/Controllers/Config/ExportController.php
@@ -82,7 +82,7 @@ final class ExportController extends ControllerBase
                 'run.export.start',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('sysPass XML export'))
                         ->addDetail(__u('Path'), $path)
                 )
@@ -93,7 +93,7 @@ final class ExportController extends ControllerBase
 
             $this->eventDispatcher->notify(
                 'run.export.end',
-                new Event($this, EventMessage::factory()->addDescription(__u('Export process finished')))
+                new Event($this, EventMessage::build()->addDescription(__u('Export process finished')))
             );
 
             $exportFiles = ['files' => ['xml' => $file]];
diff --git a/app/modules/api/Controllers/Tag/CreateController.php b/app/modules/api/Controllers/Tag/CreateController.php
index 52923797..34279c82 100644
--- a/app/modules/api/Controllers/Tag/CreateController.php
+++ b/app/modules/api/Controllers/Tag/CreateController.php
@@ -56,7 +56,7 @@ final class CreateController extends TagBase
                 'create.tag',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Tag added'))
                         ->addDetail(__u('Name'), $tagData->getName())
                         ->addDetail('ID', $id)
diff --git a/app/modules/api/Controllers/Tag/DeleteController.php b/app/modules/api/Controllers/Tag/DeleteController.php
index f53adcc6..4c0aa959 100644
--- a/app/modules/api/Controllers/Tag/DeleteController.php
+++ b/app/modules/api/Controllers/Tag/DeleteController.php
@@ -54,7 +54,7 @@ final class DeleteController extends TagBase
                 'delete.tag',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Tag removed'))
                         ->addDetail(__u('Name'), $tagData->getName())
                         ->addDetail('ID', $id)
diff --git a/app/modules/api/Controllers/Tag/EditController.php b/app/modules/api/Controllers/Tag/EditController.php
index 946c6960..af6b76cd 100644
--- a/app/modules/api/Controllers/Tag/EditController.php
+++ b/app/modules/api/Controllers/Tag/EditController.php
@@ -54,7 +54,7 @@ final class EditController extends TagBase
                 'edit.tag',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Tag updated'))
                         ->addDetail(__u('Name'), $tagData->getName())
                         ->addDetail('ID', $tagData->getId())
diff --git a/app/modules/api/Controllers/Tag/ViewController.php b/app/modules/api/Controllers/Tag/ViewController.php
index fb72a0d8..167f3cdb 100644
--- a/app/modules/api/Controllers/Tag/ViewController.php
+++ b/app/modules/api/Controllers/Tag/ViewController.php
@@ -50,7 +50,8 @@ final class ViewController extends TagBase
 
             $this->eventDispatcher->notify(
                 'show.tag',
-                new Event($this, EventMessage::factory()
+                new Event(
+                    $this, EventMessage::build()
                     ->addDescription(__u('Tag displayed'))
                     ->addDetail(__u('Name'), $tagData->getName())
                     ->addDetail('ID', $id)
diff --git a/app/modules/api/Controllers/UserGroup/CreateController.php b/app/modules/api/Controllers/UserGroup/CreateController.php
index 50575b5e..a6b48e46 100644
--- a/app/modules/api/Controllers/UserGroup/CreateController.php
+++ b/app/modules/api/Controllers/UserGroup/CreateController.php
@@ -55,7 +55,7 @@ final class CreateController extends UserGroupBase
             $this->eventDispatcher->notify(
                 'create.userGroup',
                 new Event(
-                    $this, EventMessage::factory()
+                    $this, EventMessage::build()
                     ->addDescription(__u('Group added'))
                     ->addDetail(__u('Name'), $userGroupData->getName())
                     ->addDetail('ID', $id)
diff --git a/app/modules/api/Controllers/UserGroup/DeleteController.php b/app/modules/api/Controllers/UserGroup/DeleteController.php
index a23675e2..441bf4e5 100644
--- a/app/modules/api/Controllers/UserGroup/DeleteController.php
+++ b/app/modules/api/Controllers/UserGroup/DeleteController.php
@@ -54,7 +54,7 @@ final class DeleteController extends UserGroupBase
                 'delete.userGroup',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Group deleted'))
                         ->addDetail(__u('Name'), $userGroupData->getName())
                         ->addDetail('ID', $id)
diff --git a/app/modules/api/Controllers/UserGroup/EditController.php b/app/modules/api/Controllers/UserGroup/EditController.php
index 6db0f849..cf2cc742 100644
--- a/app/modules/api/Controllers/UserGroup/EditController.php
+++ b/app/modules/api/Controllers/UserGroup/EditController.php
@@ -54,7 +54,7 @@ final class EditController extends UserGroupBase
                 'edit.userGroup',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Group updated'))
                         ->addDetail(__u('Name'), $userGroupData->getName())
                         ->addDetail('ID', $userGroupData->getId())
diff --git a/app/modules/api/Controllers/UserGroup/ViewController.php b/app/modules/api/Controllers/UserGroup/ViewController.php
index 13fb1e2b..832bdd61 100644
--- a/app/modules/api/Controllers/UserGroup/ViewController.php
+++ b/app/modules/api/Controllers/UserGroup/ViewController.php
@@ -52,7 +52,7 @@ final class ViewController extends UserGroupBase
                 'show.userGroup',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Group viewed'))
                         ->addDetail(__u('Name'), $userGroupData->getName())
                         ->addDetail('ID', $id)
diff --git a/app/modules/web/Controllers/Account/CopyPassController.php b/app/modules/web/Controllers/Account/CopyPassController.php
index 037cb9b6..efffd3e1 100644
--- a/app/modules/web/Controllers/Account/CopyPassController.php
+++ b/app/modules/web/Controllers/Account/CopyPassController.php
@@ -81,7 +81,7 @@ final class CopyPassController extends AccountControllerBase
             'copy.account.pass',
             new Event(
                 $this,
-                EventMessage::factory()
+                EventMessage::build()
                             ->addDescription(__u('Password copied'))
                             ->addDetail(__u('Account'), $account->getName())
             )
diff --git a/app/modules/web/Controllers/Account/CopyPassHistoryController.php b/app/modules/web/Controllers/Account/CopyPassHistoryController.php
index bf68725b..b6422160 100644
--- a/app/modules/web/Controllers/Account/CopyPassHistoryController.php
+++ b/app/modules/web/Controllers/Account/CopyPassHistoryController.php
@@ -84,7 +84,7 @@ final class CopyPassHistoryController extends AccountControllerBase
             'copy.account.pass.history',
             new Event(
                 $this,
-                EventMessage::factory()
+                EventMessage::build()
                             ->addDescription(__u('Password copied'))
                             ->addDetail(__u('Account'), $account->getName())
             )
diff --git a/app/modules/web/Controllers/Account/SaveCopyController.php b/app/modules/web/Controllers/Account/SaveCopyController.php
index 2ff49a08..f4779d1c 100644
--- a/app/modules/web/Controllers/Account/SaveCopyController.php
+++ b/app/modules/web/Controllers/Account/SaveCopyController.php
@@ -57,7 +57,7 @@ final class SaveCopyController extends AccountSaveBase
                 'create.account',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Account created'))
                                 ->addDetail(__u('Account'), $accountDetails->getName())
                                 ->addDetail(__u('Client'), $accountDetails->getClientName())
diff --git a/app/modules/web/Controllers/Account/SaveCreateController.php b/app/modules/web/Controllers/Account/SaveCreateController.php
index a6731338..c94d9163 100644
--- a/app/modules/web/Controllers/Account/SaveCreateController.php
+++ b/app/modules/web/Controllers/Account/SaveCreateController.php
@@ -56,7 +56,7 @@ final class SaveCreateController extends AccountSaveBase
                 'create.account',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Account created'))
                                 ->addDetail(__u('Account'), $accountView->getName())
                                 ->addDetail(__u('Client'), $accountView->getClientName())
diff --git a/app/modules/web/Controllers/Account/SaveDeleteController.php b/app/modules/web/Controllers/Account/SaveDeleteController.php
index faec3049..9d16eb2f 100644
--- a/app/modules/web/Controllers/Account/SaveDeleteController.php
+++ b/app/modules/web/Controllers/Account/SaveDeleteController.php
@@ -78,7 +78,7 @@ final class SaveDeleteController extends AccountControllerBase
                 'delete.account',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Account removed'))
                                 ->addDetail(__u('Account'), $accountDetails->getName())
                                 ->addDetail(__u('Client'), $accountDetails->getClientName())
diff --git a/app/modules/web/Controllers/Account/SaveEditController.php b/app/modules/web/Controllers/Account/SaveEditController.php
index 355632b8..47c2f45d 100644
--- a/app/modules/web/Controllers/Account/SaveEditController.php
+++ b/app/modules/web/Controllers/Account/SaveEditController.php
@@ -61,7 +61,7 @@ final class SaveEditController extends AccountSaveBase
                 'edit.account',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Account updated'))
                                 ->addDetail(__u('Account'), $accountDetails->getName())
                                 ->addDetail(__u('Client'), $accountDetails->getClientName())
diff --git a/app/modules/web/Controllers/Account/SaveEditPassController.php b/app/modules/web/Controllers/Account/SaveEditPassController.php
index fef51849..43e8cb7d 100644
--- a/app/modules/web/Controllers/Account/SaveEditPassController.php
+++ b/app/modules/web/Controllers/Account/SaveEditPassController.php
@@ -84,7 +84,7 @@ final class SaveEditPassController extends AccountControllerBase
                 'edit.account.pass',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Password updated'))
                                 ->addDetail(__u('Account'), $accountDetails->getName())
                                 ->addDetail(__u('Client'), $accountDetails->getClientName())
diff --git a/app/modules/web/Controllers/Account/SaveEditRestoreController.php b/app/modules/web/Controllers/Account/SaveEditRestoreController.php
index 7f294a41..e2bbc496 100644
--- a/app/modules/web/Controllers/Account/SaveEditRestoreController.php
+++ b/app/modules/web/Controllers/Account/SaveEditRestoreController.php
@@ -80,7 +80,7 @@ final class SaveEditRestoreController extends AccountControllerBase
                 'edit.account.restore',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Account restored'))
                                 ->addDetail(__u('Account'), $accountDetails->getName())
                                 ->addDetail(__u('Client'), $accountDetails->getClientName())
diff --git a/app/modules/web/Controllers/Account/SaveRequestController.php b/app/modules/web/Controllers/Account/SaveRequestController.php
index 6a5c33ed..ef9ef292 100644
--- a/app/modules/web/Controllers/Account/SaveRequestController.php
+++ b/app/modules/web/Controllers/Account/SaveRequestController.php
@@ -92,7 +92,7 @@ final class SaveRequestController extends AccountControllerBase
                 'request.account',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Request'))
                                 ->addDetail(
                                     __u('Requester'),
diff --git a/app/modules/web/Controllers/Account/ViewLinkController.php b/app/modules/web/Controllers/Account/ViewLinkController.php
index d8b4225a..d36e2009 100644
--- a/app/modules/web/Controllers/Account/ViewLinkController.php
+++ b/app/modules/web/Controllers/Account/ViewLinkController.php
@@ -144,7 +144,7 @@ final class ViewLinkController extends AccountControllerBase
                     'show.account.link',
                     new Event(
                         $this,
-                        EventMessage::factory()
+                        EventMessage::build()
                                     ->addDescription(__u('Link viewed'))
                                     ->addDetail(__u('Account'), $accountViewDto->getName())
                                     ->addDetail(__u('Client'), $accountViewDto->getClientName())
diff --git a/app/modules/web/Controllers/Account/ViewPassController.php b/app/modules/web/Controllers/Account/ViewPassController.php
index 3f9aac54..c2f03753 100644
--- a/app/modules/web/Controllers/Account/ViewPassController.php
+++ b/app/modules/web/Controllers/Account/ViewPassController.php
@@ -87,7 +87,7 @@ final class ViewPassController extends AccountControllerBase
                 'show.account.pass',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Password viewed'))
                                 ->addDetail(__u('Account'), $account->getName())
                 )
diff --git a/app/modules/web/Controllers/Account/ViewPassHistoryController.php b/app/modules/web/Controllers/Account/ViewPassHistoryController.php
index 1e1805a9..0db51767 100644
--- a/app/modules/web/Controllers/Account/ViewPassHistoryController.php
+++ b/app/modules/web/Controllers/Account/ViewPassHistoryController.php
@@ -84,7 +84,7 @@ final class ViewPassHistoryController extends AccountControllerBase
                 'show.account.pass.history',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Password viewed'))
                                 ->addDetail(__u('Account'), $account->getName())
                 )
diff --git a/app/modules/web/Controllers/AccountFile/DeleteController.php b/app/modules/web/Controllers/AccountFile/DeleteController.php
index a3996ee6..20363f45 100644
--- a/app/modules/web/Controllers/AccountFile/DeleteController.php
+++ b/app/modules/web/Controllers/AccountFile/DeleteController.php
@@ -60,7 +60,7 @@ final class DeleteController extends AccountFileBase
 
                 $this->eventDispatcher->notify(
                     'delete.accountFile.selection',
-                    new Event($this, EventMessage::factory()->addDescription(__u('Files deleted')))
+                    new Event($this, EventMessage::build()->addDescription(__u('Files deleted')))
                 );
 
                 return $this->returnJsonResponse(0, __u('Files deleted'));
@@ -70,7 +70,7 @@ final class DeleteController extends AccountFileBase
                 'delete.accountFile',
                 new Event(
                     $this,
-                    EventMessage::factory()->addDescription(__u('File deleted'))->addDetail(__u('File'), $id)
+                    EventMessage::build()->addDescription(__u('File deleted'))->addDetail(__u('File'), $id)
                 )
             );
 
diff --git a/app/modules/web/Controllers/AccountFile/DownloadController.php b/app/modules/web/Controllers/AccountFile/DownloadController.php
index 8267dbdd..c5e13720 100644
--- a/app/modules/web/Controllers/AccountFile/DownloadController.php
+++ b/app/modules/web/Controllers/AccountFile/DownloadController.php
@@ -57,7 +57,7 @@ final class DownloadController extends AccountFileBase
                 'download.accountFile',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('File downloaded'))
                         ->addDetail(__u('File'), $fileDto->name)
                 )
diff --git a/app/modules/web/Controllers/AccountFile/UploadController.php b/app/modules/web/Controllers/AccountFile/UploadController.php
index bc399269..97573a45 100644
--- a/app/modules/web/Controllers/AccountFile/UploadController.php
+++ b/app/modules/web/Controllers/AccountFile/UploadController.php
@@ -135,7 +135,7 @@ final class UploadController extends ControllerBase
                     static function () use ($accountId, $fileData): EventMessage {
                         $account = $this->accountService->getByIdEnriched($accountId);
 
-                        return EventMessage::factory()
+                        return EventMessage::build()
                                            ->addDescription(__u('File saved'))
                                            ->addDetail(__u('File'), $fileData['name'])
                                            ->addDetail(__u('Account'), $account->getName())
diff --git a/app/modules/web/Controllers/AccountFile/ViewController.php b/app/modules/web/Controllers/AccountFile/ViewController.php
index 4b561efb..d04f4686 100644
--- a/app/modules/web/Controllers/AccountFile/ViewController.php
+++ b/app/modules/web/Controllers/AccountFile/ViewController.php
@@ -72,7 +72,7 @@ final class ViewController extends AccountFileBase
                     'show.accountFile',
                     new Event(
                         $this,
-                        EventMessage::factory()
+                        EventMessage::build()
                             ->addDescription(__u('File viewed'))
                             ->addDetail(__u('File'), $fileDto->name)
                     )
@@ -91,7 +91,7 @@ final class ViewController extends AccountFileBase
                     'show.accountFile',
                     new Event(
                         $this,
-                        EventMessage::factory()
+                        EventMessage::build()
                             ->addDescription(__u('File viewed'))
                             ->addDetail(__u('File'), $fileDto->name)
                     )
diff --git a/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php b/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php
index 37f55226..ee080c39 100644
--- a/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php
+++ b/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php
@@ -25,18 +25,22 @@
 namespace SP\Modules\Web\Controllers\AccountHistoryManager;
 
 use Exception;
-use JsonException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Ports\AccountHistoryService;
-use SP\Domain\Account\Ports\AccountService;
+use SP\Domain\Auth\Services\AuthException;
+use SP\Domain\Core\Exceptions\SessionTimeout;
+use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 use SP\Mvc\Controller\WebControllerHelper;
 
+use function SP\__u;
+use function SP\processException;
+
 /**
  * Class DeleteController
  *
@@ -47,17 +51,16 @@ final class DeleteController extends ControllerBase
     use ItemTrait;
     use JsonTrait;
 
-    private AccountHistoryService $accountHistoryService;
-    private AccountService        $accountService;
-
+    /**
+     * @throws AuthException
+     * @throws SessionTimeout
+     */
     public function __construct(
-        Application $application,
-        WebControllerHelper $webControllerHelper,
-        AccountHistoryService $accountHistoryService
+        Application                            $application,
+        WebControllerHelper                    $webControllerHelper,
+        private readonly AccountHistoryService $accountHistoryService
     ) {
-        $this->accountHistoryService = $accountHistoryService;
-
-        parent::__construct($application, $webControllerHelper,);
+        parent::__construct($application, $webControllerHelper);
 
         $this->checkLoggedIn();
     }
@@ -66,10 +69,10 @@ final class DeleteController extends ControllerBase
     /**
      * Delete action
      *
-     * @param  int|null  $id
+     * @param int|null $id
      *
      * @return bool
-     * @throws JsonException
+     * @throws SPException
      */
     public function deleteAction(?int $id = null): bool
     {
@@ -81,17 +84,14 @@ final class DeleteController extends ControllerBase
                     'delete.accountHistory.selection',
                     new Event(
                         $this,
-                        EventMessage::factory()
-                            ->addDescription(__u('Accounts removed'))
+                        EventMessage::build(__u('Accounts removed'))
                     )
                 );
 
-                return $this->returnJsonResponse(
-                    JsonMessage::JSON_SUCCESS,
-                    __u('Accounts removed')
-                );
+                return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Accounts removed'));
             }
-            $accountDetails = $this->accountHistoryService->getById($id);
+
+            $accountHistoryDto = $this->accountHistoryService->getById($id);
 
             $this->accountHistoryService->delete($id);
 
@@ -99,17 +99,12 @@ final class DeleteController extends ControllerBase
                 'delete.accountHistory',
                 new Event(
                     $this,
-                    EventMessage::factory()
-                        ->addDescription(__u('Account removed'))
-                        ->addDetail(__u('Account'), $accountDetails->getName())
-                        ->addDetail(__u('Client'), $accountDetails->getClientName())
+                    EventMessage::build(__u('Account removed'))
+                                ->addDetail(__u('Data'), (string)$accountHistoryDto)
                 )
             );
 
-            return $this->returnJsonResponse(
-                JsonMessage::JSON_SUCCESS,
-                __u('Account removed')
-            );
+            return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Account removed'));
         } catch (Exception $e) {
             processException($e);
 
diff --git a/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php b/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php
index 25e1f5ea..cca14771 100644
--- a/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php
+++ b/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php
@@ -25,17 +25,22 @@
 namespace SP\Modules\Web\Controllers\AccountHistoryManager;
 
 use Exception;
-use JsonException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Ports\AccountHistoryService;
 use SP\Domain\Account\Ports\AccountService;
+use SP\Domain\Auth\Services\AuthException;
+use SP\Domain\Core\Exceptions\SessionTimeout;
+use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\WebControllerHelper;
 
+use function SP\__u;
+use function SP\processException;
+
 /**
  * Class RestoreController
  *
@@ -45,18 +50,16 @@ final class RestoreController extends ControllerBase
 {
     use JsonTrait;
 
-    private AccountHistoryService $accountHistoryService;
-    private AccountService        $accountService;
-
+    /**
+     * @throws AuthException
+     * @throws SessionTimeout
+     */
     public function __construct(
-        Application           $application,
-        WebControllerHelper   $webControllerHelper,
-        AccountHistoryService $accountHistoryService,
-        AccountService        $accountService
+        Application                            $application,
+        WebControllerHelper                    $webControllerHelper,
+        private readonly AccountHistoryService $accountHistoryService,
+        private readonly AccountService        $accountService
     ) {
-        $this->accountHistoryService = $accountHistoryService;
-        $this->accountService = $accountService;
-
         parent::__construct($application, $webControllerHelper);
 
         $this->checkLoggedIn();
@@ -66,30 +69,28 @@ final class RestoreController extends ControllerBase
     /**
      * Saves restore action
      *
-     * @param  int  $id  Account's history ID
+     * @param int $id Account's history ID
      *
      * @return bool
-     * @throws JsonException
+     * @throws SPException
      */
     public function restoreAction(int $id): bool
     {
         try {
-            $accountDetails = $this->accountHistoryService->getById($id);
+            $accountHistoryDto = $this->accountHistoryService->getById($id);
 
-            if ($accountDetails->isModify) {
-                $this->accountService->restoreModified($id, $accountDetails->getAccountId());
+            if ($accountHistoryDto->isModify) {
+                $this->accountService->restoreModified($accountHistoryDto);
             } else {
-                $this->accountService->restoreRemoved($accountDetails);
+                $this->accountService->restoreRemoved($accountHistoryDto);
             }
 
             $this->eventDispatcher->notify(
                 'restore.accountHistory',
                 new Event(
                     $this,
-                    EventMessage::factory()
-                        ->addDescription(__u('Account restored'))
-                        ->addDetail(__u('Account'), $accountDetails->getName())
-                        ->addDetail(__u('Client'), $accountDetails->getClientName())
+                    EventMessage::build(__u('Account restored'))
+                                ->addDetail(__u('Data'), (string)$accountHistoryDto)
                 )
             );
 
diff --git a/app/modules/web/Controllers/AccountHistoryManager/SearchController.php b/app/modules/web/Controllers/AccountHistoryManager/SearchController.php
index 52ba01e8..af71ce98 100644
--- a/app/modules/web/Controllers/AccountHistoryManager/SearchController.php
+++ b/app/modules/web/Controllers/AccountHistoryManager/SearchController.php
@@ -26,15 +26,16 @@ namespace SP\Modules\Web\Controllers\AccountHistoryManager;
 
 use SP\Core\Application;
 use SP\Domain\Account\Ports\AccountHistoryService;
+use SP\Domain\Auth\Services\AuthException;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
+use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Html\DataGrid\DataGridInterface;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers;
-use SP\Modules\Web\Controllers\Helpers\Grid\AccountHistoryGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 use SP\Mvc\Controller\WebControllerHelper;
@@ -51,18 +52,16 @@ final class SearchController extends ControllerBase
     use ItemTrait;
     use JsonTrait;
 
-    private AccountHistoryService $accountHistoryService;
-    private AccountHistoryGrid    $accountHistoryGrid;
-
+    /**
+     * @throws AuthException
+     * @throws SessionTimeout
+     */
     public function __construct(
-        Application           $application,
-        WebControllerHelper   $webControllerHelper,
-        AccountHistoryService $accountHistoryService,
-        Helpers\Grid\AccountHistoryGrid $accountHistoryGrid
+        Application                                      $application,
+        WebControllerHelper                              $webControllerHelper,
+        private readonly AccountHistoryService           $accountHistoryService,
+        private readonly Helpers\Grid\AccountHistoryGrid $accountHistoryGrid
     ) {
-        $this->accountHistoryService = $accountHistoryService;
-        $this->accountHistoryGrid = $accountHistoryGrid;
-
         parent::__construct($application, $webControllerHelper);
 
         $this->checkLoggedIn();
diff --git a/app/modules/web/Controllers/AccountManager/DeleteController.php b/app/modules/web/Controllers/AccountManager/DeleteController.php
index 3e47b1d3..12978d8d 100644
--- a/app/modules/web/Controllers/AccountManager/DeleteController.php
+++ b/app/modules/web/Controllers/AccountManager/DeleteController.php
@@ -83,7 +83,7 @@ final class DeleteController extends ControllerBase
 
                 $this->eventDispatcher->notify(
                     'delete.account.selection',
-                    new Event($this, EventMessage::factory()->addDescription(__u('Accounts removed')))
+                    new Event($this, EventMessage::build()->addDescription(__u('Accounts removed')))
                 );
 
                 return $this->returnJsonResponseData(JsonMessage::JSON_SUCCESS, __u('Accounts removed'));
@@ -99,7 +99,7 @@ final class DeleteController extends ControllerBase
                 'delete.account',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Account removed'))
                         ->addDetail(__u('Account'), $accountDetails->getName())
                         ->addDetail(__u('Client'), $accountDetails->getClientName())
diff --git a/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php b/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php
index b7da4a2f..1c62b76e 100644
--- a/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php
+++ b/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php
@@ -101,7 +101,7 @@ final class SaveBulkEditController extends ControllerBase
 
             $this->eventDispatcher->notify(
                 'edit.account.bulk',
-                new Event($this, EventMessage::factory()->addDescription(__u('Accounts updated')))
+                new Event($this, EventMessage::build()->addDescription(__u('Accounts updated')))
             );
 
             return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Accounts updated'));
diff --git a/app/modules/web/Controllers/AuthToken/DeleteController.php b/app/modules/web/Controllers/AuthToken/DeleteController.php
index 70fd659f..84407d80 100644
--- a/app/modules/web/Controllers/AuthToken/DeleteController.php
+++ b/app/modules/web/Controllers/AuthToken/DeleteController.php
@@ -63,7 +63,7 @@ final class DeleteController extends AuthTokenSaveBase
 
                 $this->eventDispatcher->notify(
                     'delete.authToken.selection',
-                    new Event($this, EventMessage::factory()->addDescription(__u('Authorizations deleted')))
+                    new Event($this, EventMessage::build()->addDescription(__u('Authorizations deleted')))
                 );
 
                 return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Authorizations deleted'));
@@ -77,7 +77,7 @@ final class DeleteController extends AuthTokenSaveBase
                 'delete.authToken',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Authorization deleted'))
                         ->addDetail(__u('Authorization'), $id)
                 )
diff --git a/app/modules/web/Controllers/AuthToken/SaveEditController.php b/app/modules/web/Controllers/AuthToken/SaveEditController.php
index 3dbcf3c2..b72311a3 100644
--- a/app/modules/web/Controllers/AuthToken/SaveEditController.php
+++ b/app/modules/web/Controllers/AuthToken/SaveEditController.php
@@ -66,7 +66,7 @@ final class SaveEditController extends AuthTokenSaveBase
                     'refresh.authToken',
                     new Event(
                         $this,
-                        EventMessage::factory()
+                        EventMessage::build()
                             ->addDescription(__u('Authorization updated'))
                             ->addDetail(__u('Authorization'), $id)
                     )
@@ -78,7 +78,7 @@ final class SaveEditController extends AuthTokenSaveBase
                     'edit.authToken',
                     new Event(
                         $this,
-                        EventMessage::factory()
+                        EventMessage::build()
                             ->addDescription(__u('Authorization updated'))
                             ->addDetail(__u('Authorization'), $id)
                     )
diff --git a/app/modules/web/Controllers/AuthToken/ViewController.php b/app/modules/web/Controllers/AuthToken/ViewController.php
index 1432d5fb..0601b3e1 100644
--- a/app/modules/web/Controllers/AuthToken/ViewController.php
+++ b/app/modules/web/Controllers/AuthToken/ViewController.php
@@ -65,7 +65,7 @@ final class ViewController extends AuthTokenViewBase
                 'show.authToken',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Authorization viewed'))
                         ->addDetail(__u('Authorization'), $id)
                 )
diff --git a/app/modules/web/Controllers/Category/DeleteController.php b/app/modules/web/Controllers/Category/DeleteController.php
index 0b61405c..0e093eee 100644
--- a/app/modules/web/Controllers/Category/DeleteController.php
+++ b/app/modules/web/Controllers/Category/DeleteController.php
@@ -64,7 +64,7 @@ final class DeleteController extends CategorySaveBase
                     'delete.category',
                     new Event(
                         $this,
-                        EventMessage::factory()->addDescription(__u('Categories deleted'))
+                        EventMessage::build()->addDescription(__u('Categories deleted'))
                     )
                 );
 
@@ -79,7 +79,7 @@ final class DeleteController extends CategorySaveBase
                 'delete.category',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Category deleted'))
                         ->addDetail(__u('Category'), $id)
                 )
diff --git a/app/modules/web/Controllers/Category/SaveCreateAction.php b/app/modules/web/Controllers/Category/SaveCreateAction.php
index 4f34f406..122bc791 100644
--- a/app/modules/web/Controllers/Category/SaveCreateAction.php
+++ b/app/modules/web/Controllers/Category/SaveCreateAction.php
@@ -61,7 +61,7 @@ final class SaveCreateAction extends CategorySaveBase
                 'create.category',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Category added'))
                         ->addDetail(__u('Category'), $itemData->getName())
                 )
diff --git a/app/modules/web/Controllers/Category/SaveEditController.php b/app/modules/web/Controllers/Category/SaveEditController.php
index 71dd73d4..64b07c89 100644
--- a/app/modules/web/Controllers/Category/SaveEditController.php
+++ b/app/modules/web/Controllers/Category/SaveEditController.php
@@ -65,7 +65,7 @@ final class SaveEditController extends CategorySaveBase
                 'edit.category',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Category updated'))
                         ->addDetail(__u('Category'), $itemData->getName())
                 )
diff --git a/app/modules/web/Controllers/Client/DeleteController.php b/app/modules/web/Controllers/Client/DeleteController.php
index f47f7994..e66c589f 100644
--- a/app/modules/web/Controllers/Client/DeleteController.php
+++ b/app/modules/web/Controllers/Client/DeleteController.php
@@ -69,7 +69,7 @@ final class DeleteController extends ClientSaveBase
                     'delete.client.selection',
                     new Event(
                         $this,
-                        EventMessage::factory()->addDescription(__u('Clients deleted'))
+                        EventMessage::build()->addDescription(__u('Clients deleted'))
                     )
                 );
 
@@ -83,7 +83,7 @@ final class DeleteController extends ClientSaveBase
                 'delete.client',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Client deleted'))
                         ->addDetail(__u('Client'), $id)
                 )
diff --git a/app/modules/web/Controllers/Client/SaveCreateController.php b/app/modules/web/Controllers/Client/SaveCreateController.php
index af9dd01e..f9bb6a4c 100644
--- a/app/modules/web/Controllers/Client/SaveCreateController.php
+++ b/app/modules/web/Controllers/Client/SaveCreateController.php
@@ -67,7 +67,7 @@ final class SaveCreateController extends ClientSaveBase
                 'create.client',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Client added'))
                         ->addDetail(__u('Client'), $itemData->getName())
                 )
diff --git a/app/modules/web/Controllers/Client/SaveEditController.php b/app/modules/web/Controllers/Client/SaveEditController.php
index 461633c3..8dfd636d 100644
--- a/app/modules/web/Controllers/Client/SaveEditController.php
+++ b/app/modules/web/Controllers/Client/SaveEditController.php
@@ -69,7 +69,7 @@ final class SaveEditController extends ClientSaveBase
                 'edit.client',
                 new Event(
                     $this,
-                    EventMessage::factory()->addDescription(__u('Client updated'))->addDetail(__u('Client'), $id)
+                    EventMessage::build()->addDescription(__u('Client updated'))->addDetail(__u('Client'), $id)
                 )
             );
 
diff --git a/app/modules/web/Controllers/ConfigAccount/SaveController.php b/app/modules/web/Controllers/ConfigAccount/SaveController.php
index bc0b5c88..081ec118 100644
--- a/app/modules/web/Controllers/ConfigAccount/SaveController.php
+++ b/app/modules/web/Controllers/ConfigAccount/SaveController.php
@@ -54,7 +54,7 @@ final class SaveController extends SimpleControllerBase
     {
         $configData = $this->config->getConfigData();
 
-        $eventMessage = EventMessage::factory();
+        $eventMessage = EventMessage::build();
 
         try {
             $this->handleAccountsConfig($configData);
diff --git a/app/modules/web/Controllers/ConfigBackup/DownloadBackupAppController.php b/app/modules/web/Controllers/ConfigBackup/DownloadBackupAppController.php
index ab08d9c0..ba59acbf 100644
--- a/app/modules/web/Controllers/ConfigBackup/DownloadBackupAppController.php
+++ b/app/modules/web/Controllers/ConfigBackup/DownloadBackupAppController.php
@@ -88,7 +88,7 @@ final class DownloadBackupAppController extends SimpleControllerBase
                 'download.backupAppFile',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('File downloaded'))
                         ->addDetail(__u('File'), str_replace(APP_ROOT, '', $file->getFile()))
                 )
diff --git a/app/modules/web/Controllers/ConfigBackup/DownloadBackupDbController.php b/app/modules/web/Controllers/ConfigBackup/DownloadBackupDbController.php
index 03a9dcde..26abd0e9 100644
--- a/app/modules/web/Controllers/ConfigBackup/DownloadBackupDbController.php
+++ b/app/modules/web/Controllers/ConfigBackup/DownloadBackupDbController.php
@@ -88,7 +88,7 @@ final class DownloadBackupDbController extends SimpleControllerBase
                 'download.backupDbFile',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('File downloaded'))
                         ->addDetail(__u('File'), str_replace(APP_ROOT, '', $file->getFile()))
                 )
diff --git a/app/modules/web/Controllers/ConfigBackup/DownloadExportController.php b/app/modules/web/Controllers/ConfigBackup/DownloadExportController.php
index ecfc1340..c67e410c 100644
--- a/app/modules/web/Controllers/ConfigBackup/DownloadExportController.php
+++ b/app/modules/web/Controllers/ConfigBackup/DownloadExportController.php
@@ -83,7 +83,7 @@ final class DownloadExportController extends SimpleControllerBase
                 'download.exportFile',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('File downloaded'))
                         ->addDetail(__u('File'), str_replace(APP_ROOT, '', $file->getFile()))
                 )
diff --git a/app/modules/web/Controllers/ConfigBackup/FileBackupController.php b/app/modules/web/Controllers/ConfigBackup/FileBackupController.php
index 7060436c..157b0eab 100644
--- a/app/modules/web/Controllers/ConfigBackup/FileBackupController.php
+++ b/app/modules/web/Controllers/ConfigBackup/FileBackupController.php
@@ -80,7 +80,7 @@ final class FileBackupController extends SimpleControllerBase
                 'run.backup.end',
                 new Event(
                     $this,
-                    EventMessage::factory()->addDescription(
+                    EventMessage::build()->addDescription(
                         __u('Application and database backup completed successfully')
                     )
                 )
diff --git a/app/modules/web/Controllers/ConfigBackup/XmlExportController.php b/app/modules/web/Controllers/ConfigBackup/XmlExportController.php
index db870f9d..b3c59ea0 100644
--- a/app/modules/web/Controllers/ConfigBackup/XmlExportController.php
+++ b/app/modules/web/Controllers/ConfigBackup/XmlExportController.php
@@ -80,7 +80,7 @@ final class XmlExportController extends SimpleControllerBase
         try {
             $this->eventDispatcher->notify(
                 'run.export.start',
-                new Event($this, EventMessage::factory()->addDescription(__u('sysPass XML export')))
+                new Event($this, EventMessage::build()->addDescription(__u('sysPass XML export')))
             );
 
             Session::close();
@@ -92,7 +92,7 @@ final class XmlExportController extends SimpleControllerBase
 
             $this->eventDispatcher->notify(
                 'run.export.end',
-                new Event($this, EventMessage::factory()->addDescription(__u('Export process finished')))
+                new Event($this, EventMessage::build()->addDescription(__u('Export process finished')))
             );
 
             if (!empty($exportPassword)) {
@@ -108,7 +108,7 @@ final class XmlExportController extends SimpleControllerBase
                 'run.export.verify',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Verification of exported data finished'))
                         ->addDetail(__u('Version'), $verifyResult->getVersion())
                         ->addDetail(__u('Encrypted'), $verifyResult->isEncrypted() ? __u('Yes') : __u('No'))
diff --git a/app/modules/web/Controllers/ConfigEncryption/RefreshController.php b/app/modules/web/Controllers/ConfigEncryption/RefreshController.php
index 8a88c591..ad0e530c 100644
--- a/app/modules/web/Controllers/ConfigEncryption/RefreshController.php
+++ b/app/modules/web/Controllers/ConfigEncryption/RefreshController.php
@@ -77,7 +77,7 @@ final class RefreshController extends SimpleControllerBase
 
             $this->eventDispatcher->notify(
                 'refresh.masterPassword.hash',
-                new Event($this, EventMessage::factory()->addDescription(__u('Master password hash updated')))
+                new Event($this, EventMessage::build()->addDescription(__u('Master password hash updated')))
             );
 
             return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Master password hash updated'));
diff --git a/app/modules/web/Controllers/ConfigGeneral/DownloadConfigBackup.php b/app/modules/web/Controllers/ConfigGeneral/DownloadConfigBackup.php
index 3fc274a8..d09d7743 100644
--- a/app/modules/web/Controllers/ConfigGeneral/DownloadConfigBackup.php
+++ b/app/modules/web/Controllers/ConfigGeneral/DownloadConfigBackup.php
@@ -69,7 +69,7 @@ final class DownloadConfigBackup extends SimpleControllerBase
                 'download.configBackupFile',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('File downloaded'))
                         ->addDetail(__u('File'), 'config.json')
                 )
diff --git a/app/modules/web/Controllers/ConfigGeneral/DownloadLogController.php b/app/modules/web/Controllers/ConfigGeneral/DownloadLogController.php
index fade5d72..f2bf19fb 100644
--- a/app/modules/web/Controllers/ConfigGeneral/DownloadLogController.php
+++ b/app/modules/web/Controllers/ConfigGeneral/DownloadLogController.php
@@ -75,7 +75,7 @@ final class DownloadLogController extends SimpleControllerBase
                 'download.logFile',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('File downloaded'))
                         ->addDetail(
                             __u('File'),
diff --git a/app/modules/web/Controllers/ConfigGeneral/SaveController.php b/app/modules/web/Controllers/ConfigGeneral/SaveController.php
index 1ee9061c..c658c364 100644
--- a/app/modules/web/Controllers/ConfigGeneral/SaveController.php
+++ b/app/modules/web/Controllers/ConfigGeneral/SaveController.php
@@ -69,7 +69,7 @@ final class SaveController extends SimpleControllerBase
     public function saveAction(): bool
     {
         $configData = $this->config->getConfigData();
-        $eventMessage = EventMessage::factory();
+        $eventMessage = EventMessage::build();
 
         try {
             $this->handleGeneralConfig($configData);
diff --git a/app/modules/web/Controllers/ConfigImport/ImportController.php b/app/modules/web/Controllers/ConfigImport/ImportController.php
index e0b28539..48bb1ee5 100644
--- a/app/modules/web/Controllers/ConfigImport/ImportController.php
+++ b/app/modules/web/Controllers/ConfigImport/ImportController.php
@@ -88,7 +88,7 @@ final class ImportController extends SimpleControllerBase
                 'run.import.end',
                 new Event(
                     $this,
-                    EventMessage::factory()->addDetail(__u('Accounts imported'), $counter)
+                    EventMessage::build()->addDetail(__u('Accounts imported'), $counter)
                 )
             );
 
diff --git a/app/modules/web/Controllers/ConfigLdap/ImportController.php b/app/modules/web/Controllers/ConfigLdap/ImportController.php
index 542f5457..a474d284 100644
--- a/app/modules/web/Controllers/ConfigLdap/ImportController.php
+++ b/app/modules/web/Controllers/ConfigLdap/ImportController.php
@@ -78,7 +78,7 @@ final class ImportController extends SimpleControllerBase
 
             $this->eventDispatcher->notify(
                 'import.ldap.start',
-                new Event($this, EventMessage::factory()->addDescription(__u('LDAP Import')))
+                new Event($this, EventMessage::build()->addDescription(__u('LDAP Import')))
             );
 
             $userImportResults = $this->ldapImportService->importUsers($ldapParams, $ldapImportParams);
@@ -91,7 +91,7 @@ final class ImportController extends SimpleControllerBase
 
             $this->eventDispatcher->notify(
                 'import.ldap.end',
-                new Event($this, EventMessage::factory()->addDescription(__u('Import finished')))
+                new Event($this, EventMessage::build()->addDescription(__u('Import finished')))
             );
 
             if ($totalObjects === 0) {
diff --git a/app/modules/web/Controllers/ConfigLdap/SaveController.php b/app/modules/web/Controllers/ConfigLdap/SaveController.php
index 1ed64231..4f2e9e17 100644
--- a/app/modules/web/Controllers/ConfigLdap/SaveController.php
+++ b/app/modules/web/Controllers/ConfigLdap/SaveController.php
@@ -55,7 +55,7 @@ final class SaveController extends SimpleControllerBase
     public function saveAction(): bool
     {
         try {
-            $eventMessage = EventMessage::factory();
+            $eventMessage = EventMessage::build();
             $configData = $this->config->getConfigData();
 
             $ldapEnabled = $this->request->analyzeBool('ldap_enabled', false);
diff --git a/app/modules/web/Controllers/ConfigMail/CheckController.php b/app/modules/web/Controllers/ConfigMail/CheckController.php
index 82b9d586..944e9e57 100644
--- a/app/modules/web/Controllers/ConfigMail/CheckController.php
+++ b/app/modules/web/Controllers/ConfigMail/CheckController.php
@@ -80,7 +80,7 @@ final class CheckController extends SimpleControllerBase
                 'send.mail.check',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Email sent'))
                         ->addDetail(__u('Recipient'), $mailRecipients[0])
                 )
@@ -101,7 +101,7 @@ final class CheckController extends SimpleControllerBase
     }
 
     /**
-     * @return \SP\Domain\Notification\Dtos\MailParams
+     * @return MailParams
      */
     private function handleMailConfig(): MailParams
     {
diff --git a/app/modules/web/Controllers/ConfigMail/SaveController.php b/app/modules/web/Controllers/ConfigMail/SaveController.php
index bacf21ad..bbe1bc98 100644
--- a/app/modules/web/Controllers/ConfigMail/SaveController.php
+++ b/app/modules/web/Controllers/ConfigMail/SaveController.php
@@ -50,7 +50,7 @@ final class SaveController extends SimpleControllerBase
      */
     public function saveAction(): bool
     {
-        $eventMessage = EventMessage::factory();
+        $eventMessage = EventMessage::build();
         $configData = $this->config->getConfigData();
 
         // Mail
diff --git a/app/modules/web/Controllers/ConfigWiki/SaveController.php b/app/modules/web/Controllers/ConfigWiki/SaveController.php
index 308efdfd..8a7ddd71 100644
--- a/app/modules/web/Controllers/ConfigWiki/SaveController.php
+++ b/app/modules/web/Controllers/ConfigWiki/SaveController.php
@@ -49,7 +49,7 @@ final class SaveController extends SimpleControllerBase
      */
     public function saveAction(): bool
     {
-        $eventMessage = EventMessage::factory();
+        $eventMessage = EventMessage::build();
         $configData = $this->config->getConfigData();
 
         $wikiEnabled = $this->request->analyzeBool('wiki_enabled', false);
diff --git a/app/modules/web/Controllers/CustomField/DeleteController.php b/app/modules/web/Controllers/CustomField/DeleteController.php
index 3982727a..f4f96d5f 100644
--- a/app/modules/web/Controllers/CustomField/DeleteController.php
+++ b/app/modules/web/Controllers/CustomField/DeleteController.php
@@ -65,7 +65,7 @@ final class DeleteController extends CustomFieldSaveBase
 
                 $this->eventDispatcher->notify(
                     'delete.customField.selection',
-                    new Event($this, EventMessage::factory()->addDescription(__u('Fields deleted')))
+                    new Event($this, EventMessage::build()->addDescription(__u('Fields deleted')))
                 );
 
                 return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Fields deleted'));
diff --git a/app/modules/web/Controllers/CustomField/SaveCreateController.php b/app/modules/web/Controllers/CustomField/SaveCreateController.php
index b891f3ec..0afc35f5 100644
--- a/app/modules/web/Controllers/CustomField/SaveCreateController.php
+++ b/app/modules/web/Controllers/CustomField/SaveCreateController.php
@@ -65,7 +65,7 @@ final class SaveCreateController extends CustomFieldSaveBase
                 'create.customField',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Field added'))
                         ->addDetail(__u('Field'), $itemData->getName())
                 )
diff --git a/app/modules/web/Controllers/CustomField/SaveEditController.php b/app/modules/web/Controllers/CustomField/SaveEditController.php
index 9d53020e..300e6d5c 100644
--- a/app/modules/web/Controllers/CustomField/SaveEditController.php
+++ b/app/modules/web/Controllers/CustomField/SaveEditController.php
@@ -74,7 +74,7 @@ final class SaveEditController extends CustomFieldSaveBase
                 'edit.customField',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Field updated'))
                         ->addDetail(__u('Field'), $itemData->getName())
                 )
diff --git a/app/modules/web/Controllers/Eventlog/ClearController.php b/app/modules/web/Controllers/Eventlog/ClearController.php
index 22c2137a..86243f0b 100644
--- a/app/modules/web/Controllers/Eventlog/ClearController.php
+++ b/app/modules/web/Controllers/Eventlog/ClearController.php
@@ -76,7 +76,7 @@ final class ClearController extends ControllerBase
 
             $this->eventDispatcher->notify(
                 'clear.eventlog',
-                new Event($this, EventMessage::factory()->addDescription(__u('Event log cleared')))
+                new Event($this, EventMessage::build()->addDescription(__u('Event log cleared')))
             );
 
             return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Event log cleared'));
diff --git a/app/modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php b/app/modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php
index 254c9119..cf4dab1a 100644
--- a/app/modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php
@@ -24,9 +24,7 @@
 
 namespace SP\Modules\Web\Controllers\Helpers\Grid;
 
-use SP\Core\Acl\Acl;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Domain\Core\Exceptions\SPException;
 use SP\Html\DataGrid\Action\DataGridAction;
 use SP\Html\DataGrid\Action\DataGridActionSearch;
 use SP\Html\DataGrid\Action\DataGridActionType;
@@ -37,11 +35,10 @@ use SP\Html\DataGrid\Layout\DataGridHeader;
 use SP\Infrastructure\Database\QueryResult;
 
 use function SP\__;
+use function SP\getElapsedTime;
 
 /**
  * Class AccountHistoryGrid
- *
- * @package SP\Modules\Web\Controllers\Helpers\Grid
  */
 final class AccountHistoryGrid extends GridBase
 {
@@ -111,9 +108,6 @@ final class AccountHistoryGrid extends GridBase
         return $gridHeader;
     }
 
-    /**
-     * @throws SPException
-     */
     protected function getData(): DataGridData
     {
         // Grid Data
@@ -153,7 +147,7 @@ final class AccountHistoryGrid extends GridBase
         $gridActionSearch->setOnSubmitFunction('appMgmt/search');
         $gridActionSearch->addData(
             'action-route',
-            Acl::getActionRoute(AclActionsInterface::ACCOUNTMGR_HISTORY_SEARCH)
+            $this->acl->getRouteFor(AclActionsInterface::ACCOUNTMGR_HISTORY_SEARCH)
         );
 
         return $gridActionSearch;
@@ -173,7 +167,7 @@ final class AccountHistoryGrid extends GridBase
         $gridAction->setOnClickFunction('accountManager/restore');
         $gridAction->addData(
             'action-route',
-            Acl::getActionRoute(AclActionsInterface::ACCOUNTMGR_HISTORY_RESTORE)
+            $this->acl->getRouteFor(AclActionsInterface::ACCOUNTMGR_HISTORY_RESTORE)
         );
 
         return $gridAction;
@@ -193,7 +187,7 @@ final class AccountHistoryGrid extends GridBase
         $gridAction->setOnClickFunction('appMgmt/delete');
         $gridAction->addData(
             'action-route',
-            Acl::getActionRoute(AclActionsInterface::ACCOUNTMGR_HISTORY_DELETE)
+            $this->acl->getRouteFor(AclActionsInterface::ACCOUNTMGR_HISTORY_DELETE)
         );
 
         return $gridAction;
diff --git a/app/modules/web/Controllers/ItemPreset/DeleteController.php b/app/modules/web/Controllers/ItemPreset/DeleteController.php
index bd72f7a1..96c908e7 100644
--- a/app/modules/web/Controllers/ItemPreset/DeleteController.php
+++ b/app/modules/web/Controllers/ItemPreset/DeleteController.php
@@ -65,7 +65,7 @@ final class DeleteController extends ItemPresetSaveBase
 
                 $this->eventDispatcher->notify(
                     'delete.itemPreset',
-                    new Event($this, EventMessage::factory()->addDescription(__u('Values deleted')))
+                    new Event($this, EventMessage::build()->addDescription(__u('Values deleted')))
                 );
 
                 return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Values deleted'));
@@ -77,7 +77,7 @@ final class DeleteController extends ItemPresetSaveBase
                 'delete.itemPreset',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Value deleted'))
                         ->addDetail(__u('ID'), $id)
                 )
diff --git a/app/modules/web/Controllers/ItemPreset/SaveCreateController.php b/app/modules/web/Controllers/ItemPreset/SaveCreateController.php
index 13aee48a..f2767eff 100644
--- a/app/modules/web/Controllers/ItemPreset/SaveCreateController.php
+++ b/app/modules/web/Controllers/ItemPreset/SaveCreateController.php
@@ -65,7 +65,7 @@ final class SaveCreateController extends ItemPresetSaveBase
                 'create.itemPreset',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Value created'))
                         ->addDetail(__u('Type'), $itemData->getItemPreset()->getType())
                         ->addDetail(__u('ID'), $id)
diff --git a/app/modules/web/Controllers/ItemPreset/SaveEditController.php b/app/modules/web/Controllers/ItemPreset/SaveEditController.php
index 3a71d382..40fef974 100644
--- a/app/modules/web/Controllers/ItemPreset/SaveEditController.php
+++ b/app/modules/web/Controllers/ItemPreset/SaveEditController.php
@@ -69,7 +69,7 @@ final class SaveEditController extends ItemPresetSaveBase
                 'edit.itemPreset',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Value updated'))
                         ->addDetail(__u('Type'), $itemData->getItemPreset()->getType())
                         ->addDetail(__u('ID'), $id)
diff --git a/app/modules/web/Controllers/Login/LoginController.php b/app/modules/web/Controllers/Login/LoginController.php
index 8771785b..224263c7 100644
--- a/app/modules/web/Controllers/Login/LoginController.php
+++ b/app/modules/web/Controllers/Login/LoginController.php
@@ -85,7 +85,7 @@ final class LoginController extends ControllerBase
 
             $this->eventDispatcher->notify(
                 'login.finish',
-                new Event($this, EventMessage::factory()->addExtra('redirect', $redirector))
+                new Event($this, EventMessage::build()->addExtra('redirect', $redirector))
             );
 
             return $this->returnJsonResponseData([
@@ -114,7 +114,7 @@ final class LoginController extends ControllerBase
                 'login.info',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDetail(
                             'Forwarded',
                             $this->configData->isDemoEnabled() ? '***' : implode(',', $forward)
diff --git a/app/modules/web/Controllers/Login/LogoutController.php b/app/modules/web/Controllers/Login/LogoutController.php
index 3523fe7c..b9a2cd8a 100644
--- a/app/modules/web/Controllers/Login/LogoutController.php
+++ b/app/modules/web/Controllers/Login/LogoutController.php
@@ -50,7 +50,7 @@ final class LogoutController extends ControllerBase
                 'logout',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Logout session'))
                         ->addDetail(__u('User'), $this->session->getUserData()->getLogin())
                         ->addDetail(__u('Inactive time'), $inactiveTime.' min.')
diff --git a/app/modules/web/Controllers/Notification/CheckController.php b/app/modules/web/Controllers/Notification/CheckController.php
index d181f581..fa56f84e 100644
--- a/app/modules/web/Controllers/Notification/CheckController.php
+++ b/app/modules/web/Controllers/Notification/CheckController.php
@@ -61,7 +61,7 @@ final class CheckController extends NotificationSaveBase
                 'check.notification',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Notification read'))
                         ->addDetail(__u('Notification'), $id)
                 )
diff --git a/app/modules/web/Controllers/Notification/DeleteController.php b/app/modules/web/Controllers/Notification/DeleteController.php
index f30e78e8..5618d382 100644
--- a/app/modules/web/Controllers/Notification/DeleteController.php
+++ b/app/modules/web/Controllers/Notification/DeleteController.php
@@ -61,7 +61,7 @@ final class DeleteController extends NotificationSaveBase
 
                 $this->eventDispatcher->notify(
                     'delete.notification.selection',
-                    new Event($this, EventMessage::factory()->addDescription(__u('Notifications deleted')))
+                    new Event($this, EventMessage::build()->addDescription(__u('Notifications deleted')))
                 );
 
                 return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Notifications deleted'));
@@ -77,7 +77,7 @@ final class DeleteController extends NotificationSaveBase
                 'delete.notification',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Notification deleted'))
                         ->addDetail(__u('Notification'), $id)
                 )
diff --git a/app/modules/web/Controllers/Notification/SaveCreateController.php b/app/modules/web/Controllers/Notification/SaveCreateController.php
index 6464c658..90e3bad6 100644
--- a/app/modules/web/Controllers/Notification/SaveCreateController.php
+++ b/app/modules/web/Controllers/Notification/SaveCreateController.php
@@ -57,7 +57,7 @@ final class SaveCreateController extends NotificationSaveBase
 
             $this->eventDispatcher->notify(
                 'create.notification',
-                new Event($this, EventMessage::factory()->addDescription(__u('Notification created')))
+                new Event($this, EventMessage::build()->addDescription(__u('Notification created')))
             );
 
             return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Notification created'));
diff --git a/app/modules/web/Controllers/Notification/SaveEditController.php b/app/modules/web/Controllers/Notification/SaveEditController.php
index eb9eec2e..60ed8d53 100644
--- a/app/modules/web/Controllers/Notification/SaveEditController.php
+++ b/app/modules/web/Controllers/Notification/SaveEditController.php
@@ -64,7 +64,7 @@ final class SaveEditController extends NotificationSaveBase
 
             $this->eventDispatcher->notify(
                 'edit.notification',
-                new Event($this, EventMessage::factory()->addDescription(__u('Notification updated')))
+                new Event($this, EventMessage::build()->addDescription(__u('Notification updated')))
             );
 
             return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Notification updated'));
diff --git a/app/modules/web/Controllers/Plugin/DisableController.php b/app/modules/web/Controllers/Plugin/DisableController.php
index bb7fdb81..57bfbf26 100644
--- a/app/modules/web/Controllers/Plugin/DisableController.php
+++ b/app/modules/web/Controllers/Plugin/DisableController.php
@@ -72,7 +72,7 @@ final class DisableController extends ControllerBase
 
             $this->eventDispatcher->notify(
                 'edit.plugin.disable',
-                new Event($this, EventMessage::factory()->addDescription(__u('Plugin disabled')))
+                new Event($this, EventMessage::build()->addDescription(__u('Plugin disabled')))
             );
 
             return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Plugin disabled'));
diff --git a/app/modules/web/Controllers/Plugin/EnableController.php b/app/modules/web/Controllers/Plugin/EnableController.php
index f3685019..faf3141c 100644
--- a/app/modules/web/Controllers/Plugin/EnableController.php
+++ b/app/modules/web/Controllers/Plugin/EnableController.php
@@ -72,7 +72,7 @@ final class EnableController extends ControllerBase
 
             $this->eventDispatcher->notify(
                 'edit.plugin.enable',
-                new Event($this, EventMessage::factory()->addDescription(__u('Plugin enabled')))
+                new Event($this, EventMessage::build()->addDescription(__u('Plugin enabled')))
             );
 
             return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Plugin enabled'));
diff --git a/app/modules/web/Controllers/Plugin/ResetController.php b/app/modules/web/Controllers/Plugin/ResetController.php
index dec948a1..f1623436 100644
--- a/app/modules/web/Controllers/Plugin/ResetController.php
+++ b/app/modules/web/Controllers/Plugin/ResetController.php
@@ -76,7 +76,7 @@ final class ResetController extends ControllerBase
 
             $this->eventDispatcher->notify(
                 'edit.plugin.reset',
-                new Event($this, EventMessage::factory()->addDescription(__u('Plugin reset')))
+                new Event($this, EventMessage::build()->addDescription(__u('Plugin reset')))
             );
 
             return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Plugin reset'));
diff --git a/app/modules/web/Controllers/PublicLink/DeleteController.php b/app/modules/web/Controllers/PublicLink/DeleteController.php
index 77f21a20..f4f02c34 100644
--- a/app/modules/web/Controllers/PublicLink/DeleteController.php
+++ b/app/modules/web/Controllers/PublicLink/DeleteController.php
@@ -66,7 +66,7 @@ final class DeleteController extends PublicLinkSaveBase
 
                 $this->eventDispatcher->notify(
                     'delete.publicLink.selection',
-                    new Event($this, EventMessage::factory()->addDescription(__u('Links deleted')))
+                    new Event($this, EventMessage::build()->addDescription(__u('Links deleted')))
                 );
 
                 return $this->returnJsonResponse(JsonMessage::JSON_SUCCESS, __u('Links deleted'));
@@ -78,7 +78,7 @@ final class DeleteController extends PublicLinkSaveBase
                 'delete.publicLink',
                 new Event(
                     $this,
-                    EventMessage::factory()->addDescription(__u('Link deleted'))->addDetail(__u('Link'), $id)
+                    EventMessage::build()->addDescription(__u('Link deleted'))->addDetail(__u('Link'), $id)
                 )
             );
 
diff --git a/app/modules/web/Controllers/User/DeleteController.php b/app/modules/web/Controllers/User/DeleteController.php
index b47d2fd0..be87a92a 100644
--- a/app/modules/web/Controllers/User/DeleteController.php
+++ b/app/modules/web/Controllers/User/DeleteController.php
@@ -67,7 +67,7 @@ final class DeleteController extends UserSaveBase
                     'delete.user.selection',
                     new Event(
                         $this,
-                        EventMessage::factory()
+                        EventMessage::build()
                             ->addDescription(__u('Users deleted'))
                             ->setExtra('userId', $this->getItemsIdFromRequest($this->request))
                     )
@@ -86,7 +86,7 @@ final class DeleteController extends UserSaveBase
                 'delete.user',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('User deleted'))
                         ->addDetail(__u('User'), $id)
                         ->addExtra('userId', $id)
diff --git a/app/modules/web/Controllers/User/SaveCreateController.php b/app/modules/web/Controllers/User/SaveCreateController.php
index ac346e00..4b1c7ae5 100644
--- a/app/modules/web/Controllers/User/SaveCreateController.php
+++ b/app/modules/web/Controllers/User/SaveCreateController.php
@@ -67,7 +67,7 @@ final class SaveCreateController extends UserSaveBase
                 'create.user',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('User added'))
                         ->addDetail(__u('User'), $itemData->getName())
                 )
diff --git a/app/modules/web/Controllers/User/SaveEditController.php b/app/modules/web/Controllers/User/SaveEditController.php
index 36e0e47d..fedc3f1f 100644
--- a/app/modules/web/Controllers/User/SaveEditController.php
+++ b/app/modules/web/Controllers/User/SaveEditController.php
@@ -71,7 +71,7 @@ final class SaveEditController extends UserSaveBase
                 'edit.user',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('User updated'))
                         ->addDetail(__u('User'), $itemData->getName())
                         ->addExtra('userId', $id)
diff --git a/app/modules/web/Controllers/User/SaveEditPassController.php b/app/modules/web/Controllers/User/SaveEditPassController.php
index a78d8c19..73078108 100644
--- a/app/modules/web/Controllers/User/SaveEditPassController.php
+++ b/app/modules/web/Controllers/User/SaveEditPassController.php
@@ -69,7 +69,7 @@ final class SaveEditPassController extends UserSaveBase
                 'edit.user.pass',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Password updated'))
                         ->addDetail(__u('User'), $id)
                 )
diff --git a/app/modules/web/Controllers/UserGroup/DeleteController.php b/app/modules/web/Controllers/UserGroup/DeleteController.php
index 638ce32d..3f8ed2ac 100644
--- a/app/modules/web/Controllers/UserGroup/DeleteController.php
+++ b/app/modules/web/Controllers/UserGroup/DeleteController.php
@@ -65,7 +65,7 @@ final class DeleteController extends UserGroupSaveBase
 
                 $this->eventDispatcher->notify(
                     'delete.userGroup.selection',
-                    new Event($this, EventMessage::factory()->addDescription(__u('Groups deleted')))
+                    new Event($this, EventMessage::build()->addDescription(__u('Groups deleted')))
                 );
 
                 $this->deleteCustomFieldsForItem(AclActionsInterface::GROUP, $id, $this->customFieldService);
@@ -79,7 +79,7 @@ final class DeleteController extends UserGroupSaveBase
                 'delete.userGroup',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Group deleted'))
                         ->addDetail(__u('Group'), $id)
                         ->addExtra('userGroupId', $id)
diff --git a/app/modules/web/Controllers/UserGroup/SaveCreateController.php b/app/modules/web/Controllers/UserGroup/SaveCreateController.php
index bc2f0282..6c68d7e2 100644
--- a/app/modules/web/Controllers/UserGroup/SaveCreateController.php
+++ b/app/modules/web/Controllers/UserGroup/SaveCreateController.php
@@ -67,7 +67,7 @@ final class SaveCreateController extends UserGroupSaveBase
                 'create.userGroup',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Group added'))
                         ->addDetail(__u('Name'), $groupData->getName())
                 )
diff --git a/app/modules/web/Controllers/UserGroup/SaveEditController.php b/app/modules/web/Controllers/UserGroup/SaveEditController.php
index c19dbda5..b433622b 100644
--- a/app/modules/web/Controllers/UserGroup/SaveEditController.php
+++ b/app/modules/web/Controllers/UserGroup/SaveEditController.php
@@ -71,7 +71,7 @@ final class SaveEditController extends UserGroupSaveBase
                 'edit.userGroup',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Group updated'))
                         ->addDetail(__u('Name'), $groupData->getName())
                         ->addExtra('userGroupId', $id)
diff --git a/app/modules/web/Controllers/UserPassReset/SaveRequestController.php b/app/modules/web/Controllers/UserPassReset/SaveRequestController.php
index 8caaf109..edd2cf5d 100644
--- a/app/modules/web/Controllers/UserPassReset/SaveRequestController.php
+++ b/app/modules/web/Controllers/UserPassReset/SaveRequestController.php
@@ -73,7 +73,7 @@ final class SaveRequestController extends UserPassResetSaveBase
                 'request.user.passReset',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Password Recovery'))
                         ->addDetail(__u('Requested for'), sprintf('%s (%s)', $login, $email))
                 )
diff --git a/app/modules/web/Controllers/UserPassReset/SaveResetController.php b/app/modules/web/Controllers/UserPassReset/SaveResetController.php
index 867fc2e3..afe82ed6 100644
--- a/app/modules/web/Controllers/UserPassReset/SaveResetController.php
+++ b/app/modules/web/Controllers/UserPassReset/SaveResetController.php
@@ -74,7 +74,7 @@ final class SaveResetController extends UserPassResetSaveBase
                 'edit.user.password',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Password updated'))
                         ->addDetail(__u('User'), $user->getLogin())
                         ->addExtra('userId', $userId)
diff --git a/app/modules/web/Controllers/UserProfile/DeleteController.php b/app/modules/web/Controllers/UserProfile/DeleteController.php
index cf6ff2a9..5dd0c2d3 100644
--- a/app/modules/web/Controllers/UserProfile/DeleteController.php
+++ b/app/modules/web/Controllers/UserProfile/DeleteController.php
@@ -65,7 +65,7 @@ final class DeleteController extends UserProfileSaveBase
 
                 $this->eventDispatcher->notify(
                     'delete.userProfile.selection',
-                    new Event($this, EventMessage::factory()->addDescription(__u('Profiles deleted')))
+                    new Event($this, EventMessage::build()->addDescription(__u('Profiles deleted')))
                 );
 
                 $this->deleteCustomFieldsForItem(AclActionsInterface::PROFILE, $id, $this->customFieldService);
@@ -79,7 +79,7 @@ final class DeleteController extends UserProfileSaveBase
                 'delete.userProfile',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Profile deleted'))
                         ->addDetail(__u('Profile'), $id)
                         ->addExtra('userProfileId', $id)
diff --git a/app/modules/web/Controllers/UserProfile/SaveCreateController.php b/app/modules/web/Controllers/UserProfile/SaveCreateController.php
index 3e48a488..a47bae7a 100644
--- a/app/modules/web/Controllers/UserProfile/SaveCreateController.php
+++ b/app/modules/web/Controllers/UserProfile/SaveCreateController.php
@@ -67,7 +67,7 @@ final class SaveCreateController extends UserProfileSaveBase
                 'create.userProfile',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Profile added'))
                         ->addDetail(__u('Name'), $profileData->getName())
                 )
diff --git a/app/modules/web/Controllers/UserProfile/SaveEditController.php b/app/modules/web/Controllers/UserProfile/SaveEditController.php
index f3018f9f..f0b15f4e 100644
--- a/app/modules/web/Controllers/UserProfile/SaveEditController.php
+++ b/app/modules/web/Controllers/UserProfile/SaveEditController.php
@@ -71,7 +71,7 @@ final class SaveEditController extends UserProfileSaveBase
                 'edit.userProfile',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Profile updated'))
                         ->addDetail(__u('Name'), $profileData->getName())
                         ->addExtra('userProfileId', $id)
diff --git a/lib/SP/Core/Acl/Acl.php b/lib/SP/Core/Acl/Acl.php
index 750d25b4..ce9013a6 100644
--- a/lib/SP/Core/Acl/Acl.php
+++ b/lib/SP/Core/Acl/Acl.php
@@ -278,7 +278,7 @@ final readonly class Acl implements AclActionsInterface, AclInterface
             'acl.deny',
             new Event(
                 $this,
-                EventMessage::factory()
+                EventMessage::build()
                             ->addDescription(__u('Access denied'))
                             ->addDetail(__u('Action'), $actionName)
                     ->addDetail(__u('User'), $userDto->login)
diff --git a/lib/SP/Core/Events/EventMessage.php b/lib/SP/Core/Events/EventMessage.php
index c4ea4892..973b2448 100644
--- a/lib/SP/Core/Events/EventMessage.php
+++ b/lib/SP/Core/Events/EventMessage.php
@@ -48,11 +48,38 @@ class EventMessage implements MessageInterface
     private array $extra              = [];
 
     /**
+     * @param string|null $description
      * @return EventMessage
      */
-    public static function factory(): EventMessage
+    public static function build(?string $description = null): EventMessage
     {
-        return new self();
+        $eventMessage = new self();
+
+        if ($description) {
+            $eventMessage->addDescription($description);
+        }
+
+        return $eventMessage;
+    }
+
+    /**
+     * Establece la descripción de la acción realizada
+     */
+    public function addDescription(string $description = ''): EventMessage
+    {
+        $this->description[] = $this->formatString($description);
+
+        $this->descriptionCounter++;
+
+        return $this;
+    }
+
+    /**
+     * Formatear una cadena para guardarla en el registro
+     */
+    private function formatString(string $string): string
+    {
+        return strip_tags($string);
     }
 
     /**
@@ -71,26 +98,6 @@ class EventMessage implements MessageInterface
         return $this;
     }
 
-    /**
-     * Formatear una cadena para guardarla en el registro
-     */
-    private function formatString(string $string): string
-    {
-        return strip_tags($string);
-    }
-
-    /**
-     * Establece la descripción de la acción realizada
-     */
-    public function addDescription(string $description = ''): EventMessage
-    {
-        $this->description[] = $this->formatString($description);
-
-        $this->descriptionCounter++;
-
-        return $this;
-    }
-
     /**
      * Componer un mensaje en formato texto
      */
diff --git a/lib/SP/Domain/Account/Services/AccountAcl.php b/lib/SP/Domain/Account/Services/AccountAcl.php
index 1335e9f5..85ae8190 100644
--- a/lib/SP/Domain/Account/Services/AccountAcl.php
+++ b/lib/SP/Domain/Account/Services/AccountAcl.php
@@ -99,7 +99,7 @@ final class AccountAcl extends Service implements AccountAclService
                 if (!$isModified) {
                     $this->eventDispatcher->notify(
                         'get.acl',
-                        new Event($this, EventMessage::factory()->addDescription('Account ACL HIT'))
+                        new Event($this, EventMessage::build()->addDescription('Account ACL HIT'))
                     );
 
                     return $accountAcl;
@@ -111,7 +111,7 @@ final class AccountAcl extends Service implements AccountAclService
 
         $this->eventDispatcher->notify(
             'get.acl',
-            new Event($this, EventMessage::factory()->addDescription('Account ACL MISS'))
+            new Event($this, EventMessage::build()->addDescription('Account ACL MISS'))
         );
 
         $this->accountPermission->setAccountId($accountAclDto->getAccountId());
diff --git a/lib/SP/Domain/Account/Services/AccountHistory.php b/lib/SP/Domain/Account/Services/AccountHistory.php
index 7ca8684c..92b9b625 100644
--- a/lib/SP/Domain/Account/Services/AccountHistory.php
+++ b/lib/SP/Domain/Account/Services/AccountHistory.php
@@ -136,10 +136,13 @@ final class AccountHistory extends Service implements AccountHistoryService
      * @param int[] $ids
      *
      * @return int
+     * @throws ServiceException
      */
     public function deleteByIdBatch(array $ids): int
     {
-        return $this->accountHistoryRepository->deleteByIdBatch($ids);
+        return $this->accountHistoryRepository->transactionAware(function () use ($ids) {
+            return $this->accountHistoryRepository->deleteByIdBatch($ids);
+        }, $this);
     }
 
     /**
diff --git a/lib/SP/Domain/Account/Services/AccountMasterPassword.php b/lib/SP/Domain/Account/Services/AccountMasterPassword.php
index 9352514c..888d35bb 100644
--- a/lib/SP/Domain/Account/Services/AccountMasterPassword.php
+++ b/lib/SP/Domain/Account/Services/AccountMasterPassword.php
@@ -74,7 +74,7 @@ final class AccountMasterPassword extends Service implements AccountMasterPasswo
                 'update.masterPassword.accounts.start',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Update Master Password'))
                 )
             );
@@ -123,7 +123,7 @@ final class AccountMasterPassword extends Service implements AccountMasterPasswo
         $startTime = time();
         $numAccounts = count($accounts);
 
-        $eventMessage = EventMessage::factory();
+        $eventMessage = EventMessage::build();
 
         if ($numAccounts === 0) {
             $eventMessage->addDescription(__u('There are no accounts for processing'));
@@ -225,7 +225,7 @@ final class AccountMasterPassword extends Service implements AccountMasterPasswo
                 'update.masterPassword.accountsHistory.start',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Update Master Password (H)'))
                 )
             );
diff --git a/lib/SP/Domain/Auth/Providers/Ldap/LdapActions.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapActions.php
index 1a959349..0af77593 100644
--- a/lib/SP/Domain/Auth/Providers/Ldap/LdapActions.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapActions.php
@@ -109,7 +109,7 @@ final class LdapActions implements LdapActionsService
                 'ldap.search.group',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Error while searching the group RDN'))
                                 ->addDetail(__u('Group'), $group)
                                 ->addDetail('LDAP ERROR', $this->ldap->getLastError())
diff --git a/lib/SP/Domain/Auth/Providers/Ldap/LdapAuth.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapAuth.php
index 9f245da8..ef2d0e9a 100644
--- a/lib/SP/Domain/Auth/Providers/Ldap/LdapAuth.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapAuth.php
@@ -126,7 +126,7 @@ final readonly class LdapAuth implements LdapAuthService
                 'ldap.getAttributes',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Error while searching the user on LDAP'))
                                 ->addDetail(
                                     'LDAP FILTER',
diff --git a/lib/SP/Domain/Auth/Providers/Ldap/LdapConnection.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapConnection.php
index 46476239..c2561e53 100644
--- a/lib/SP/Domain/Auth/Providers/Ldap/LdapConnection.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapConnection.php
@@ -107,7 +107,7 @@ final class LdapConnection implements LdapConnectionInterface
             'ldap.check.connection',
             new Event(
                 $this,
-                EventMessage::factory()
+                EventMessage::build()
                             ->addDescription(__u('LDAP connection OK'))
             )
         );
@@ -140,7 +140,7 @@ final class LdapConnection implements LdapConnectionInterface
                 'ldap.bind',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('LDAP connection error'))
                                 ->addDetail('LDAP ERROR', $this->ldap->getLastError())
                                 ->addDetail('LDAP DN', $username)
diff --git a/lib/SP/Domain/Auth/Providers/Ldap/LdapMsAds.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapMsAds.php
index 2dfb23eb..1ce56de6 100644
--- a/lib/SP/Domain/Auth/Providers/Ldap/LdapMsAds.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapMsAds.php
@@ -126,7 +126,7 @@ final class LdapMsAds extends LdapBase
                 'ldap.check.group',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('User in group verified'))
                                 ->addDetail(__u('User'), $userLogin)
                                 ->addDetail(__u('Group'), $this->ldapParams->getGroup())
@@ -156,7 +156,7 @@ final class LdapMsAds extends LdapBase
                 'ldap.check.group',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('User does not belong to the group'))
                                 ->addDetail(__u('User'), $userLogin)
                                 ->addDetail(__u('Group'), $groupDn)
@@ -171,7 +171,7 @@ final class LdapMsAds extends LdapBase
             'ldap.check.group',
             new Event(
                 $this,
-                EventMessage::factory()
+                EventMessage::build()
                             ->addDescription(__u('User in group verified'))
                             ->addDetail(__u('User'), $userLogin)
                             ->addDetail(__u('Group'), $groupDn)
diff --git a/lib/SP/Domain/Auth/Providers/Ldap/LdapStd.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapStd.php
index 88645c79..0fc3fae1 100644
--- a/lib/SP/Domain/Auth/Providers/Ldap/LdapStd.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapStd.php
@@ -111,7 +111,7 @@ final class LdapStd extends LdapBase
                 'ldap.check.group',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('User in group verified'))
                                 ->addDetail(__u('User'), $userDn)
                                 ->addDetail(__u('Group'), $this->ldapParams->getGroup())
@@ -139,7 +139,7 @@ final class LdapStd extends LdapBase
                 'ldap.check.group',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('User does not belong to the group'))
                                 ->addDetail(__u('User'), $userDn)
                                 ->addDetail(__u('Group'), $this->getGroupFromParams())
@@ -154,7 +154,7 @@ final class LdapStd extends LdapBase
             'ldap.check.group',
             new Event(
                 $this,
-                EventMessage::factory()
+                EventMessage::build()
                             ->addDescription(__u('User in group verified'))
                             ->addDetail(__u('User'), $userDn)
                             ->addDetail(__u('Group'), $this->getGroupFromParams())
diff --git a/lib/SP/Domain/Auth/Services/Login.php b/lib/SP/Domain/Auth/Services/Login.php
index cc673dad..2645027c 100644
--- a/lib/SP/Domain/Auth/Services/Login.php
+++ b/lib/SP/Domain/Auth/Services/Login.php
@@ -151,7 +151,7 @@ final class Login extends LoginBase implements LoginService
 
             $this->eventDispatcher->notify(
                 'login.session.load',
-                new Event($this, EventMessage::factory()->addDetail(__u('User'), $userDataDto->login))
+                new Event($this, EventMessage::build()->addDetail(__u('User'), $userDataDto->login))
             );
         } catch (ConstraintException|NoSuchItemException|QueryException $e) {
             throw ServiceException::from($e);
diff --git a/lib/SP/Domain/Auth/Services/LoginAuthHandler.php b/lib/SP/Domain/Auth/Services/LoginAuthHandler.php
index 9b392661..e443d9cb 100644
--- a/lib/SP/Domain/Auth/Services/LoginAuthHandler.php
+++ b/lib/SP/Domain/Auth/Services/LoginAuthHandler.php
@@ -76,7 +76,7 @@ final class LoginAuthHandler extends LoginBase implements LoginAuthHandlerServic
      */
     public function authDatabase(DatabaseAuthData $authData, UserLoginDto $userLoginDto): void
     {
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDetail(__u('Type'), AuthType::Database->value)
                                     ->addDetail(__u('User'), $userLoginDto->getLoginUser());
 
@@ -108,7 +108,7 @@ final class LoginAuthHandler extends LoginBase implements LoginAuthHandlerServic
     {
         $authType = $this->request->getServer('AUTH_TYPE') ?: __('N/A');
 
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDetail(__u('Type'), AuthType::Browser->value)
                                     ->addDetail(__u('User'), $userLoginDto->getLoginUser())
                                     ->addDetail(
@@ -162,7 +162,7 @@ final class LoginAuthHandler extends LoginBase implements LoginAuthHandlerServic
      */
     public function authLdap(LdapAuthData $authData, UserLoginDto $userLoginDto): void
     {
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDetail(__u('Type'), AuthType::Ldap->value)
                                     ->addDetail(__u('LDAP Server'), $authData->getServer())
                                     ->addDetail(__u('User'), $userLoginDto->getLoginUser());
diff --git a/lib/SP/Domain/Auth/Services/LoginMasterPass.php b/lib/SP/Domain/Auth/Services/LoginMasterPass.php
index ec177f39..d2327b06 100644
--- a/lib/SP/Domain/Auth/Services/LoginMasterPass.php
+++ b/lib/SP/Domain/Auth/Services/LoginMasterPass.php
@@ -86,7 +86,7 @@ final class LoginMasterPass extends LoginBase implements LoginMasterPassService
             if (!$this->temporaryMasterPassService->checkKey($key)) {
                 $this->eventDispatcher->notify(
                     'login.masterPass',
-                    new Event($this, EventMessage::factory()->addDescription(__u('Wrong master password')))
+                    new Event($this, EventMessage::build()->addDescription(__u('Wrong master password')))
                 );
 
                 $this->addTracking();
@@ -96,7 +96,7 @@ final class LoginMasterPass extends LoginBase implements LoginMasterPassService
 
             $this->eventDispatcher->notify(
                 'login.masterPass.temporary',
-                new Event($this, EventMessage::factory()->addDescription(__u('Using temporary password')))
+                new Event($this, EventMessage::build()->addDescription(__u('Using temporary password')))
             );
 
             $userMasterPassDto = $this->userMasterPassService->updateOnLogin(
@@ -108,7 +108,7 @@ final class LoginMasterPass extends LoginBase implements LoginMasterPassService
             if ($userMasterPassDto->getUserMasterPassStatus() !== UserMasterPassStatus::Ok) {
                 $this->eventDispatcher->notify(
                     'login.masterPass',
-                    new Event($this, EventMessage::factory()->addDescription(__u('Wrong master password')))
+                    new Event($this, EventMessage::build()->addDescription(__u('Wrong master password')))
                 );
 
                 $this->addTracking();
@@ -118,7 +118,7 @@ final class LoginMasterPass extends LoginBase implements LoginMasterPassService
 
             $this->eventDispatcher->notify(
                 'login.masterPass',
-                new Event($this, EventMessage::factory()->addDescription(__u('Master password updated')))
+                new Event($this, EventMessage::build()->addDescription(__u('Master password updated')))
             );
         } catch (NoSuchItemException|CryptException $e) {
             throw ServiceException::error('Internal error', __FUNCTION__, Service::STATUS_INTERNAL_ERROR, $e);
@@ -136,7 +136,7 @@ final class LoginMasterPass extends LoginBase implements LoginMasterPassService
         if ($userMasterPassDto->getUserMasterPassStatus() !== UserMasterPassStatus::Ok) {
             $this->eventDispatcher->notify(
                 'login.masterPass',
-                new Event($this, EventMessage::factory()->addDescription(__u('Wrong master password')))
+                new Event($this, EventMessage::build()->addDescription(__u('Wrong master password')))
             );
 
             $this->addTracking();
@@ -146,7 +146,7 @@ final class LoginMasterPass extends LoginBase implements LoginMasterPassService
 
         $this->eventDispatcher->notify(
             'login.masterPass',
-            new Event($this, EventMessage::factory()->addDescription(__u('Master password updated')))
+            new Event($this, EventMessage::build()->addDescription(__u('Master password updated')))
         );
     }
 
@@ -176,7 +176,7 @@ final class LoginMasterPass extends LoginBase implements LoginMasterPassService
             case UserMasterPassStatus::Ok:
                 $this->eventDispatcher->notify(
                     'login.masterPass',
-                    new Event($this, EventMessage::factory()->addDescription(__u('Master password loaded')))
+                    new Event($this, EventMessage::build()->addDescription(__u('Master password loaded')))
                 );
                 break;
         }
diff --git a/lib/SP/Domain/Auth/Services/LoginUser.php b/lib/SP/Domain/Auth/Services/LoginUser.php
index b1526752..453e14d9 100644
--- a/lib/SP/Domain/Auth/Services/LoginUser.php
+++ b/lib/SP/Domain/Auth/Services/LoginUser.php
@@ -74,7 +74,7 @@ final class LoginUser extends LoginBase implements LoginUserService
                     'login.checkUser.disabled',
                     new Event(
                         $this,
-                        EventMessage::factory()
+                        EventMessage::build()
                                     ->addDescription(__u('User disabled'))
                             ->addDetail(__u('User'), $userDto->login)
                     )
@@ -88,7 +88,7 @@ final class LoginUser extends LoginBase implements LoginUserService
             if ($userDto->isChangePass) {
                 $this->eventDispatcher->notify(
                     'login.checkUser.changePass',
-                    new Event($this, EventMessage::factory()->addDetail(__u('User'), $userDto->login))
+                    new Event($this, EventMessage::build()->addDetail(__u('User'), $userDto->login))
                 );
 
                 $hash = Password::generateRandomBytes(16);
diff --git a/lib/SP/Domain/Common/Adapters/PrintableTrait.php b/lib/SP/Domain/Common/Adapters/PrintableTrait.php
new file mode 100644
index 00000000..74d82564
--- /dev/null
+++ b/lib/SP/Domain/Common/Adapters/PrintableTrait.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * sysPass
+ *
+ * @author nuxsmin
+ * @link https://syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass 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.
+ *
+ * sysPass 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 sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace SP\Domain\Common\Adapters;
+
+use SP\Domain\Core\Exceptions\SPException;
+
+/**
+ * Trait PrintableTrait
+ */
+trait PrintableTrait
+{
+    /**
+     * Convert the model to its string representation.
+     *
+     * @return string
+     * @throws SPException
+     */
+    public function __toString()
+    {
+        return $this->toJson();
+    }
+
+    /**
+     * Convert the model instance to JSON.
+     *
+     * @param int $options
+     *
+     * @return string
+     * @throws SPException
+     */
+    public function toJson(int $options = 0): string
+    {
+        return Serde::serializeJson($this, $options);
+    }
+}
diff --git a/lib/SP/Domain/Common/Dtos/Dto.php b/lib/SP/Domain/Common/Dtos/Dto.php
index 3aebdb3c..18cc5bac 100644
--- a/lib/SP/Domain/Common/Dtos/Dto.php
+++ b/lib/SP/Domain/Common/Dtos/Dto.php
@@ -31,6 +31,7 @@ use ReflectionClass;
 use ReflectionException;
 use ReflectionMethod;
 use SP\Domain\Common\Adapters\DumpMode;
+use SP\Domain\Common\Adapters\PrintableTrait;
 use SP\Domain\Common\Attributes\DtoTransformation;
 use SP\Domain\Common\Attributes\ModelBounded;
 use SP\Domain\Common\Models\Model;
@@ -46,6 +47,8 @@ use function SP\processException;
  */
 abstract class Dto implements DtoInterface
 {
+    use PrintableTrait;
+
     /**
      * @inheritDoc
      * @throws SPException
diff --git a/lib/SP/Domain/Common/Models/Model.php b/lib/SP/Domain/Common/Models/Model.php
index 7921d8b6..287ba391 100644
--- a/lib/SP/Domain/Common/Models/Model.php
+++ b/lib/SP/Domain/Common/Models/Model.php
@@ -28,16 +28,16 @@ namespace SP\Domain\Common\Models;
 
 use ArrayAccess;
 use Error;
-use JsonException;
 use JsonSerializable;
-use SP\Domain\Common\Adapters\Serde;
-use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\Common\Adapters\PrintableTrait;
 
 /**
  * Class Model
  */
 abstract class Model implements JsonSerializable, ArrayAccess
 {
+    use PrintableTrait;
+
     /**
      * Dynamically declared properties. Must not be class' properties
      */
@@ -158,31 +158,6 @@ abstract class Model implements JsonSerializable, ArrayAccess
         return new static(array_merge($this->toArray(), $properties));
     }
 
-    /**
-     * Convert the model to its string representation.
-     *
-     * @return string
-     * @throws JsonException
-     * @throws SPException
-     */
-    public function __toString()
-    {
-        return $this->toJson();
-    }
-
-    /**
-     * Convert the model instance to JSON.
-     *
-     * @param int $options
-     *
-     * @return string
-     * @throws SPException
-     */
-    public function toJson(int $options = 0): string
-    {
-        return Serde::serializeJson($this, $options);
-    }
-
     /**
      * Specify data which should be serialized to JSON
      *
diff --git a/lib/SP/Domain/Crypt/Services/TemporaryMasterPass.php b/lib/SP/Domain/Crypt/Services/TemporaryMasterPass.php
index baff6552..79585c9e 100644
--- a/lib/SP/Domain/Crypt/Services/TemporaryMasterPass.php
+++ b/lib/SP/Domain/Crypt/Services/TemporaryMasterPass.php
@@ -120,7 +120,7 @@ final class TemporaryMasterPass extends Service implements TemporaryMasterPassSe
                 'create.tempMasterPassword',
                 new Event(
                     $this,
-                    EventMessage::factory()->addDescription(__u('Generate temporary password'))
+                    EventMessage::build()->addDescription(__u('Generate temporary password'))
                 )
             );
 
@@ -151,7 +151,7 @@ final class TemporaryMasterPass extends Service implements TemporaryMasterPassSe
                     'check.tempMasterPassword',
                     new Event(
                         $this,
-                        EventMessage::factory()
+                        EventMessage::build()
                             ->addDescription(__u('Temporary password expired'))
                     )
                 );
@@ -208,7 +208,7 @@ final class TemporaryMasterPass extends Service implements TemporaryMasterPassSe
             'expire.tempMasterPassword',
             new Event(
                 $this,
-                EventMessage::factory()->addDescription(__u('Temporary password expired'))
+                EventMessage::build()->addDescription(__u('Temporary password expired'))
             )
         );
     }
diff --git a/lib/SP/Domain/CustomField/Services/CustomFieldCrypt.php b/lib/SP/Domain/CustomField/Services/CustomFieldCrypt.php
index 12ec5537..495dd72e 100644
--- a/lib/SP/Domain/CustomField/Services/CustomFieldCrypt.php
+++ b/lib/SP/Domain/CustomField/Services/CustomFieldCrypt.php
@@ -98,7 +98,7 @@ final class CustomFieldCrypt extends Service implements CustomFieldCryptService
                 'update.masterPassword.customFieldsData',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Update Master Password'))
                                 ->addDescription(__u('There aren\'t any data from custom fields'))
                 )
@@ -111,7 +111,7 @@ final class CustomFieldCrypt extends Service implements CustomFieldCryptService
             'update.masterPassword.customFieldsData.start',
             new Event(
                 $this,
-                EventMessage::factory()
+                EventMessage::build()
                             ->addDescription(__u('Update Master Password'))
                             ->addDescription(__u('Updating encrypted data'))
             )
@@ -141,7 +141,7 @@ final class CustomFieldCrypt extends Service implements CustomFieldCryptService
             'update.masterPassword.customFieldsData.end',
             new Event(
                 $this,
-                EventMessage::factory()
+                EventMessage::build()
                             ->addDescription(__u('Update Master Password'))
                             ->addDetail(__u('Records updated'), implode(',', $success))
                             ->addDetail(__u('Records not updated'), implode(',', $errors))
diff --git a/lib/SP/Domain/Export/Services/BackupFile.php b/lib/SP/Domain/Export/Services/BackupFile.php
index 4d0c9e20..50b245c7 100644
--- a/lib/SP/Domain/Export/Services/BackupFile.php
+++ b/lib/SP/Domain/Export/Services/BackupFile.php
@@ -84,7 +84,7 @@ final class BackupFile extends Service implements BackupFileService
 
             $this->eventDispatcher->notify(
                 'run.backup.start',
-                new Event($this, EventMessage::factory()->addDescription(__u('Make Backup')))
+                new Event($this, EventMessage::build()->addDescription(__u('Make Backup')))
             );
 
             $configData = $this->config->getConfigData();
@@ -129,7 +129,7 @@ final class BackupFile extends Service implements BackupFileService
             'run.backup.process',
             new Event(
                 $this,
-                EventMessage::factory()->addDescription(__u('Copying database'))
+                EventMessage::build()->addDescription(__u('Copying database'))
             )
         );
 
@@ -265,7 +265,7 @@ final class BackupFile extends Service implements BackupFileService
     {
         $this->eventDispatcher->notify(
             'run.backup.process',
-            new Event($this, EventMessage::factory()->addDescription(__u('Copying application')))
+            new Event($this, EventMessage::build()->addDescription(__u('Copying application')))
         );
 
         $this->appArchiveHandler->compressDirectory($directory, self::BACKUP_INCLUDE_REGEX);
diff --git a/lib/SP/Domain/Export/Services/XmlAccountExport.php b/lib/SP/Domain/Export/Services/XmlAccountExport.php
index 3e009557..6342e35b 100644
--- a/lib/SP/Domain/Export/Services/XmlAccountExport.php
+++ b/lib/SP/Domain/Export/Services/XmlAccountExport.php
@@ -61,7 +61,7 @@ final class XmlAccountExport extends XmlExportEntityBase
         try {
             $this->eventDispatcher->notify(
                 'run.export.process.account',
-                new Event($this, EventMessage::factory()->addDescription(__u('Exporting accounts')))
+                new Event($this, EventMessage::build()->addDescription(__u('Exporting accounts')))
             );
 
             $accounts = $this->accountService->getAllBasic();
diff --git a/lib/SP/Domain/Export/Services/XmlCategoryExport.php b/lib/SP/Domain/Export/Services/XmlCategoryExport.php
index d77336e9..c207cfb6 100644
--- a/lib/SP/Domain/Export/Services/XmlCategoryExport.php
+++ b/lib/SP/Domain/Export/Services/XmlCategoryExport.php
@@ -57,7 +57,7 @@ final class XmlCategoryExport extends XmlExportEntityBase
         try {
             $this->eventDispatcher->notify(
                 'run.export.process.category',
-                new Event($this, EventMessage::factory()->addDescription(__u('Exporting categories')))
+                new Event($this, EventMessage::build()->addDescription(__u('Exporting categories')))
             );
 
             $categories = $this->categoryService->getAll();
diff --git a/lib/SP/Domain/Export/Services/XmlClientExport.php b/lib/SP/Domain/Export/Services/XmlClientExport.php
index 2a7890ce..be42628c 100644
--- a/lib/SP/Domain/Export/Services/XmlClientExport.php
+++ b/lib/SP/Domain/Export/Services/XmlClientExport.php
@@ -58,7 +58,7 @@ final class XmlClientExport extends XmlExportEntityBase
         try {
             $this->eventDispatcher->notify(
                 'run.export.process.client',
-                new Event($this, EventMessage::factory()->addDescription(__u('Exporting clients')))
+                new Event($this, EventMessage::build()->addDescription(__u('Exporting clients')))
             );
 
             $clients = $this->clientService->getAll();
diff --git a/lib/SP/Domain/Export/Services/XmlTagExport.php b/lib/SP/Domain/Export/Services/XmlTagExport.php
index 881f319c..6b2694ab 100644
--- a/lib/SP/Domain/Export/Services/XmlTagExport.php
+++ b/lib/SP/Domain/Export/Services/XmlTagExport.php
@@ -57,7 +57,7 @@ final class XmlTagExport extends XmlExportEntityBase
         try {
             $this->eventDispatcher->notify(
                 'run.export.process.tag',
-                new Event($this, EventMessage::factory()->addDescription(__u('Exporting tags')))
+                new Event($this, EventMessage::build()->addDescription(__u('Exporting tags')))
             );
 
             $tags = $this->tagService->getAll();
diff --git a/lib/SP/Domain/Import/Services/CsvImport.php b/lib/SP/Domain/Import/Services/CsvImport.php
index f72fd717..8513d553 100644
--- a/lib/SP/Domain/Import/Services/CsvImport.php
+++ b/lib/SP/Domain/Import/Services/CsvImport.php
@@ -73,7 +73,7 @@ final class CsvImport extends ImportBase implements ItemsImportService
             'run.import.csv',
             new Event(
                 $this,
-                EventMessage::factory()
+                EventMessage::build()
                             ->addDescription(sprintf(__('Detected format: %s'), 'CSV'))
             )
         );
@@ -136,7 +136,7 @@ final class CsvImport extends ImportBase implements ItemsImportService
                     'run.import.csv.process.account',
                     new Event(
                         $this,
-                        EventMessage::factory()
+                        EventMessage::build()
                                     ->addDetail(__u('Account imported'), $accountName)
                                     ->addDetail(__u('Client'), $clientName)
                     )
@@ -148,7 +148,7 @@ final class CsvImport extends ImportBase implements ItemsImportService
                     'exception',
                     new Event(
                         $e,
-                        EventMessage::factory()
+                        EventMessage::build()
                                     ->addDetail(__u('Error while importing the account'), $accountName)
                                     ->addDetail(__u('Error while processing line'), $line)
                     )
diff --git a/lib/SP/Domain/Import/Services/KeepassImport.php b/lib/SP/Domain/Import/Services/KeepassImport.php
index 8d18fc26..7103b13d 100644
--- a/lib/SP/Domain/Import/Services/KeepassImport.php
+++ b/lib/SP/Domain/Import/Services/KeepassImport.php
@@ -65,7 +65,7 @@ final class KeepassImport extends XmlImportBase implements ItemsImportService
     {
         $this->eventDispatcher->notify(
             'run.import.keepass',
-            new Event($this, EventMessage::factory()->addDescription(__u('KeePass XML Import')))
+            new Event($this, EventMessage::build()->addDescription(__u('KeePass XML Import')))
         );
 
         $this->process($importParams);
@@ -84,7 +84,7 @@ final class KeepassImport extends XmlImportBase implements ItemsImportService
 
         $this->eventDispatcher->notify(
             'run.import.keepass.process.client',
-            new Event($this, EventMessage::factory()->addDetail(__u('Client added'), 'KeePass'))
+            new Event($this, EventMessage::build()->addDetail(__u('Client added'), 'KeePass'))
         );
 
         $this->getGroups();
@@ -128,7 +128,7 @@ final class KeepassImport extends XmlImportBase implements ItemsImportService
 
             $this->eventDispatcher->notify(
                 'run.import.keepass.process.category',
-                new Event($this, EventMessage::factory()->addDetail(__u('Category imported'), $groupName))
+                new Event($this, EventMessage::build()->addDetail(__u('Category imported'), $groupName))
             );
 
             $this->entries[$groupName] = new SplObjectStorage();
@@ -209,7 +209,7 @@ final class KeepassImport extends XmlImportBase implements ItemsImportService
                     'run.import.keepass.process.account',
                     new Event(
                         $this,
-                        EventMessage::factory()
+                        EventMessage::build()
                             ->addDetail(__u('Account imported'), $account->name)
                                     ->addDetail(__u('Category'), $groupName)
                     )
diff --git a/lib/SP/Domain/Import/Services/LdapImport.php b/lib/SP/Domain/Import/Services/LdapImport.php
index 35bdf1a7..20567347 100644
--- a/lib/SP/Domain/Import/Services/LdapImport.php
+++ b/lib/SP/Domain/Import/Services/LdapImport.php
@@ -77,7 +77,7 @@ final class LdapImport extends Service implements LdapImportService
 
         $this->eventDispatcher->notify(
             'import.ldap.groups',
-            new Event($this, EventMessage::factory()->addDetail(__u('Objects found'), $objects->getCount()))
+            new Event($this, EventMessage::build()->addDetail(__u('Objects found'), $objects->getCount()))
         );
 
         $iterator = $objects->getIterator();
@@ -97,7 +97,7 @@ final class LdapImport extends Service implements LdapImportService
                         'import.ldap.progress.groups',
                         new Event(
                             $this,
-                            EventMessage::factory()
+                            EventMessage::build()
                                         ->addDetail(__u('Group'), sprintf('%s', $userGroup['name']))
                         )
                     );
@@ -163,7 +163,7 @@ final class LdapImport extends Service implements LdapImportService
 
         $this->eventDispatcher->notify(
             'import.ldap.users',
-            new Event($this, EventMessage::factory()->addDetail(__u('Objects found'), $objects->getCount()))
+            new Event($this, EventMessage::build()->addDetail(__u('Objects found'), $objects->getCount()))
         );
 
         $iterator = $objects->getIterator();
@@ -189,7 +189,7 @@ final class LdapImport extends Service implements LdapImportService
                         'import.ldap.progress.users',
                         new Event(
                             $this,
-                            EventMessage::factory()
+                            EventMessage::build()
                                         ->addDetail(
                                             __u('User'),
                                             sprintf('%s (%s)', $user['name'], $user['login'])
diff --git a/lib/SP/Domain/Import/Services/SyspassImport.php b/lib/SP/Domain/Import/Services/SyspassImport.php
index d261fcd2..a2af3724 100644
--- a/lib/SP/Domain/Import/Services/SyspassImport.php
+++ b/lib/SP/Domain/Import/Services/SyspassImport.php
@@ -67,7 +67,7 @@ final class SyspassImport extends XmlImportBase implements ItemsImportService
         try {
             $this->eventDispatcher->notify(
                 'run.import.syspass',
-                new Event($this, EventMessage::factory()->addDescription(__u('sysPass XML Import')))
+                new Event($this, EventMessage::build()->addDescription(__u('sysPass XML Import')))
             );
 
             $this->version = $this->getXmlVersion();
@@ -174,7 +174,7 @@ final class SyspassImport extends XmlImportBase implements ItemsImportService
 
         $this->eventDispatcher->notify(
             'run.import.syspass.process.decryption',
-            new Event($this, EventMessage::factory()->addDescription(__u('Data unencrypted')))
+            new Event($this, EventMessage::build()->addDescription(__u('Data unencrypted')))
         );
     }
 
@@ -190,7 +190,7 @@ final class SyspassImport extends XmlImportBase implements ItemsImportService
                 'run.import.syspass.process.verify',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Error while checking integrity hash'))
                         ->addDescription(
                             __u(
@@ -228,7 +228,7 @@ final class SyspassImport extends XmlImportBase implements ItemsImportService
                     'run.import.syspass.process.category',
                     new Event(
                         $this,
-                        EventMessage::factory()
+                        EventMessage::build()
                                     ->addDetail(__u('Category imported'), $data['name'])
                     )
                 );
@@ -238,7 +238,7 @@ final class SyspassImport extends XmlImportBase implements ItemsImportService
                 'exception',
                 new Event(
                     $e,
-                    EventMessage::factory()->addDescription(__('Unable to import categories'))
+                    EventMessage::build()->addDescription(__('Unable to import categories'))
                 )
             );
 
@@ -272,7 +272,7 @@ final class SyspassImport extends XmlImportBase implements ItemsImportService
                     'run.import.syspass.process.client',
                     new Event(
                         $this,
-                        EventMessage::factory()
+                        EventMessage::build()
                                     ->addDetail(__u('Client imported'), $data['name'])
                     )
                 );
@@ -282,7 +282,7 @@ final class SyspassImport extends XmlImportBase implements ItemsImportService
                 'exception',
                 new Event(
                     $e,
-                    EventMessage::factory()->addDescription(__('Unable to import clients'))
+                    EventMessage::build()->addDescription(__('Unable to import clients'))
                 )
             );
 
@@ -317,7 +317,7 @@ final class SyspassImport extends XmlImportBase implements ItemsImportService
                     'run.import.syspass.process.tag',
                     new Event(
                         $this,
-                        EventMessage::factory()->addDetail(__u('Tag imported'), $data['name'])
+                        EventMessage::build()->addDetail(__u('Tag imported'), $data['name'])
                     )
                 );
             }
@@ -326,7 +326,7 @@ final class SyspassImport extends XmlImportBase implements ItemsImportService
                 'exception',
                 new Event(
                     $e,
-                    EventMessage::factory()->addDescription(__('Unable to import tags'))
+                    EventMessage::build()->addDescription(__('Unable to import tags'))
                 )
             );
 
@@ -374,7 +374,7 @@ final class SyspassImport extends XmlImportBase implements ItemsImportService
                     'run.import.syspass.process.account',
                     new Event(
                         $this,
-                        EventMessage::factory()->addDetail(__u('Account imported'), $data['name'])
+                        EventMessage::build()->addDetail(__u('Account imported'), $data['name'])
                     )
                 );
             } catch (Exception $e) {
@@ -382,7 +382,7 @@ final class SyspassImport extends XmlImportBase implements ItemsImportService
                     'exception',
                     new Event(
                         $e,
-                        EventMessage::factory()->addDescription(__('Unable to import account'))
+                        EventMessage::build()->addDescription(__('Unable to import account'))
                     )
                 );
 
diff --git a/lib/SP/Domain/Notification/Services/Mail.php b/lib/SP/Domain/Notification/Services/Mail.php
index d85b7ca5..07f16471 100644
--- a/lib/SP/Domain/Notification/Services/Mail.php
+++ b/lib/SP/Domain/Notification/Services/Mail.php
@@ -160,7 +160,7 @@ final class Mail extends Service implements MailService
                 'send.mail',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                         ->addDescription(__u('Email sent'))
                         ->addDetail(
                             __u('Recipient'),
diff --git a/lib/SP/Domain/Plugin/Services/PluginCompatility.php b/lib/SP/Domain/Plugin/Services/PluginCompatility.php
index 0ba4d7a3..002486cd 100644
--- a/lib/SP/Domain/Plugin/Services/PluginCompatility.php
+++ b/lib/SP/Domain/Plugin/Services/PluginCompatility.php
@@ -69,7 +69,7 @@ final class PluginCompatility extends Service implements PluginCompatilityServic
                 'plugin.check.version',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(
                                     sprintf(
                                         __('Plugin version not compatible (%s)'),
@@ -85,7 +85,7 @@ final class PluginCompatility extends Service implements PluginCompatilityServic
                 'plugin.edit.disable',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDetail(__('Plugin disabled'), $plugin->getName())
                 )
             );
@@ -97,7 +97,7 @@ final class PluginCompatility extends Service implements PluginCompatilityServic
             'plugin.check.version',
             new Event(
                 $this,
-                EventMessage::factory()
+                EventMessage::build()
                             ->addDescription(
                                 sprintf(
                                     __('Plugin version compatible (%s)'),
diff --git a/lib/SP/Domain/Plugin/Services/PluginLoader.php b/lib/SP/Domain/Plugin/Services/PluginLoader.php
index 6deeb36d..b84e201f 100644
--- a/lib/SP/Domain/Plugin/Services/PluginLoader.php
+++ b/lib/SP/Domain/Plugin/Services/PluginLoader.php
@@ -61,7 +61,7 @@ final class PluginLoader extends Service implements PluginLoaderService
                 'plugin.load',
                 new Event(
                     $e,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDetail(__('Plugin not registered'), $plugin->getName())
                 )
             );
@@ -76,7 +76,7 @@ final class PluginLoader extends Service implements PluginLoaderService
                 'plugin.load',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDetail(__('Plugin loaded'), $plugin->getName())
                 )
             );
@@ -85,7 +85,7 @@ final class PluginLoader extends Service implements PluginLoaderService
                 'plugin.load',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDetail(__('Plugin not loaded (disabled)'), $plugin->getName())
                 )
             );
diff --git a/lib/SP/Domain/Plugin/Services/PluginRegister.php b/lib/SP/Domain/Plugin/Services/PluginRegister.php
index 34124556..5b8cb13e 100644
--- a/lib/SP/Domain/Plugin/Services/PluginRegister.php
+++ b/lib/SP/Domain/Plugin/Services/PluginRegister.php
@@ -62,7 +62,7 @@ final class PluginRegister extends Service implements PluginRegisterService
                 'register.plugin',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Plugin already registered'))
                                 ->addDetail(__u('Name'), $plugin->getName())
                 )
@@ -72,7 +72,7 @@ final class PluginRegister extends Service implements PluginRegisterService
                 'register.plugin',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Plugin not registered yet'))
                                 ->addDetail(__u('Name'), $plugin->getName())
                 )
@@ -94,7 +94,7 @@ final class PluginRegister extends Service implements PluginRegisterService
             'create.plugin',
             new Event(
                 $this,
-                EventMessage::factory()
+                EventMessage::build()
                             ->addDescription(__u('New Plugin'))
                             ->addDetail(__u('Name'), $plugin->getName())
             )
diff --git a/lib/SP/Domain/Plugin/Services/PluginUpgrader.php b/lib/SP/Domain/Plugin/Services/PluginUpgrader.php
index 0a099b97..d40d5510 100644
--- a/lib/SP/Domain/Plugin/Services/PluginUpgrader.php
+++ b/lib/SP/Domain/Plugin/Services/PluginUpgrader.php
@@ -67,7 +67,7 @@ final class PluginUpgrader extends Service implements PluginUpgraderInterface
                 'plugin.upgrade',
                 new Event(
                     $e,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDetail(__('Plugin not registered'), $plugin->getName())
                 )
             );
@@ -82,7 +82,7 @@ final class PluginUpgrader extends Service implements PluginUpgraderInterface
                 'plugin.upgrade.process',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Upgrading plugin'))
                                 ->addDetail(__u('Name'), $plugin->getName())
                 )
@@ -96,7 +96,7 @@ final class PluginUpgrader extends Service implements PluginUpgraderInterface
                 'plugin.upgrade.process',
                 new Event(
                     $this,
-                    EventMessage::factory()
+                    EventMessage::build()
                                 ->addDescription(__u('Plugin upgraded'))
                                 ->addDetail(__u('Name'), $plugin->getName())
                 )
diff --git a/lib/SP/Domain/Security/Services/Track.php b/lib/SP/Domain/Security/Services/Track.php
index e1ede127..ef4edb04 100644
--- a/lib/SP/Domain/Security/Services/Track.php
+++ b/lib/SP/Domain/Security/Services/Track.php
@@ -115,7 +115,7 @@ final class Track extends Service implements TrackService
                     'track.delay',
                     new Event(
                         $this,
-                        EventMessage::factory()
+                        EventMessage::build()
                             ->addDescription(
                                 sprintf(
                                     __('Attempts exceeded (%d/%d)'),
@@ -165,7 +165,7 @@ final class Track extends Service implements TrackService
             'track.add',
             new Event(
                 $this,
-                EventMessage::factory()->addDescription($this->request->getClientAddress(true))
+                EventMessage::build()->addDescription($this->request->getClientAddress(true))
             )
         );
 
diff --git a/lib/SP/Domain/Upgrade/Services/Upgrade.php b/lib/SP/Domain/Upgrade/Services/Upgrade.php
index 6351a975..ceb11037 100644
--- a/lib/SP/Domain/Upgrade/Services/Upgrade.php
+++ b/lib/SP/Domain/Upgrade/Services/Upgrade.php
@@ -81,7 +81,7 @@ final class Upgrade extends Service implements UpgradeService
             sprintf('upgrade.%s.start', $class),
             new Event(
                 $this,
-                EventMessage::factory()->addDescription(__u('Update'))->addDetail('type', $class)
+                EventMessage::build()->addDescription(__u('Update'))->addDetail('type', $class)
             )
         );
 
@@ -102,7 +102,7 @@ final class Upgrade extends Service implements UpgradeService
             sprintf('upgrade.%s.end', $class),
             new Event(
                 $this,
-                EventMessage::factory()->addDescription(__u('Update'))->addDetail('type', $class)
+                EventMessage::build()->addDescription(__u('Update'))->addDetail('type', $class)
             )
         );
     }
diff --git a/lib/SP/Domain/Upgrade/Services/UpgradeDatabase.php b/lib/SP/Domain/Upgrade/Services/UpgradeDatabase.php
index 98d311c4..bf529a5e 100644
--- a/lib/SP/Domain/Upgrade/Services/UpgradeDatabase.php
+++ b/lib/SP/Domain/Upgrade/Services/UpgradeDatabase.php
@@ -70,7 +70,7 @@ final class UpgradeDatabase extends Service implements UpgradeHandlerService
 
             $this->eventDispatcher->notify(
                 'upgrade.db.process',
-                new Event($this, EventMessage::factory()->addDetail(__u('Version'), $version))
+                new Event($this, EventMessage::build()->addDetail(__u('Version'), $version))
             );
 
             try {
@@ -84,7 +84,7 @@ final class UpgradeDatabase extends Service implements UpgradeHandlerService
                     'exception',
                     new Event(
                         $this,
-                        EventMessage::factory()
+                        EventMessage::build()
                             ->addDescription(__u('Error while updating the database'))
                             ->addDetail('ERROR', sprintf('%s (%s)', $e->getMessage(), $e->getCode()))
                     )
@@ -106,7 +106,7 @@ final class UpgradeDatabase extends Service implements UpgradeHandlerService
             'upgrade.db.process',
             new Event(
                 $this,
-                EventMessage::factory()->addDescription(__u('Database updating was completed successfully.'))
+                EventMessage::build()->addDescription(__u('Database updating was completed successfully.'))
             )
         );
 
diff --git a/lib/SP/Infrastructure/Common/Repositories/BaseRepository.php b/lib/SP/Infrastructure/Common/Repositories/BaseRepository.php
index b8079cc8..f5ecfa0f 100644
--- a/lib/SP/Infrastructure/Common/Repositories/BaseRepository.php
+++ b/lib/SP/Infrastructure/Common/Repositories/BaseRepository.php
@@ -83,7 +83,7 @@ abstract class BaseRepository implements Repository
 
                 $this->eventDispatcher->notify(
                     'database.rollback',
-                    new Event($this, EventMessage::factory()->addDescription(__u('Rollback')))
+                    new Event($this, EventMessage::build()->addDescription(__u('Rollback')))
                 );
                 $this->eventDispatcher->notify('exception', new Event($e));
 
diff --git a/lib/SP/Infrastructure/Database/Database.php b/lib/SP/Infrastructure/Database/Database.php
index 967f0b30..7a20ae56 100644
--- a/lib/SP/Infrastructure/Database/Database.php
+++ b/lib/SP/Infrastructure/Database/Database.php
@@ -105,7 +105,7 @@ final class Database implements DatabaseInterface
 
             $this->eventDispatcher->notify(
                 'database.query',
-                new Event($this, EventMessage::factory()->addDescription($query->getStatement()))
+                new Event($this, EventMessage::build()->addDescription($query->getStatement()))
             );
 
             if ($query instanceof SelectInterface) {
@@ -253,7 +253,7 @@ final class Database implements DatabaseInterface
                 'database.transaction.begin',
                 new Event(
                     $this,
-                    EventMessage::factory()->addExtra('result', $result)
+                    EventMessage::build()->addExtra('result', $result)
                 )
             );
 
@@ -280,7 +280,7 @@ final class Database implements DatabaseInterface
             'database.transaction.end',
             new Event(
                 $this,
-                EventMessage::factory()->addExtra('result', $result)
+                EventMessage::build()->addExtra('result', $result)
             )
         );
 
@@ -302,7 +302,7 @@ final class Database implements DatabaseInterface
             'database.transaction.rollback',
             new Event(
                 $this,
-                EventMessage::factory()->addExtra('result', $result)
+                EventMessage::build()->addExtra('result', $result)
             )
         );
 
diff --git a/tests/SP/Core/Events/EventTest.php b/tests/SP/Core/Events/EventTest.php
index bfb7ad0a..2ef8d419 100644
--- a/tests/SP/Core/Events/EventTest.php
+++ b/tests/SP/Core/Events/EventTest.php
@@ -47,7 +47,7 @@ class EventTest extends TestCase
     public function testGetSource()
     {
         $object = (object)[1];
-        $event = new Event($object, EventMessage::factory());
+        $event = new Event($object, EventMessage::build());
 
         $out = $event->getSource(stdClass::class);
 
@@ -60,7 +60,7 @@ class EventTest extends TestCase
     public function testGetSourceWithException()
     {
         $object = (object)[1];
-        $event = new Event($object, EventMessage::factory());
+        $event = new Event($object, EventMessage::build());
 
         $this->expectException(InvalidClassException::class);
         $this->expectExceptionMessage('Source type mismatch');
@@ -70,7 +70,7 @@ class EventTest extends TestCase
 
     public function testGetEventMessage()
     {
-        $eventMessage = EventMessage::factory()->addDescription('test');
+        $eventMessage = EventMessage::build()->addDescription('test');
         $event = new Event($this, $eventMessage);
 
         $this->assertEquals($eventMessage, $event->getEventMessage());
diff --git a/tests/SP/Domain/Log/Providers/DatabaseHandlerTest.php b/tests/SP/Domain/Log/Providers/DatabaseHandlerTest.php
index ddb2e3f7..ca20d9ee 100644
--- a/tests/SP/Domain/Log/Providers/DatabaseHandlerTest.php
+++ b/tests/SP/Domain/Log/Providers/DatabaseHandlerTest.php
@@ -78,7 +78,7 @@ class DatabaseHandlerTest extends UnitaryTestCase
      */
     public function testUpdate()
     {
-        $eventMessage = EventMessage::factory()->addDescription('a_description')->addDetail('a_detail', 'a_value');
+        $eventMessage = EventMessage::build()->addDescription('a_description')->addDetail('a_detail', 'a_value');
         $event = new Event($this, $eventMessage);
 
         $this->language
diff --git a/tests/SP/Domain/Log/Providers/LogHandlerTest.php b/tests/SP/Domain/Log/Providers/LogHandlerTest.php
index b187738c..c3027f97 100644
--- a/tests/SP/Domain/Log/Providers/LogHandlerTest.php
+++ b/tests/SP/Domain/Log/Providers/LogHandlerTest.php
@@ -71,7 +71,7 @@ class LogHandlerTest extends UnitaryTestCase
             ->with(true)
             ->willReturn($ipv4);
 
-        $eventMessage = EventMessage::factory()->addDescription('test');
+        $eventMessage = EventMessage::build()->addDescription('test');
         $event = new Event($this, $eventMessage);
 
         $this->logger
diff --git a/tests/SP/Domain/Notification/Services/MailEventTest.php b/tests/SP/Domain/Notification/Services/MailEventTest.php
index 8eaea518..7447f949 100644
--- a/tests/SP/Domain/Notification/Services/MailEventTest.php
+++ b/tests/SP/Domain/Notification/Services/MailEventTest.php
@@ -54,7 +54,7 @@ class MailEventTest extends UnitaryTestCase
 
     public function testUpdate()
     {
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDescription('a_description')
                                     ->addDetail('a_detail', 'a_value')
                                     ->setExtra('email', ['an_email']);
@@ -92,7 +92,7 @@ class MailEventTest extends UnitaryTestCase
     {
         $this->configData->setMailRecipients(['an_email']);
 
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDescription('a_description')
                                     ->addDetail('a_detail', 'a_value');
 
@@ -127,7 +127,7 @@ class MailEventTest extends UnitaryTestCase
 
     public function testUpdateWithNoEmail()
     {
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDescription('a_description')
                                     ->addDetail('a_detail', 'a_value');
 
@@ -142,7 +142,7 @@ class MailEventTest extends UnitaryTestCase
 
     public function testUpdateWithNoDescriptionAndDetails()
     {
-        $eventMessage = EventMessage::factory()->setExtra('email', ['an_email']);
+        $eventMessage = EventMessage::build()->setExtra('email', ['an_email']);
 
         $event = new Event($this, $eventMessage);
 
@@ -175,7 +175,7 @@ class MailEventTest extends UnitaryTestCase
 
     public function testUpdateWithEmptyRecipients()
     {
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDescription('a_description')
                                     ->addDetail('a_detail', 'a_value')
                                     ->setExtra('email', ['an_email', '']);
@@ -211,7 +211,7 @@ class MailEventTest extends UnitaryTestCase
 
     public function testUpdateWithException()
     {
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDescription('a_description')
                                     ->addDetail('a_detail', 'a_value')
                                     ->addExtra('email', ['an_email']);
diff --git a/tests/SP/Domain/Notification/Services/NotificationEventTest.php b/tests/SP/Domain/Notification/Services/NotificationEventTest.php
index d0580872..c6b8480d 100644
--- a/tests/SP/Domain/Notification/Services/NotificationEventTest.php
+++ b/tests/SP/Domain/Notification/Services/NotificationEventTest.php
@@ -48,7 +48,7 @@ class NotificationEventTest extends UnitaryTestCase
 
     public function testUpdateWithRequestAccount()
     {
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDescription('a_description')
                                     ->addDetail('a_detail', 'a_value')
                                     ->setExtra('userId', [100, 200]);
@@ -79,7 +79,7 @@ class NotificationEventTest extends UnitaryTestCase
 
     public function testUpdateWithRequestAccountAndNoUserId()
     {
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDescription('a_description')
                                     ->addDetail('a_detail', 'a_value');
 
@@ -94,7 +94,7 @@ class NotificationEventTest extends UnitaryTestCase
 
     public function testUpdateWithRequestAccountAndException()
     {
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDescription('a_description')
                                     ->addDetail('a_detail', 'a_value')
                                     ->setExtra('userId', [100, 200]);
@@ -113,7 +113,7 @@ class NotificationEventTest extends UnitaryTestCase
 
     public function testUpdateWithShowLink()
     {
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDescription('a_description')
                                     ->addDetail('a_detail', 'a_value')
                                     ->setExtra('notify', [true])
@@ -138,7 +138,7 @@ class NotificationEventTest extends UnitaryTestCase
 
     public function testUpdateWithShowLinkAndException()
     {
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDescription('a_description')
                                     ->addDetail('a_detail', 'a_value')
                                     ->setExtra('notify', [true])
@@ -156,7 +156,7 @@ class NotificationEventTest extends UnitaryTestCase
 
     public function testUpdateWithShowLinkAndNoNotify()
     {
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDescription('a_description')
                                     ->addDetail('a_detail', 'a_value')
                                     ->setExtra('userId', [100]);
@@ -172,7 +172,7 @@ class NotificationEventTest extends UnitaryTestCase
 
     public function testUpdateWithShowLinkAndFalseNoNotify()
     {
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDescription('a_description')
                                     ->addDetail('a_detail', 'a_value')
                                     ->setExtra('notify', [false])
@@ -189,7 +189,7 @@ class NotificationEventTest extends UnitaryTestCase
 
     public function testUpdateWithShowLinkAndNoUserId()
     {
-        $eventMessage = EventMessage::factory()
+        $eventMessage = EventMessage::build()
                                     ->addDescription('a_description')
                                     ->addDetail('a_detail', 'a_value')
                                     ->setExtra('notify', [true]);
diff --git a/tests/SP/Modules/Web/Controllers/AccountHistoryManager/AccountHistoryManagerTest.php b/tests/SP/Modules/Web/Controllers/AccountHistoryManager/AccountHistoryManagerTest.php
new file mode 100644
index 00000000..e888b7b2
--- /dev/null
+++ b/tests/SP/Modules/Web/Controllers/AccountHistoryManager/AccountHistoryManagerTest.php
@@ -0,0 +1,253 @@
+<?php
+/**
+ * sysPass
+ *
+ * @author nuxsmin
+ * @link https://syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass 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.
+ *
+ * sysPass 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 sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace SP\Tests\Modules\Web\Controllers\AccountHistoryManager;
+
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\MockObject\Exception;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use SP\Domain\Account\Models\Account;
+use SP\Domain\Account\Models\AccountHistory;
+use SP\Domain\Common\Models\Simple;
+use SP\Domain\Config\Models\Config;
+use SP\Domain\Core\Exceptions\InvalidClassException;
+use SP\Infrastructure\Database\QueryData;
+use SP\Infrastructure\Database\QueryResult;
+use SP\Infrastructure\File\FileException;
+use SP\Mvc\View\OutputHandlerInterface;
+use SP\Tests\Generators\AccountDataGenerator;
+use SP\Tests\IntegrationTestCase;
+use Symfony\Component\DomCrawler\Crawler;
+
+/**
+ * Class AccountHistoryManagerTest
+ */
+#[Group('integration')]
+class AccountHistoryManagerTest extends IntegrationTestCase
+{
+
+    /**
+     * @throws NotFoundExceptionInterface
+     * @throws Exception
+     * @throws InvalidClassException
+     * @throws FileException
+     * @throws ContainerExceptionInterface
+     */
+    #[Test]
+    public function deleteSingle()
+    {
+        $this->addDatabaseMapperResolver(
+            AccountHistory::class,
+            new QueryResult([AccountDataGenerator::factory()->buildAccountHistoryData()])
+        );
+
+        $definitions = $this->getModuleDefinitions();
+
+        $container = $this->buildContainer(
+            $definitions,
+            $this->buildRequest('get', 'index.php', ['r' => 'accountHistoryManager/delete/100'])
+        );
+
+        $this->runApp($container);
+
+        $this->expectOutputString('{"status":0,"description":"Account removed","data":[],"messages":[]}');
+    }
+
+    /**
+     * @throws NotFoundExceptionInterface
+     * @throws Exception
+     * @throws InvalidClassException
+     * @throws FileException
+     * @throws ContainerExceptionInterface
+     */
+    #[Test]
+    public function deleteMultiple()
+    {
+        $this->addDatabaseMapperResolver(
+            AccountHistory::class,
+            new QueryResult([AccountDataGenerator::factory()->buildAccountHistoryData()])
+        );
+
+        $definitions = $this->getModuleDefinitions();
+
+        $container = $this->buildContainer(
+            $definitions,
+            $this->buildRequest(
+                'post',
+                'index.php',
+                ['r' => 'accountHistoryManager/delete'],
+                ['items' => [100, 200, 300]]
+            )
+        );
+
+        $this->runApp($container);
+
+        $this->expectOutputString('{"status":0,"description":"Accounts removed","data":[],"messages":[]}');
+    }
+
+    /**
+     * @throws NotFoundExceptionInterface
+     * @throws Exception
+     * @throws InvalidClassException
+     * @throws FileException
+     * @throws ContainerExceptionInterface
+     */
+    #[Test]
+    public function restoreModified()
+    {
+        $this->databaseQueryResolver = function (QueryData $queryData): QueryResult {
+            /** @noinspection SqlWithoutWhere */
+            if (str_starts_with($queryData->getQuery()->getStatement(), 'UPDATE `Account`')) {
+                return new QueryResult([], 1);
+            }
+
+            if ($queryData->getMapClassName() === AccountHistory::class) {
+                $accountHistory = AccountDataGenerator::factory()
+                                                      ->buildAccountHistoryData()
+                                                      ->mutate(
+                                                          ['isModify' => 1, 'isDeleted' => 0]
+                                                      );
+
+                return new QueryResult([$accountHistory]);
+            } elseif ($queryData->getMapClassName() === Account::class) {
+                $account = AccountDataGenerator::factory()
+                                               ->buildAccount();
+
+                return new QueryResult([$account]);
+            } elseif ($queryData->getMapClassName() === Config::class) {
+                return new QueryResult([new Config(['parameter' => 'masterPwd', 'value' => 'a_pass'])]);
+            }
+
+            return new QueryResult([], 1, 100);
+        };
+
+        $definitions = $this->getModuleDefinitions();
+
+        $container = $this->buildContainer(
+            $definitions,
+            $this->buildRequest('get', 'index.php', ['r' => 'accountHistoryManager/restore/100'])
+        );
+
+        $this->runApp($container);
+
+        $this->expectOutputString('{"status":0,"description":"Account restored","data":[],"messages":[]}');
+    }
+
+    /**
+     * @throws NotFoundExceptionInterface
+     * @throws Exception
+     * @throws InvalidClassException
+     * @throws FileException
+     * @throws ContainerExceptionInterface
+     */
+    #[Test]
+    public function restoreDeleted()
+    {
+        $this->databaseQueryResolver = function (QueryData $queryData): QueryResult {
+            /** @noinspection SqlWithoutWhere */
+            if (str_starts_with($queryData->getQuery()->getStatement(), 'UPDATE `Account`')) {
+                return new QueryResult([], 1);
+            }
+
+            if ($queryData->getMapClassName() === AccountHistory::class) {
+                $accountHistory = AccountDataGenerator::factory()
+                                                      ->buildAccountHistoryData()
+                                                      ->mutate(
+                                                          ['isModify' => 0, 'isDeleted' => 1]
+                                                      );
+
+                return new QueryResult([$accountHistory]);
+            } elseif ($queryData->getMapClassName() === Account::class) {
+                $account = AccountDataGenerator::factory()
+                                               ->buildAccount();
+
+                return new QueryResult([$account]);
+            } elseif ($queryData->getMapClassName() === Config::class) {
+                return new QueryResult([new Config(['parameter' => 'masterPwd', 'value' => 'a_pass'])]);
+            }
+
+            return new QueryResult([], 1, 100);
+        };
+
+        $definitions = $this->getModuleDefinitions();
+
+        $container = $this->buildContainer(
+            $definitions,
+            $this->buildRequest('get', 'index.php', ['r' => 'accountHistoryManager/restore/100'])
+        );
+
+        $this->runApp($container);
+
+        $this->expectOutputString('{"status":0,"description":"Account restored","data":[],"messages":[]}');
+    }
+
+    /**
+     * @throws NotFoundExceptionInterface
+     * @throws Exception
+     * @throws InvalidClassException
+     * @throws FileException
+     * @throws ContainerExceptionInterface
+     */
+    #[Test]
+    public function search()
+    {
+        $accountDataGenerator = AccountDataGenerator::factory();
+
+        $this->addDatabaseMapperResolver(
+            Simple::class,
+            QueryResult::withTotalNumRows(
+                [
+                    $accountDataGenerator->buildAccountHistoryData(),
+                    $accountDataGenerator->buildAccountHistoryData()
+                ],
+                2
+            )
+        );
+
+        $definitions = $this->getModuleDefinitions();
+        $definitions[OutputHandlerInterface::class] = $this->setupOutputHandler(function (string $output): void {
+            $crawler = new Crawler($output);
+            $filter = $crawler->filterXPath(
+                '//table/tbody[@id="data-rows-tblAccountsHistory"]//tr[string-length(@data-item-id) > 0]'
+            )
+                              ->extract(['data-item-id']);
+
+            assert(!empty($output));
+            assert(count($filter) === 2);
+
+            $this->assertTrue(true);
+        });
+
+        $container = $this->buildContainer(
+            $definitions,
+            $this->buildRequest('get', 'index.php', ['r' => 'accountHistoryManager/search'])
+        );
+
+        $this->runApp($container);
+    }
+}