diff --git a/api/gateway/src/commonMain/kotlin/moe/lava/neon/api/gateway/GatewayHandler.kt b/api/gateway/src/commonMain/kotlin/moe/lava/neon/api/gateway/GatewayHandler.kt
index 1d1d1bc..41054be 100644
--- a/api/gateway/src/commonMain/kotlin/moe/lava/neon/api/gateway/GatewayHandler.kt
+++ b/api/gateway/src/commonMain/kotlin/moe/lava/neon/api/gateway/GatewayHandler.kt
@@ -4,6 +4,8 @@ import co.touchlab.kermit.Logger
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 import kotlinx.serialization.ExperimentalSerializationApi
 import moe.lava.neon.api.gateway.handlers.Handler
@@ -11,10 +13,10 @@ import kotlin.math.pow
 import kotlin.reflect.KClass
 import kotlin.time.Duration.Companion.seconds
 
-typealias EventHandlers = Map<KClass<out Event.Dispatch>, MutableList<Handler<in Event.Dispatch>>>
-
 class GatewayHandler {
-    private val eventHandlers: EventHandlers = mutableMapOf()
+    private val mEvents = MutableSharedFlow<Event.Dispatch>()
+    val events = mEvents.asSharedFlow()
+
     private val logger = Logger.withTag("neon.core.api.gateway/handler")
     private val scope = CoroutineScope(Dispatchers.IO)
     private var session: GatewaySession? = null
@@ -31,12 +33,12 @@ class GatewayHandler {
 
         session = GatewaySession.start(
             token = token,
-            eventHandlers = eventHandlers,
             resumeProps = resumeProps,
             onSuccess = {
                 logger.d { "Successful session start" }
                 retryAttempts = 0
             },
+            onDispatch = { scope.launch { mEvents.emit(it) } },
             onDestroy = { reason, resumeProps ->
                 session = null
 
diff --git a/api/gateway/src/commonMain/kotlin/moe/lava/neon/api/gateway/GatewaySession.kt b/api/gateway/src/commonMain/kotlin/moe/lava/neon/api/gateway/GatewaySession.kt
index f0c83a0..ce40047 100644
--- a/api/gateway/src/commonMain/kotlin/moe/lava/neon/api/gateway/GatewaySession.kt
+++ b/api/gateway/src/commonMain/kotlin/moe/lava/neon/api/gateway/GatewaySession.kt
@@ -32,9 +32,9 @@ private val logger = Logger.withTag("neon.core.api.gateway/session")
 internal class GatewaySession private constructor(
     private var ws: DefaultClientWebSocketSession,
     private val token: String,
-    private val handlers: EventHandlers,
     private val scope: CoroutineScope,
     private var resumeProps: ResumeProperties?,
+    private val onDispatch: (Event.Dispatch) -> Unit,
     private val onDestroy: (GatewayCloseReason, ResumeProperties?) -> Unit,
     private val onSuccess: () -> Unit,
 ) {
@@ -45,13 +45,13 @@ internal class GatewaySession private constructor(
     companion object {
         suspend fun start(
             token: String,
-            eventHandlers: EventHandlers,
             client: HttpClient = HttpClient {
                 install(HttpCookies)
                 install(WebSockets)
             },
             scope: CoroutineScope = CoroutineScope(Dispatchers.IO),
             resumeProps: ResumeProperties? = null,
+            onDispatch: (Event.Dispatch) -> Unit,
             onDestroy: (GatewayCloseReason, ResumeProperties?) -> Unit,
             onSuccess: () -> Unit,
         ): GatewaySession {
@@ -66,7 +66,7 @@ internal class GatewaySession private constructor(
                 }
             }
 
-            return GatewaySession(ws, token, eventHandlers, scope, resumeProps, onDestroy, onSuccess)
+            return GatewaySession(ws, token, scope, resumeProps, onDispatch, onDestroy, onSuccess)
         }
     }
 
@@ -118,8 +118,7 @@ internal class GatewaySession private constructor(
             is Event.Resumed -> onSuccess()
         }
         if (event is Event.Dispatch) {
-            val eventHandlers = handlers[event::class] ?: return
-            eventHandlers.forEach { it.handle(event) }
+            onDispatch(event)
         }
     }