diff --git a/addons/mail/static/src/core/common/attachment_model.js b/addons/mail/static/src/core/common/attachment_model.js
index 869c9317ed7..6c23af992c6 100644
--- a/addons/mail/static/src/core/common/attachment_model.js
+++ b/addons/mail/static/src/core/common/attachment_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 import { assignDefined } from "@mail/utils/common/misc";
 
 import { deserializeDateTime } from "@web/core/l10n/dates";
@@ -173,4 +173,4 @@ export class Attachment extends Record {
     }
 }
 
-modelRegistry.add(Attachment.name, Attachment);
+Attachment.register();
diff --git a/addons/mail/static/src/core/common/canned_response_model.js b/addons/mail/static/src/core/common/canned_response_model.js
index b9dc741eae1..5c9f858e25e 100644
--- a/addons/mail/static/src/core/common/canned_response_model.js
+++ b/addons/mail/static/src/core/common/canned_response_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 
 export class CannedResponse extends Record {
     /** @type {Object.<number, CannedResponse>} */
@@ -31,4 +31,4 @@ export class CannedResponse extends Record {
     substitution;
 }
 
-modelRegistry.add(CannedResponse.name, CannedResponse);
+CannedResponse.register();
diff --git a/addons/mail/static/src/core/common/channel_member_model.js b/addons/mail/static/src/core/common/channel_member_model.js
index 2ade49431bd..4cddfb0f6cc 100644
--- a/addons/mail/static/src/core/common/channel_member_model.js
+++ b/addons/mail/static/src/core/common/channel_member_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 import { createLocalId } from "@mail/utils/common/misc";
 
 /**
@@ -61,4 +61,4 @@ export class ChannelMember extends Record {
     }
 }
 
-modelRegistry.add(ChannelMember.name, ChannelMember);
+ChannelMember.register();
diff --git a/addons/mail/static/src/core/common/chat_window_model.js b/addons/mail/static/src/core/common/chat_window_model.js
index cda6f344ecb..f18eac7b3f8 100644
--- a/addons/mail/static/src/core/common/chat_window_model.js
+++ b/addons/mail/static/src/core/common/chat_window_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 import { assignDefined } from "@mail/utils/common/misc";
 
 import { _t } from "@web/core/l10n/translation";
@@ -77,4 +77,4 @@ export class ChatWindow extends Record {
     }
 }
 
-modelRegistry.add(ChatWindow.name, ChatWindow);
+ChatWindow.register();
diff --git a/addons/mail/static/src/core/common/composer_model.js b/addons/mail/static/src/core/common/composer_model.js
index de4114a0f32..259e681e95e 100644
--- a/addons/mail/static/src/core/common/composer_model.js
+++ b/addons/mail/static/src/core/common/composer_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 
 /**
  * @typedef {{partnerIds: Set<number>, threadIds: Set<number>}} RawMentions
@@ -77,4 +77,4 @@ export class Composer extends Record {
     isFocused = false;
 }
 
-modelRegistry.add(Composer.name, Composer);
+Composer.register();
diff --git a/addons/mail/static/src/core/common/follower_model.js b/addons/mail/static/src/core/common/follower_model.js
index 8e9c9ab2785..c38277d3305 100644
--- a/addons/mail/static/src/core/common/follower_model.js
+++ b/addons/mail/static/src/core/common/follower_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 
 /**
  * @typedef Data
@@ -55,4 +55,4 @@ export class Follower extends Record {
     }
 }
 
-modelRegistry.add(Follower.name, Follower);
+Follower.register();
diff --git a/addons/mail/static/src/core/common/link_preview_model.js b/addons/mail/static/src/core/common/link_preview_model.js
index 44885e2c1fd..7cf03e28b70 100644
--- a/addons/mail/static/src/core/common/link_preview_model.js
+++ b/addons/mail/static/src/core/common/link_preview_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 
 export class LinkPreview extends Record {
     /**
@@ -54,4 +54,4 @@ export class LinkPreview extends Record {
     }
 }
 
-modelRegistry.add(LinkPreview.name, LinkPreview);
+LinkPreview.register();
diff --git a/addons/mail/static/src/core/common/message_model.js b/addons/mail/static/src/core/common/message_model.js
index 4d746408d22..a80995b6837 100644
--- a/addons/mail/static/src/core/common/message_model.js
+++ b/addons/mail/static/src/core/common/message_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 import { htmlToTextContentInline } from "@mail/utils/common/format";
 import { createLocalId } from "@mail/utils/common/misc";
 
@@ -271,4 +271,4 @@ export class Message extends Record {
     }
 }
 
-modelRegistry.add(Message.name, Message);
+Message.register();
diff --git a/addons/mail/static/src/core/common/message_reactions_model.js b/addons/mail/static/src/core/common/message_reactions_model.js
index dc9be28efa5..6374cc386cf 100644
--- a/addons/mail/static/src/core/common/message_reactions_model.js
+++ b/addons/mail/static/src/core/common/message_reactions_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 
 export class MessageReactions extends Record {
     /**
@@ -65,4 +65,4 @@ export class MessageReactions extends Record {
     }
 }
 
-modelRegistry.add(MessageReactions.name, MessageReactions);
+MessageReactions.register();
diff --git a/addons/mail/static/src/core/common/notification_group_model.js b/addons/mail/static/src/core/common/notification_group_model.js
index 6429874208b..731cc6135e7 100644
--- a/addons/mail/static/src/core/common/notification_group_model.js
+++ b/addons/mail/static/src/core/common/notification_group_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 import { removeFromArrayWithPredicate } from "@mail/utils/common/arrays";
 
 import { _t } from "@web/core/l10n/translation";
@@ -68,4 +68,4 @@ export class NotificationGroup extends Record {
     }
 }
 
-modelRegistry.add(NotificationGroup.name, NotificationGroup);
+NotificationGroup.register();
diff --git a/addons/mail/static/src/core/common/notification_model.js b/addons/mail/static/src/core/common/notification_model.js
index a23dc27512d..954e3448a4d 100644
--- a/addons/mail/static/src/core/common/notification_model.js
+++ b/addons/mail/static/src/core/common/notification_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 
 import { _t } from "@web/core/l10n/translation";
 
@@ -93,4 +93,4 @@ export class Notification extends Record {
     }
 }
 
-modelRegistry.add(Notification.name, Notification);
+Notification.register();
diff --git a/addons/mail/static/src/core/common/persona_model.js b/addons/mail/static/src/core/common/persona_model.js
index 3b0426d4349..1e0fc073621 100644
--- a/addons/mail/static/src/core/common/persona_model.js
+++ b/addons/mail/static/src/core/common/persona_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 import { createLocalId } from "@mail/utils/common/misc";
 
 /**
@@ -67,4 +67,4 @@ export class Persona extends Record {
     }
 }
 
-modelRegistry.add(Persona.name, Persona);
+Persona.register();
diff --git a/addons/mail/static/src/core/common/record.js b/addons/mail/static/src/core/common/record.js
index 34f0bf25986..c5189b2859e 100644
--- a/addons/mail/static/src/core/common/record.js
+++ b/addons/mail/static/src/core/common/record.js
@@ -7,6 +7,9 @@ export const modelRegistry = registry.category("discuss.model");
 
 export class Record {
     static records = {};
+    static register() {
+        modelRegistry.add(this.name, this);
+    }
 
     /**
      * @param {Object} data
@@ -35,4 +38,4 @@ export class Record {
     }
 }
 
-modelRegistry.add(Record.name, Record);
+Record.register();
diff --git a/addons/mail/static/src/core/common/thread_model.js b/addons/mail/static/src/core/common/thread_model.js
index 27fc8d5b947..363a2c64ed6 100644
--- a/addons/mail/static/src/core/common/thread_model.js
+++ b/addons/mail/static/src/core/common/thread_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 import { ScrollPosition } from "@mail/core/common/scroll_position";
 import { createLocalId, onChange } from "@mail/utils/common/misc";
 
@@ -497,4 +497,4 @@ export class Thread extends Record {
     }
 }
 
-modelRegistry.add(Thread.name, Thread);
+Thread.register();
diff --git a/addons/mail/static/src/core/web/activity_model.js b/addons/mail/static/src/core/web/activity_model.js
index 54fa94b505f..62e7c09bc23 100644
--- a/addons/mail/static/src/core/web/activity_model.js
+++ b/addons/mail/static/src/core/web/activity_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 import { assignDefined } from "@mail/utils/common/misc";
 
 /**
@@ -126,4 +126,4 @@ export class Activity extends Record {
     _store;
 }
 
-modelRegistry.add(Activity.name, Activity);
+Activity.register();
diff --git a/addons/mail/static/src/discuss/call/common/rtc_session_model.js b/addons/mail/static/src/discuss/call/common/rtc_session_model.js
index e119f60ce58..7b58bfd64dc 100644
--- a/addons/mail/static/src/discuss/call/common/rtc_session_model.js
+++ b/addons/mail/static/src/discuss/call/common/rtc_session_model.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { Record, modelRegistry } from "@mail/core/common/record";
+import { Record } from "@mail/core/common/record";
 import { createLocalId } from "@mail/utils/common/misc";
 
 export class RtcSession extends Record {
@@ -176,4 +176,4 @@ export class RtcSession extends Record {
     }
 }
 
-modelRegistry.add(RtcSession.name, RtcSession);
+RtcSession.register();