diff --git a/package-lock.json b/package-lock.json
index d286803..aa4419f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,8 @@
         "@bufbuild/connect": "latest",
         "@bufbuild/connect-node": "latest",
         "@bufbuild/protobuf": "latest",
-        "@substreams/core": "^0.1.18"
+        "@substreams/core": "^0.1.19",
+        "eventemitter3": "latest"
       },
       "devDependencies": {
         "@tsconfig/recommended": "latest",
@@ -159,6 +160,11 @@
       "integrity": "sha512-Y+/1vGBHV/cYk6OI1Na/LHzwnlNCAfU3ZNGrc1LdRe/LAIbdDPTTv/HU3M7yXN448aTVDq3eKRm2cg7iKLb8gw==",
       "dev": true
     },
+    "node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="
+    },
     "node_modules/headers-polyfill": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/headers-polyfill/-/headers-polyfill-3.3.0.tgz",
diff --git a/package.json b/package.json
index 16e25b6..934a823 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@substreams/node",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "Substreams for Node.js",
   "license": "MIT",
   "repository": "substreams-js/substreams-node",
@@ -22,7 +22,8 @@
     "@bufbuild/connect": "latest",
     "@bufbuild/connect-node": "latest",
     "@bufbuild/protobuf": "latest",
-    "@substreams/core": "^0.1.18"
+    "@substreams/core": "^0.1.19",
+    "eventemitter3": "latest"
   },
   "devDependencies": {
     "@tsconfig/recommended": "latest",
diff --git a/src/BlockEmitter.ts b/src/BlockEmitter.ts
index 922e47c..54e998d 100644
--- a/src/BlockEmitter.ts
+++ b/src/BlockEmitter.ts
@@ -1,4 +1,3 @@
-import { EventEmitter } from "node:events";
 import type { CallOptions, Transport } from "@bufbuild/connect";
 import { createPromiseClient } from "@bufbuild/connect";
 import { AnyMessage, IMessageTypeRegistry, JsonObject, Message } from "@bufbuild/protobuf";
@@ -15,6 +14,7 @@ import type {
   SessionInit,
 } from "@substreams/core/proto";
 import { Stream } from "@substreams/core/proto";
+import { EventEmitter } from "eventemitter3";
 
 export class TypedEventEmitter<TEvents extends Record<string, any>> {
   private emitter = new EventEmitter();
@@ -55,15 +55,8 @@ export class TypedEventEmitter<TEvents extends Record<string, any>> {
     return this.emitter.eventNames();
   }
 
-  getMaxListeners() {
-    return this.emitter.getMaxListeners();
-  }
-
-  listenerCount<TEventName extends keyof TEvents & string>(
-    eventName: TEventName,
-    handler: (...eventArg: TEvents[TEventName]) => void,
-  ) {
-    return this.emitter.listenerCount(eventName, handler as any);
+  listenerCount<TEventName extends keyof TEvents & string>(eventName: TEventName) {
+    return this.emitter.listenerCount(eventName);
   }
 
   off<TEventName extends keyof TEvents & string>(