diff --git a/src/core/events/EventDispatcher.ts b/src/core/events/EventDispatcher.ts
index 773e7c68..59456ec6 100644
--- a/src/core/events/EventDispatcher.ts
+++ b/src/core/events/EventDispatcher.ts
@@ -4,6 +4,7 @@ import { IDisposable } from '../common/disposable/IDisposable';
 import { INitroLogger } from '../common/logger/INitroLogger';
 import { NitroLogger } from '../common/logger/NitroLogger';
 import { IEventDispatcher } from './IEventDispatcher';
+import { NitroEvent } from './NitroEvent';
 
 export class EventDispatcher extends Disposable implements IEventDispatcher, IDisposable
 {
@@ -61,7 +62,7 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi
         }
     }
 
-    public dispatchEvent(event: Event): boolean
+    public dispatchEvent(event: NitroEvent): boolean
     {
         if(!event) return false;
 
@@ -72,7 +73,7 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi
         return true;
     }
 
-    private processEvent(event: Event): void
+    private processEvent(event: NitroEvent): void
     {
         const existing = this._listeners.get(event.type);
 
diff --git a/src/core/events/IEventDispatcher.ts b/src/core/events/IEventDispatcher.ts
index 50a6019a..3ac781aa 100644
--- a/src/core/events/IEventDispatcher.ts
+++ b/src/core/events/IEventDispatcher.ts
@@ -1,9 +1,10 @@
 import { IDisposable } from '../common/disposable/IDisposable';
+import { NitroEvent } from './NitroEvent';
 
 export interface IEventDispatcher extends IDisposable
 {
     addEventListener(type: string, callback: Function): void
     removeEventListener(type: string, callback: Function): void;
     removeAllListeners(): void;
-    dispatchEvent(event: Event): boolean;
-}
\ No newline at end of file
+    dispatchEvent(event: NitroEvent): boolean;
+}
diff --git a/src/core/events/NitroEvent.ts b/src/core/events/NitroEvent.ts
index f6d3743a..a85eb43c 100644
--- a/src/core/events/NitroEvent.ts
+++ b/src/core/events/NitroEvent.ts
@@ -1,4 +1,14 @@
-export class NitroEvent extends Event
+export class NitroEvent
 {
-    public static COMPLETE: string  = 'NITRO_COMPLETE';
-}
\ No newline at end of file
+    private _type: string;
+
+    constructor(type: string)
+    {
+        this._type = type;
+    }
+
+    public get type(): string
+    {
+        return this._type;
+    }
+}