diff --git a/CHANGELOG.md b/CHANGELOG.md
index d222bc52..5733c2e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,8 @@
 - Enh: Keycloak auth client (e.luhr)
 - Fix: Social Network Auth (eluhr)
 - Enh #532: /user/registration/register now shows form validation errors
-- Enh: Allow/suggest new v3 releases of 2amigos 2fa dependencies: 2fa-library, qrcode-library (TonisOrmisson)
+- Enh: Allow/suggest new v3 releases of 2amigos 2fa dependencies: 2fa-library, qrcode-library (TonisOrmisson) 
+- Ehh: Added all the classes to the Bootstrap.php classMap
 - Enh: Added option to disable viewing any other user's profile for non-admin users (TonisOrmisson)
 - Ehn: updated Estonian (et) translation by (TonisOrmisson)
 - Ehn: use recaptcha.net instead of google.com (Eseperio)
diff --git a/src/User/Bootstrap.php b/src/User/Bootstrap.php
index e9bbc90b..0f5ad669 100755
--- a/src/User/Bootstrap.php
+++ b/src/User/Bootstrap.php
@@ -399,13 +399,17 @@ protected function buildClassMap(array $userClassMap)
                 'Assignment',
                 'Permission',
                 'Role',
-                'SessionHistory'
+                'SessionHistory',
+                'AbstractAuthItem',
+                'Rule',
             ],
             'Da\User\Search' => [
                 'UserSearch',
                 'PermissionSearch',
                 'RoleSearch',
                 'SessionHistorySearch',
+                'RuleSearch',
+                'AbstractAuthItemSearch',
             ],
             'Da\User\Form' => [
                 'RegistrationForm',
@@ -413,12 +417,36 @@ protected function buildClassMap(array $userClassMap)
                 'LoginForm',
                 'SettingsForm',
                 'RecoveryForm',
+                'GdprDeleteForm',
             ],
             'Da\User\Service' => [
+                'AccountConfirmationService',
+                'AuthItemEditionService',
+                'AuthRuleEditionService',
+                'EmailChangeService',
                 'MailService',
+                'PasswordExpireService',
+                'PasswordRecoveryService',
+                'ResendConfirmationService',
+                'ResetPasswordService',
+                'SocialNetworkAccountConnectService',
+                'SocialNetworkAuthenticateService',
+                'SwitchIdentityService',
+                'TwoFactorEmailCodeGeneratorService',
+                'TwoFactorQrCodeUriGeneratorService',
+                'TwoFactorSmsCodeGeneratorService',
+                'UpdateAuthAssignmentsService',
+                'UserBlockService',
+                'UserConfirmationService',
+                'UserCreateService',
+                'UserRegisterService',
             ],
             'Da\User\Helper' => [
+                'AuthHelper',
+                'ClassMapHelper',
+                'MigrationHelper',
                 'SecurityHelper',
+                'TimezoneHelper',
             ]
         ];