wip
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index ea70af5..fb4ea70 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -19,6 +19,7 @@
 
 import os
 
+from aria.rest_mapi.core import ARESTClient
 from .. import helptexts
 from .. import table
 from .. import utils
@@ -143,6 +144,14 @@
     service = model_storage.service.get_by_name(service_name)
     executor = DryExecutor() if dry else None  # use WorkflowRunner's default executor
 
+    import aria as aria_core
+    from aria.orchestrator.plugin import PluginManager
+
+    model_storage = aria_core.application_model_storage(
+        ARESTClient, initiator=False)
+    plugin_manager = PluginManager(model_storage, plugin_manager._plugins_dir)
+
+    import pydevd; pydevd.settrace('localhost', suspend=False)
     workflow_runner = \
         WorkflowRunner(
             model_storage, resource_storage, plugin_manager,
diff --git a/aria/orchestrator/workflow_runner.py b/aria/orchestrator/workflow_runner.py
index df1725f..17f357e 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -124,7 +124,7 @@
     def _create_execution_model(self, inputs):
         execution = models.Execution(
             created_at=datetime.utcnow(),
-            service=self.service,
+            service_fk=self.service.id,
             workflow_name=self._workflow_name,
             inputs={})
 
diff --git a/tests/mock/context.py b/tests/mock/context.py
index ac0a8a7..bb24abe 100644
--- a/tests/mock/context.py
+++ b/tests/mock/context.py
@@ -26,6 +26,8 @@
 from ..storage import init_inmemory_model_storage
 from .topology import create_simple_topology_two_nodes
 
+from tests.rest_mapi.core import ARESTClient
+
 
 def simple(tmpdir, inmemory=False, context_kwargs=None, topology=None):
     initiator = init_inmemory_model_storage if inmemory else None
diff --git a/tests/orchestrator/workflows/executor/test_executor.py b/tests/orchestrator/workflows/executor/test_executor.py
index 32a68e0..8f1bfe6 100644
--- a/tests/orchestrator/workflows/executor/test_executor.py
+++ b/tests/orchestrator/workflows/executor/test_executor.py
@@ -17,6 +17,8 @@
 import pytest
 import retrying
 
+from tests.rest_mapi.core import ARESTClient
+
 try:
     import celery as _celery
     app = _celery.Celery()