@@ -52,16 +52,13 @@ import io.getstream.chat.android.client.api2.model.dto.NotificationInviteRejecte
 import io.getstream.chat.android.client.api2.model.dto.NotificationInvitedEventDto
 import io.getstream.chat.android.client.api2.model.dto.NotificationMarkReadEventDto
 import io.getstream.chat.android.client.api2.model.dto.NotificationMarkUnreadEventDto
-import io.getstream.chat.android.client.api2.model.dto.NotificationMessageNewEventDto
 import io.getstream.chat.android.client.api2.model.dto.NotificationMutesUpdatedEventDto
 import io.getstream.chat.android.client.api2.model.dto.NotificationRemovedFromChannelEventDto
 import io.getstream.chat.android.client.api2.model.dto.NotificationThreadMessageNewEventDto
 import io.getstream.chat.android.client.api2.model.dto.ReactionDeletedEventDto
 import io.getstream.chat.android.client.api2.model.dto.ReactionNewEventDto
 import io.getstream.chat.android.client.api2.model.dto.ReactionUpdateEventDto
-import io.getstream.chat.android.client.api2.model.dto.ThreadUpdatedEventDto
 import io.getstream.chat.android.client.api2.model.dto.UnknownEventDto
-import io.getstream.chat.android.client.api2.model.dto.UserDeletedEventDto
 import io.getstream.chat.android.client.api2.model.dto.UserMessagesDeletedEventDto
 import io.getstream.chat.android.client.api2.model.dto.UserUpdatedEventDto
 import io.getstream.chat.android.client.events.AIIndicatorClearEvent
@@ -143,6 +140,7 @@ import io.getstream.chat.android.network.models.WSEvent
 import io.getstream.chat.android.network.models.MemberAddedEvent as GeneratedMemberAddedEvent
 import io.getstream.chat.android.network.models.MemberRemovedEvent as GeneratedMemberRemovedEvent
 import io.getstream.chat.android.network.models.MemberUpdatedEvent as GeneratedMemberUpdatedEvent
+import io.getstream.chat.android.network.models.NotificationNewMessageEvent as GeneratedNotificationNewMessageEvent
 import io.getstream.chat.android.network.models.PollClosedEvent as GeneratedPollClosedEvent
 import io.getstream.chat.android.network.models.PollDeletedEvent as GeneratedPollDeletedEvent
 import io.getstream.chat.android.network.models.PollUpdatedEvent as GeneratedPollUpdatedEvent
@@ -153,9 +151,11 @@ import io.getstream.chat.android.network.models.ReminderCreatedEvent as Generate
 import io.getstream.chat.android.network.models.ReminderDeletedEvent as GeneratedReminderDeletedEvent
 import io.getstream.chat.android.network.models.ReminderNotificationEvent as GeneratedReminderNotificationEvent
 import io.getstream.chat.android.network.models.ReminderUpdatedEvent as GeneratedReminderUpdatedEvent
+import io.getstream.chat.android.network.models.ThreadUpdatedEvent as GeneratedThreadUpdatedEvent
 import io.getstream.chat.android.network.models.TypingStartEvent as GeneratedTypingStartEvent
 import io.getstream.chat.android.network.models.TypingStopEvent as GeneratedTypingStopEvent
 import io.getstream.chat.android.network.models.UserBannedEvent as GeneratedUserBannedEvent
+import io.getstream.chat.android.network.models.UserDeletedEvent as GeneratedUserDeletedEvent
 import io.getstream.chat.android.network.models.UserPresenceChangedEvent as GeneratedUserPresenceChangedEvent
 import io.getstream.chat.android.network.models.UserUnbannedEvent as GeneratedUserUnbannedEvent
 import io.getstream.chat.android.network.models.UserWatchingStartEvent as GeneratedUserWatchingStartEvent
