diff --git a/docker-compose.yml b/docker-compose.yml
index 0168c284..99be2199 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -75,6 +75,7 @@ services:
     restart: always
     image: mailhog/mailhog:latest
     ports:
+      - "1025:1025"
       - "8025:8025"
     networks:
      - experiencenet
diff --git a/src/Notification/Domain/Events/SendMessageEvent.ts b/src/Notification/Domain/Events/SendMessageEvent.ts
index d83db93e..89f6247f 100644
--- a/src/Notification/Domain/Events/SendMessageEvent.ts
+++ b/src/Notification/Domain/Events/SendMessageEvent.ts
@@ -1,6 +1,6 @@
 import { FACTORIES } from '../../../Shared/DI/Injects';
 import NotifierFactory from '../../Shared/NotifierFactory';
-import { IEvent } from '@digichanges/shared-experience';
+import { IEvent } from '../../Infrastructure/events';
 
 class SendMessageEvent implements IEvent
 {
diff --git a/src/Notification/Domain/Services/NotificationService.ts b/src/Notification/Domain/Services/NotificationService.ts
index 3d3e159b..2a66c822 100644
--- a/src/Notification/Domain/Services/NotificationService.ts
+++ b/src/Notification/Domain/Services/NotificationService.ts
@@ -1,16 +1,18 @@
 import NotificationRepPayload from '../Payloads/NotificationRepPayload';
 import PushNotification from '../Entities/PushNotification';
-import { EventHandler } from '@digichanges/shared-experience';
 import SendMessageEvent from '../Events/SendMessageEvent';
 import NotificationSendMessagePayload from '../Payloads/NotificationSendMessagePayload';
 import INotificationResponse from '../Entities/INotificationResponse';
+import { IEventHandler } from '../../Infrastructure/events';
+import DependencyInjector from '../../../Shared/DI/DependencyInjector';
 
 class NotificationService
 {
-    private eventHandler = EventHandler.getInstance();
+    private eventHandler: IEventHandler;
 
     async execute(pushNotification: PushNotification, payload: NotificationRepPayload, message: string, name: string): Promise<INotificationResponse>
     {
+        this.eventHandler = DependencyInjector.inject<IEventHandler>('IEventHandler');
         pushNotification.subscription = payload.getSubscription();
         pushNotification.name = name;
         this.eventHandler.execute(SendMessageEvent.name, { push_notification: pushNotification, message });
diff --git a/src/Notification/Infrastructure/events/EventHandler.ts b/src/Notification/Infrastructure/events/EventHandler.ts
new file mode 100644
index 00000000..544964d3
--- /dev/null
+++ b/src/Notification/Infrastructure/events/EventHandler.ts
@@ -0,0 +1,71 @@
+import { Subject } from 'rxjs';
+import { IEvent } from './IEvent';
+export interface IEventHandler
+{
+    execute(eventName: string, args: any): void;
+    setEvent(_event: IEvent): void;
+    removeListeners(): void;
+}
+
+type SubscribeEventProps =
+    {
+        eventName: string;
+        args: Record<string, unknown>;
+    }
+
+export class EventHandler implements IEventHandler
+{
+    private eventSubject: Subject<any>;
+    private events: Map<string, (args: any) => Promise<void>>;
+
+    constructor()
+    {
+        console.log(1);
+        this.events = new Map<string, (args: any) => Promise<void>>();
+        this.eventSubject = new Subject<any>();
+
+        this.eventSubject.subscribe((event: SubscribeEventProps) =>
+        {
+            const { eventName, args } = event;
+            const eventHandler = this.events.get(eventName);
+
+            if (eventHandler)
+            {
+                void (async() =>
+                {
+                    try
+                    {
+                        await eventHandler(args).then();
+                    }
+                    catch (error)
+                    {
+                        console.log(error);
+                    }
+                })();
+            }
+        });
+    }
+
+
+    public execute(eventName: string, args: any)
+    {
+        this.eventSubject.next({ eventName, args });
+    }
+
+    public setEvent(_event: IEvent)
+    {
+        if (this.events.has(_event.name))
+        {
+            return;
+        }
+
+        this.events.set(_event.name, _event.handle);
+    }
+
+    public async removeListeners()
+    {
+        this.eventSubject.complete();
+    }
+}
+
+export default EventHandler;
diff --git a/src/Notification/Infrastructure/events/IEvent.ts b/src/Notification/Infrastructure/events/IEvent.ts
new file mode 100644
index 00000000..82c439c4
--- /dev/null
+++ b/src/Notification/Infrastructure/events/IEvent.ts
@@ -0,0 +1,5 @@
+export interface IEvent
+{
+    name: string;
+    handle(props: any): Promise<void>;
+}
diff --git a/src/Notification/Infrastructure/events/index.ts b/src/Notification/Infrastructure/events/index.ts
new file mode 100644
index 00000000..3113181b
--- /dev/null
+++ b/src/Notification/Infrastructure/events/index.ts
@@ -0,0 +1,2 @@
+export * from './EventHandler';
+export * from './IEvent';
diff --git a/src/Shared/DI/Injects/index.ts b/src/Shared/DI/Injects/index.ts
index 1636bca3..80ce553c 100644
--- a/src/Shared/DI/Injects/index.ts
+++ b/src/Shared/DI/Injects/index.ts
@@ -20,7 +20,7 @@ export enum REPOSITORIES  {
 }
 
 export enum SERVICES {
-    AuthorizeService = 'AuthorizeService'
+    AuthorizeService = 'AuthorizeService',
 }
 
 export enum FACTORIES {
diff --git a/src/Shared/DI/container.ts b/src/Shared/DI/container.ts
index 214dc3d4..958b4f18 100644
--- a/src/Shared/DI/container.ts
+++ b/src/Shared/DI/container.ts
@@ -28,6 +28,7 @@ import DatabaseFactory from '../../Main/Infrastructure/Factories/DatabaseFactory
 import { IMessageBroker } from '../Infrastructure/IMessageBroker';
 import RabbitMQMessageBroker from '../Infrastructure/RabbitMQMessageBroker';
 import CronService, { ICronService } from '../../Main/Infrastructure/Factories/CronService';
+import EventHandler, { IEventHandler } from '../../Notification/Infrastructure/events/EventHandler';
 
 const config = MainConfig.getInstance().getConfig();
 const defaultDbConfig = config.dbConfig.default;
@@ -81,6 +82,10 @@ container.register(SERVICES.AuthorizeService, {
 
 container.register<IMessageBroker>('IMessageBroker', { useClass: RabbitMQMessageBroker }, { lifecycle: Lifecycle.Singleton });
 
+container.register<IEventHandler>('IEventHandler',
+    { useClass: EventHandler },
+    { lifecycle: Lifecycle.Singleton });
+
 container.register<ICronService>('ICronService', {
     // @ts-ignore
     useFactory: instanceCachingFactory(() =>
diff --git a/src/closed.ts b/src/closed.ts
index 1e19d5d7..59cb229a 100644
--- a/src/closed.ts
+++ b/src/closed.ts
@@ -3,14 +3,14 @@ import { createTerminus } from '@godaddy/terminus';
 import ICacheDataAccess from './Main/Infrastructure/Repositories/ICacheDataAccess';
 import Logger from './Shared/Helpers/Logger';
 import ICreateConnection from './Main/Infrastructure/Database/ICreateConnection';
-import { EventHandler } from '@digichanges/shared-experience';
 import { Server } from 'http';
 import { IMessageBroker } from './Shared/Infrastructure/IMessageBroker';
+import { IEventHandler } from './Notification/Infrastructure/events';
 
 interface ClosedApplicationParams
 {
     server?: Server,
-    eventHandler?: EventHandler
+    eventHandler?: IEventHandler
     messageBroker: IMessageBroker
     cache: ICacheDataAccess,
     createConnection: ICreateConnection,
diff --git a/src/index.ts b/src/index.ts
index d9c2b6b2..be746268 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -19,6 +19,7 @@ import EmailEvent from './Auth/Infrastructure/Events/EmailEvent';
 import ICacheDataAccess from './Main/Infrastructure/Repositories/ICacheDataAccess';
 import { IMessageBroker } from './Shared/Infrastructure/IMessageBroker';
 import crons from './crons';
+import { IEventHandler } from './Notification/Infrastructure/events';
 
 void (async() =>
 {
@@ -54,7 +55,9 @@ void (async() =>
         }
 
         // Set EventHandler and all events
-        const eventHandler = EventHandler.getInstance();
+        // const eventHandler = EventHandler.getInstance();
+
+        const eventHandler = DependencyInjector.inject<IEventHandler>('IEventHandler');
         eventHandler.setEvent(new EmailEvent());
         eventHandler.setEvent(new SendMessageEvent());
 
diff --git a/src/initTestServer.ts b/src/initTestServer.ts
index 4a4e1235..151c533c 100644
--- a/src/initTestServer.ts
+++ b/src/initTestServer.ts
@@ -17,6 +17,8 @@ import { REPOSITORIES } from './Shared/DI/Injects';
 import { Lifecycle } from 'tsyringe';
 import SendMessageEvent from './Notification/Domain/Events/SendMessageEvent';
 import AuthMockRepository from './Auth/Tests/AuthMockRepository';
+import DependencyInjector from './Shared/DI/DependencyInjector';
+import { IEventHandler } from './Notification/Infrastructure/events';
 
 type TestServerData = {
     request: supertest.SuperAgentTest,
@@ -34,7 +36,7 @@ const initTestServer = async(): Promise<TestServerData> =>
     await dbConnection.create();
     await dbConnection.synchronize();
 
-    const eventHandler = EventHandler.getInstance();
+    const eventHandler = DependencyInjector.inject<IEventHandler>('IEventHandler');
     eventHandler.setEvent(new SendMessageEvent());
 
     // @ts-ignore