diff --git a/bot-context/pom.xml b/bot-context/pom.xml
index 8d7da4f..a2afe47 100644
--- a/bot-context/pom.xml
+++ b/bot-context/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.struchkov.godfather</groupId>
         <artifactId>godfather-bot</artifactId>
-        <version>0.0.18</version>
+        <version>0.0.22</version>
     </parent>
 
     <artifactId>bot-context</artifactId>
diff --git a/bot-context/src/main/java/dev/struchkov/godfather/context/domain/content/Mail.java b/bot-context/src/main/java/dev/struchkov/godfather/context/domain/content/Mail.java
index ead06ff..5cab808 100644
--- a/bot-context/src/main/java/dev/struchkov/godfather/context/domain/content/Mail.java
+++ b/bot-context/src/main/java/dev/struchkov/godfather/context/domain/content/Mail.java
@@ -90,7 +90,7 @@ public class Mail extends Message implements Event {
     }
 
     @Override
-    public String getType() {
+    public String getEventType() {
         return TYPE;
     }
 
diff --git a/bot-context/src/main/java/dev/struchkov/godfather/context/domain/event/Event.java b/bot-context/src/main/java/dev/struchkov/godfather/context/domain/event/Event.java
index 4d6bcdb..8394969 100644
--- a/bot-context/src/main/java/dev/struchkov/godfather/context/domain/event/Event.java
+++ b/bot-context/src/main/java/dev/struchkov/godfather/context/domain/event/Event.java
@@ -2,6 +2,6 @@ package dev.struchkov.godfather.context.domain.event;
 
 public interface Event {
 
-    String getType();
+    String getEventType();
 
 }
diff --git a/bot-context/src/main/java/dev/struchkov/godfather/context/domain/keyboard/button/SimpleButton.java b/bot-context/src/main/java/dev/struchkov/godfather/context/domain/keyboard/button/SimpleButton.java
index 6cb0d7e..1dfcbee 100644
--- a/bot-context/src/main/java/dev/struchkov/godfather/context/domain/keyboard/button/SimpleButton.java
+++ b/bot-context/src/main/java/dev/struchkov/godfather/context/domain/keyboard/button/SimpleButton.java
@@ -28,7 +28,7 @@ public class SimpleButton implements KeyBoardButton {
         this.callbackData = callbackData;
     }
 
-    public static SimpleButton simpleButton(@NotNull String label, @NotNull String callbackData) {
+    public static SimpleButton simpleButton(@NotNull String label, String callbackData) {
         return new SimpleButton(label, callbackData);
     }
 
diff --git a/bot-context/src/main/java/dev/struchkov/godfather/context/service/EventProvider.java b/bot-context/src/main/java/dev/struchkov/godfather/context/service/EventHandler.java
similarity index 64%
rename from bot-context/src/main/java/dev/struchkov/godfather/context/service/EventProvider.java
rename to bot-context/src/main/java/dev/struchkov/godfather/context/service/EventHandler.java
index 2bdfc8e..5eb9923 100644
--- a/bot-context/src/main/java/dev/struchkov/godfather/context/service/EventProvider.java
+++ b/bot-context/src/main/java/dev/struchkov/godfather/context/service/EventHandler.java
@@ -2,9 +2,9 @@ package dev.struchkov.godfather.context.service;
 
 import dev.struchkov.godfather.context.domain.event.Event;
 
-public interface EventProvider<T extends Event> {
+public interface EventHandler<T extends Event> {
 
-    void sendEvent(T event);
+    void handle(T event);
 
     String getEventType();
 
diff --git a/bot-core/pom.xml b/bot-core/pom.xml
index ff80c97..109de3f 100644
--- a/bot-core/pom.xml
+++ b/bot-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.struchkov.godfather</groupId>
         <artifactId>godfather-bot</artifactId>
-        <version>0.0.18</version>
+        <version>0.0.22</version>
     </parent>
 
     <artifactId>bot-core</artifactId>
diff --git a/bot-core/src/main/java/dev/struchkov/godfather/core/Storyline.java b/bot-core/src/main/java/dev/struchkov/godfather/core/Storyline.java
index 8a75c3d..bfa0e99 100644
--- a/bot-core/src/main/java/dev/struchkov/godfather/core/Storyline.java
+++ b/bot-core/src/main/java/dev/struchkov/godfather/core/Storyline.java
@@ -11,6 +11,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
+import static dev.struchkov.haiti.utils.Checker.checkNull;
+
 public class Storyline<M extends Message> {
 
     private final Set<MainUnit<M>> startingUnits = new HashSet<>();
@@ -50,6 +52,9 @@ public class Storyline<M extends Message> {
         final MainUnit<M> firstUnit = units.get(firstName);
         final MainUnit<M> secondUnit = units.get(secondName);
         Inspector.isNotNull(firstUnit, secondUnit);
+        if (checkNull(firstUnit.getNextUnits())) {
+            firstUnit.setNextUnits(new HashSet<>());
+        }
         firstUnit.getNextUnits().add(secondUnit);
     }
 
diff --git a/bot-core/src/main/java/dev/struchkov/godfather/core/service/provider/EventStoryLineProvider.java b/bot-core/src/main/java/dev/struchkov/godfather/core/service/provider/StoryLineHandler.java
similarity index 64%
rename from bot-core/src/main/java/dev/struchkov/godfather/core/service/provider/EventStoryLineProvider.java
rename to bot-core/src/main/java/dev/struchkov/godfather/core/service/provider/StoryLineHandler.java
index 78af56f..08ad559 100644
--- a/bot-core/src/main/java/dev/struchkov/godfather/core/service/provider/EventStoryLineProvider.java
+++ b/bot-core/src/main/java/dev/struchkov/godfather/core/service/provider/StoryLineHandler.java
@@ -1,19 +1,19 @@
 package dev.struchkov.godfather.core.service.provider;
 
 import dev.struchkov.godfather.context.domain.content.Mail;
-import dev.struchkov.godfather.context.service.EventProvider;
+import dev.struchkov.godfather.context.service.EventHandler;
 import dev.struchkov.godfather.core.GeneralAutoResponder;
 
-public class EventStoryLineProvider implements EventProvider<Mail> {
+public class StoryLineHandler implements EventHandler<Mail> {
 
     private final GeneralAutoResponder<Mail> generalAutoResponder;
 
-    public EventStoryLineProvider(GeneralAutoResponder<Mail> generalAutoResponder) {
+    public StoryLineHandler(GeneralAutoResponder<Mail> generalAutoResponder) {
         this.generalAutoResponder = generalAutoResponder;
     }
 
     @Override
-    public void sendEvent(Mail message) {
+    public void handle(Mail message) {
         generalAutoResponder.processingNewMessage(message);
     }
 
diff --git a/pom.xml b/pom.xml
index c3cce25..7cf672b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>dev.struchkov.godfather</groupId>
     <artifactId>godfather-bot</artifactId>
-    <version>0.0.18</version>
+    <version>0.0.22</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -32,13 +32,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <godfather.ver>0.0.18</godfather.ver>
-
-        <godfather.context.ver>${godfather.ver}</godfather.context.ver>
-        <godfather.core.ver>${godfather.ver}</godfather.core.ver>
+        <godfather.context.ver>${project.version}</godfather.context.ver>
+        <godfather.core.ver>${project.version}</godfather.core.ver>
 
         <autoresponder.ver>3.4.0</autoresponder.ver>
-        <haiti.utils>1.2.0</haiti.utils>
+        <haiti.utils>1.3.0</haiti.utils>
 
         <javax.persistence.api.ver>2.2</javax.persistence.api.ver>
         <validation.api.ver>2.0.1.Final</validation.api.ver>