@@ -202,16 +202,13 @@ internal class EventMapping(
             is NotificationInvitedEventDto -> toDomain()
             is NotificationMarkReadEventDto -> toDomain()
             is NotificationMarkUnreadEventDto -> toDomain()
-            is NotificationMessageNewEventDto -> toDomain()
             is NotificationThreadMessageNewEventDto -> toDomain()
-            is ThreadUpdatedEventDto -> toDomain()
             is NotificationMutesUpdatedEventDto -> toDomain()
             is NotificationRemovedFromChannelEventDto -> toDomain()
             is ReactionDeletedEventDto -> toDomain()
             is ReactionNewEventDto -> toDomain()
             is ReactionUpdateEventDto -> toDomain()
             is UnknownEventDto -> toDomain()
-            is UserDeletedEventDto -> toDomain()
             is UserUpdatedEventDto -> toDomain()
             is GeneratedEventDto -> event.toDomain()
             is DraftMessageDeletedEventDto -> toDomain()
@@ -612,36 +609,36 @@ internal class EventMapping(
     }
 
     /**
-     * Transforms [NotificationMessageNewEventDto] to [NotificationMessageNewEvent].
+     * Transforms the generated [GeneratedNotificationNewMessageEvent] to [NotificationMessageNewEvent].
      */
-    private fun NotificationMessageNewEventDto.toDomain(): NotificationMessageNewEvent = with(domainMapping) {
+    private fun GeneratedNotificationNewMessageEvent.toDomain(): NotificationMessageNewEvent = with(domainMapping) {
         NotificationMessageNewEvent(
             type = type,
-            createdAt = created_at.date,
-            rawCreatedAt = created_at.rawDate,
-            cid = cid,
-            channelType = channel_type,
-            channelId = channel_id,
+            createdAt = createdAt.date,
+            rawCreatedAt = createdAt.raw,
+            cid = requireNotNull(cid),
+            channelType = requireNotNull(channelType),
+            channelId = requireNotNull(channelId),
             channel = channel.toDomain(),
             message = message.toDomain(channel.toChannelInfo()),
-            totalUnreadCount = total_unread_count,
-            unreadChannels = unread_channels,
-            groupedUnreadChannels = grouped_unread_channels,
+            totalUnreadCount = totalUnreadCount ?: 0,
+            unreadChannels = unreadChannels ?: 0,
+            groupedUnreadChannels = groupedUnreadChannels,
         )
     }
 
     /**
-     * Transforms [ThreadUpdatedEventDto] to [ThreadUpdatedEvent].
+     * Transforms the generated [GeneratedThreadUpdatedEvent] to [ThreadUpdatedEvent].
      */
-    private fun ThreadUpdatedEventDto.toDomain(): ThreadUpdatedEvent = with(domainMapping) {
+    private fun GeneratedThreadUpdatedEvent.toDomain(): ThreadUpdatedEvent = with(domainMapping) {
         ThreadUpdatedEvent(
             type = type,
-            createdAt = created_at.date,
-            rawCreatedAt = created_at.rawDate,
-            cid = cid,
-            channelType = channel_type,
-            channelId = channel_id,
-            thread = thread.toDomain(),
+            createdAt = createdAt.date,
+            rawCreatedAt = createdAt.raw,
+            cid = requireNotNull(cid),
+            channelType = requireNotNull(channelType),
+            channelId = requireNotNull(channelId),
+            thread = requireNotNull(thread).toDomain(),
         )
     }
 
@@ -746,13 +743,13 @@ internal class EventMapping(
     }
 
     /**
-     * Transforms [UserDeletedEventDto] to [UserDeletedEvent].
+     * Transforms the generated [GeneratedUserDeletedEvent] to [UserDeletedEvent].
      */
-    private fun UserDeletedEventDto.toDomain(): UserDeletedEvent = with(domainMapping) {
+    private fun GeneratedUserDeletedEvent.toDomain(): UserDeletedEvent = with(domainMapping) {
         UserDeletedEvent(
             type = type,
-            createdAt = created_at.date,
-            rawCreatedAt = created_at.rawDate,
+            createdAt = createdAt.date,
+            rawCreatedAt = createdAt.raw,
             user = user.toDomain(),
         )
     }
@@ -794,6 +791,9 @@ internal class EventMapping(
         is GeneratedReminderUpdatedEvent -> toDomain()
         is GeneratedReminderDeletedEvent -> toDomain()
         is GeneratedReminderNotificationEvent -> toDomain()
+        is GeneratedNotificationNewMessageEvent -> toDomain()
+        is GeneratedThreadUpdatedEvent -> toDomain()
+        is GeneratedUserDeletedEvent -> toDomain()
         else -> error("No mapping for the generated ${getWSEventType()} event")
     }
 
 
@@ -317,30 +317,6 @@ internal data class MarkAllReadEventDto(
     val grouped_unread_channels: Map<String, Int>? = null,
 ) : ChatEventDto()
 
-@JsonClass(generateAdapter = true)
-internal data class NotificationMessageNewEventDto(
-    val type: String,
-    val created_at: ExactDate,
-    val cid: String,
-    val channel_type: String,
-    val channel_id: String,
-    val channel: DownstreamChannelDto,
-    val message: DownstreamMessageDto,
-    val total_unread_count: Int = 0,
-    val unread_channels: Int = 0,
-    val grouped_unread_channels: Map<String, Int>? = null,
-) : ChatEventDto()
-
-@JsonClass(generateAdapter = true)
-internal data class ThreadUpdatedEventDto(
-    val type: String,
-    val created_at: ExactDate,
-    val cid: String,
-    val channel_type: String,
-    val channel_id: String,
-    val thread: ThreadResponse,
-) : ChatEventDto()
-
 @JsonClass(generateAdapter = true)
 internal data class NotificationThreadMessageNewEventDto(
     val type: String,
@@ -409,13 +385,6 @@ internal data class ReactionUpdateEventDto(
     val reaction: ReactionResponse,
 ) : ChatEventDto()
 
-@JsonClass(generateAdapter = true)
-internal data class UserDeletedEventDto(
-    val type: String,
-    val created_at: ExactDate,
-    val user: UserResponseCommonFields,
-) : ChatEventDto()
-
 @JsonClass(generateAdapter = true)
 internal data class UserUpdatedEventDto(
     val type: String,
 
@@ -55,23 +55,21 @@ import io.getstream.chat.android.client.api2.model.dto.NotificationInviteRejecte
 import io.getstream.chat.android.client.api2.model.dto.NotificationInvitedEventDto
 import io.getstream.chat.android.client.api2.model.dto.NotificationMarkReadEventDto
 import io.getstream.chat.android.client.api2.model.dto.NotificationMarkUnreadEventDto
-import io.getstream.chat.android.client.api2.model.dto.NotificationMessageNewEventDto
 import io.getstream.chat.android.client.api2.model.dto.NotificationMutesUpdatedEventDto
 import io.getstream.chat.android.client.api2.model.dto.NotificationRemovedFromChannelEventDto
 import io.getstream.chat.android.client.api2.model.dto.NotificationThreadMessageNewEventDto
 import io.getstream.chat.android.client.api2.model.dto.ReactionDeletedEventDto
 import io.getstream.chat.android.client.api2.model.dto.ReactionNewEventDto
 import io.getstream.chat.android.client.api2.model.dto.ReactionUpdateEventDto
-import io.getstream.chat.android.client.api2.model.dto.ThreadUpdatedEventDto
 import io.getstream.chat.android.client.api2.model.dto.UnknownEventDto
-import io.getstream.chat.android.client.api2.model.dto.UserDeletedEventDto
 import io.getstream.chat.android.client.api2.model.dto.UserMessagesDeletedEventDto
 import io.getstream.chat.android.client.api2.model.dto.UserUpdatedEventDto
 import io.getstream.chat.android.client.api2.model.dto.utils.internal.ExactDate
 import io.getstream.chat.android.models.EventType
 import io.getstream.chat.android.network.models.MemberAddedEvent
 import io.getstream.chat.android.network.models.MemberRemovedEvent
 import io.getstream.chat.android.network.models.MemberUpdatedEvent
+import io.getstream.chat.android.network.models.NotificationNewMessageEvent
 import io.getstream.chat.android.network.models.PollClosedEvent
 import io.getstream.chat.android.network.models.PollDeletedEvent
 import io.getstream.chat.android.network.models.PollUpdatedEvent
@@ -82,9 +80,11 @@ import io.getstream.chat.android.network.models.ReminderCreatedEvent
 import io.getstream.chat.android.network.models.ReminderDeletedEvent
 import io.getstream.chat.android.network.models.ReminderNotificationEvent
 import io.getstream.chat.android.network.models.ReminderUpdatedEvent
+import io.getstream.chat.android.network.models.ThreadUpdatedEvent
 import io.getstream.chat.android.network.models.TypingStartEvent
 import io.getstream.chat.android.network.models.TypingStopEvent
 import io.getstream.chat.android.network.models.UserBannedEvent
+import io.getstream.chat.android.network.models.UserDeletedEvent
 import io.getstream.chat.android.network.models.UserPresenceChangedEvent
 import io.getstream.chat.android.network.models.UserUnbannedEvent
 import io.getstream.chat.android.network.models.UserWatchingStartEvent
@@ -143,10 +143,14 @@ internal class EventDtoAdapter(
     private val notificationMarkReadEventAdapter = moshi.adapter(NotificationMarkReadEventDto::class.java)
     private val notificationMarkUnreadEventAdapter = moshi.adapter(NotificationMarkUnreadEventDto::class.java)
     private val markAllReadEventAdapter = moshi.adapter(MarkAllReadEventDto::class.java)
-    private val notificationMessageNewEventAdapter = moshi.adapter(NotificationMessageNewEventDto::class.java)
+    private val notificationMessageNewEventAdapter = generatedEventAdapter<NotificationNewMessageEvent> {
+        mapOf("cid" to cid, "channel_type" to channelType, "channel_id" to channelId)
+    }
     private val notificationThreadMessageNewEventAdapter =
         moshi.adapter(NotificationThreadMessageNewEventDto::class.java)
-    private val threadUpdatedEventAdapter = moshi.adapter(ThreadUpdatedEventDto::class.java)
+    private val threadUpdatedEventAdapter = generatedEventAdapter<ThreadUpdatedEvent> {
+        mapOf("cid" to cid, "channel_type" to channelType, "channel_id" to channelId, "thread" to thread)
+    }
     private val notificationInvitedEventAdapter = moshi.adapter(NotificationInvitedEventDto::class.java)
     private val notificationInviteAcceptedEventAdapter = moshi.adapter(NotificationInviteAcceptedEventDto::class.java)
     private val notificationInviteRejectedEventAdapter = moshi.adapter(NotificationInviteRejectedEventDto::class.java)
@@ -160,7 +164,7 @@ internal class EventDtoAdapter(
         moshi.adapter(NotificationChannelTruncatedEventDto::class.java)
     private val userPresenceChangedEventAdapter = generatedEventAdapter<UserPresenceChangedEvent> { emptyMap() }
     private val userUpdatedEventAdapter = moshi.adapter(UserUpdatedEventDto::class.java)
-    private val userDeletedEventAdapter = moshi.adapter(UserDeletedEventDto::class.java)
+    private val userDeletedEventAdapter = generatedEventAdapter<UserDeletedEvent> { emptyMap() }
     private val userBannedEventAdapter = generatedEventAdapter<UserBannedEvent> { emptyMap() }
     private val userUnbannedEventAdapter = generatedEventAdapter<UserUnbannedEvent> { emptyMap() }
     private val pollUpdatedEventAdapter = generatedEventAdapter<PollUpdatedEvent> { mapOf("cid" to cid) }
 
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2014-2026 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport",
+)
+
+package io.getstream.chat.android.network.models
+
+import com.squareup.moshi.Json
+
+/**
+ * Emitted when a new message was sent to a channel.
+ */
+@com.squareup.moshi.JsonClass(generateAdapter = true)
+internal data class NotificationNewMessageEvent(
+    @Json(name = "created_at")
+    internal val createdAt: io.getstream.chat.android.network.infrastructure.ExactDate,
+
+    @Json(name = "message_id")
+    internal val messageId: String,
+
+    @Json(name = "watcher_count")
+    internal val watcherCount: Int,
+
+    @Json(name = "channel")
+    internal val channel: io.getstream.chat.android.network.models.ChannelResponse,
+
+    @Json(name = "custom")
+    internal val custom: Map<String, Any?> = emptyMap(),
+
+    @Json(name = "message")
+    internal val message: io.getstream.chat.android.network.models.MessageResponse,
+
+    @Json(name = "type")
+    internal val type: String = "notification.message_new",
+
+    @Json(name = "channel_id")
+    internal val channelId: String? = null,
+
+    @Json(name = "channel_member_count")
+    internal val channelMemberCount: Int? = null,
+
+    @Json(name = "channel_message_count")
+    internal val channelMessageCount: Int? = null,
+
+    @Json(name = "channel_type")
+    internal val channelType: String? = null,
+
+    @Json(name = "cid")
+    internal val cid: String? = null,
+
+    @Json(name = "parent_author")
+    internal val parentAuthor: String? = null,
+
+    @Json(name = "received_at")
+    internal val receivedAt: java.util.Date? = null,
+
+    @Json(name = "team")
+    internal val team: String? = null,
+
+    @Json(name = "total_unread_count")
+    internal val totalUnreadCount: Int? = null,
+
+    @Json(name = "unread_channels")
+    internal val unreadChannels: Int? = null,
+
+    @Json(name = "unread_count")
+    internal val unreadCount: Int? = null,
+
+    @Json(name = "thread_participants")
+    internal val threadParticipants: List<io.getstream.chat.android.network.models.UserResponseCommonFields>? = null,
+
+    @Json(name = "channel_custom")
+    internal val channelCustom: Map<String, Any?>? = null,
+
+    @Json(name = "grouped_unread_channels")
+    internal val groupedUnreadChannels: Map<String, Int>? = null,
+) :
+    io.getstream.chat.android.network.models.WSClientEvent, io.getstream.chat.android.network.models.WSEvent {
+
+    override fun getWSClientEventType(): String {
+        return type
+    }
+
+    override fun getWSEventType(): String {
+        return type
+    }
+}