diff --git a/executor/cli/execute.py b/executor/cli/execute.py
index 1025360..5588dab 100644
--- a/executor/cli/execute.py
+++ b/executor/cli/execute.py
@@ -1,7 +1,7 @@
 __author__ = 'RemiZOffAlex'
 __email__ = 'remizoffalex@mail.ru'
 
-from executor.engine import Engine
+from executor.visitor import Visitor
 from executor.core import config
 
 
@@ -10,10 +10,11 @@ def handle_execute(args):
     variables = {
         'print': print,
     }
-    engine = Engine()
+    visitor = Visitor()
+    context = State()
     for key in variables:
-        engine.variable_addition(key, variables[key])
+        variable_addition(state, key, variables[key])
 
     source = {}
 
-    engine.visit(source)
+    visitor.visit(source, context)