diff --git a/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/EventHandler.java b/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/EventHandler.java
index ac57bdc..9ccdc71 100644
--- a/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/EventHandler.java
+++ b/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/EventHandler.java
@@ -1,9 +1,8 @@
 package dev.struchkov.godfather.quarkus.context.service;
 
-import dev.struchkov.godfather.main.domain.event.Event;
 import io.smallrye.mutiny.Uni;
 
-public interface EventHandler<T extends Event> {
+public interface EventHandler<T> {
 
     Uni<Void> handle(T event);
 
diff --git a/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/EventHandler.java b/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/EventHandler.java
index be87522..b537a3f 100644
--- a/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/EventHandler.java
+++ b/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/EventHandler.java
@@ -1,8 +1,6 @@
 package dev.struchkov.godfather.simple.context.service;
 
-import dev.struchkov.godfather.main.domain.event.Event;
-
-public interface EventHandler<T extends Event> {
+public interface EventHandler<T> {
 
     void handle(T event);
 
diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/provider/StoryLineHandler.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/provider/StoryLineHandler.java
index 691629a..928694e 100644
--- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/provider/StoryLineHandler.java
+++ b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/provider/StoryLineHandler.java
@@ -20,7 +20,7 @@ public class StoryLineHandler implements EventHandler<Mail> {
 
     @Override
     public String getEventType() {
-        return Mail.TYPE;
+        return Mail.class.getName();
     }
 
 }
diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/ChatStoryLineHandler.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/ChatStoryLineHandler.java
index 70400b8..af40257 100644
--- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/ChatStoryLineHandler.java
+++ b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/ChatStoryLineHandler.java
@@ -19,7 +19,7 @@ public class ChatStoryLineHandler implements EventHandler<ChatMail> {
 
     @Override
     public String getEventType() {
-        return ChatMail.TYPE;
+        return ChatMail.class.getName();
     }
 
 }
diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/PersonStoryLineHandler.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/PersonStoryLineHandler.java
index 8476abd..776bfbf 100644
--- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/PersonStoryLineHandler.java
+++ b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/PersonStoryLineHandler.java
@@ -19,7 +19,7 @@ public class PersonStoryLineHandler implements EventHandler<Mail> {
 
     @Override
     public String getEventType() {
-        return Mail.TYPE;
+        return Mail.class.getName();
     }
 
 }