diff --git a/package.json b/package.json
index 94ec2ff..6820896 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "polling-connection",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Event-based polling module written in TS with time tracking and aborting support.",
   "files": [
     "dist"
diff --git a/src/EventEmitter.ts b/src/EventEmitter.ts
index c384cd9..376bb86 100644
--- a/src/EventEmitter.ts
+++ b/src/EventEmitter.ts
@@ -1,26 +1,17 @@
-export interface TrackingTime {
-  passed: number;
-  remaining: number;
-}
-
-type Events<Payload> = {
-  start: (trackingTime: TrackingTime) => void;
-  success: (payload: Payload) => void;
-  error: (err: unknown) => void;
-  timeout: () => void;
-  second: (trackingTime: TrackingTime) => void;
-  close: () => void;
-};
+import { EventMap } from "./EventMap";
 
-type Receivers<Payload, K extends keyof Events<Payload>> = {
+type Receivers<Payload, K extends keyof EventMap<Payload>> = {
   event: K;
-  listener: Events<Payload>[K];
+  listener: EventMap<Payload>[K];
 }[];
 
 export abstract class EventEmitter<Payload> {
-  private receivers: Receivers<Payload, keyof Events<Payload>> = [];
+  private receivers: Receivers<Payload, keyof EventMap<Payload>> = [];
 
-  on<K extends keyof Events<Payload>>(event: K, listener: Events<Payload>[K]) {
+  on<K extends keyof EventMap<Payload>>(
+    event: K,
+    listener: EventMap<Payload>[K]
+  ) {
     this.receivers.push({ event, listener });
 
     return () => {
@@ -30,9 +21,9 @@ export abstract class EventEmitter<Payload> {
     };
   }
 
-  protected emit<K extends keyof Events<Payload>>(
+  protected emit<K extends keyof EventMap<Payload>>(
     event: K,
-    ...args: Parameters<Events<Payload>[K]>
+    ...args: Parameters<EventMap<Payload>[K]>
   ) {
     const listeners = this.receivers.filter((r) => r.event === event);
     listeners.forEach(({ listener }) => listener.apply(this, args));
diff --git a/src/EventMap.ts b/src/EventMap.ts
new file mode 100644
index 0000000..6c378c8
--- /dev/null
+++ b/src/EventMap.ts
@@ -0,0 +1,13 @@
+export interface TrackingTime {
+  passed: number;
+  remaining: number;
+}
+
+export type EventMap<Payload> = {
+  start: (trackingTime: TrackingTime) => void;
+  success: (payload: Payload) => void;
+  error: (err: unknown) => void;
+  timeout: () => void;
+  second: (trackingTime: TrackingTime) => void;
+  close: () => void;
+};
diff --git a/src/PollingConnection.ts b/src/PollingConnection.ts
index 05676a7..7f0bf00 100644
--- a/src/PollingConnection.ts
+++ b/src/PollingConnection.ts
@@ -1,4 +1,5 @@
-import { EventEmitter, TrackingTime } from "./EventEmitter";
+import { EventEmitter } from "./EventEmitter";
+import { TrackingTime } from "./EventMap";
 
 export interface TaskOptions<Payload> {
   done: (data: Payload) => void;
diff --git a/src/index.ts b/src/index.ts
index fa2c18f..0da7c0e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1 +1,2 @@
+export * from "./EventMap";
 export * from "./PollingConnection";