diff --git a/core/execution/action/action.py b/core/execution/action/action.py
index 3dd0c87..d28cebb 100644
--- a/core/execution/action/action.py
+++ b/core/execution/action/action.py
@@ -5,10 +5,10 @@ from core.runtime.runtimecontract import buildRuntimeAttr, buildPreRuntimeAttr
 #from core.runtime.stopsignals import addStopSignal
 
 
-def buildAction (action, outputs, process):
+def buildAction (action, outputs):
     action_log = True
 
-    resolved, match, filter = buildPreRuntimeAttr(action, outputs, process)
+    resolved, match, filter = buildPreRuntimeAttr(action, outputs)
 
     if hasattr(action, "allowaction"):
         if not action.allowaction:
@@ -25,7 +25,7 @@ def buildAction (action, outputs, process):
     if response is None:
         return outputs, None
 
-    response = buildRuntimeAttr(action, outputs, resolved, response, process)
+    response = buildRuntimeAttr(action, outputs, resolved, response)
 
     if action_log:
         logging.info(f"{action.name} completed")
diff --git a/core/execution/executioncontract.py b/core/execution/executioncontract.py
index 9de661b..50a8b6a 100644
--- a/core/execution/executioncontract.py
+++ b/core/execution/executioncontract.py
@@ -4,7 +4,7 @@ from core.execution.monitor import buildMonitor
 #from core.runtime import manageFailure
 from core.execution.recursive import buildRecursive
 
-def executeContract(module, outputs, process):
+def executeContract(module, outputs):
 
     if module.kind == "operation":
 
@@ -14,7 +14,7 @@ def executeContract(module, outputs, process):
 
     elif module.kind == "action":
 
-        response = buildAction(module, outputs, process)
+        response = buildAction(module, outputs)
 
         return response
 
diff --git a/core/execution/lifecyclemanager/lifecyclemanager.py b/core/execution/lifecyclemanager/lifecyclemanager.py
index 4e83dfa..2cf2dd9 100644
--- a/core/execution/lifecyclemanager/lifecyclemanager.py
+++ b/core/execution/lifecyclemanager/lifecyclemanager.py
@@ -17,7 +17,7 @@ def manageLifecycle(module):
         while lifecycles[module.name]["mode"] == "continuous":
             lifecycles[module.name]["state"] = "active"
 
-            response = executeContract(module, outputs, None)
+            response = executeContract(module, outputs)
 
             if lifecycle_log:
                 print(f"{module.name} thread {lifecycles[module.name][module.name]} running in {lifecycles[module.name]['mode']} mode")
@@ -34,7 +34,7 @@ def manageLifecycle(module):
             print(f"{module.name} thread {lifecycles[module.name][module.name]} running in {lifecycles[module.name]['mode']} mode")
             print(lifecycles)
 
-        response = executeContract(module, outputs, None)
+        response = executeContract(module, outputs)
 
         lifecycles[module.name]["state"] = "stopped"
 
diff --git a/core/execution/monitor.py b/core/execution/monitor.py
index 86dda10..343edcd 100644
--- a/core/execution/monitor.py
+++ b/core/execution/monitor.py
@@ -36,6 +36,6 @@ def buildMonitor(monitor, outputs):
         logging.info(filter.get("print"))
         module = filter["execute"]
 
-        response = executeContract(filter["execute"], outputs, None)
+        response = executeContract(filter["execute"], outputs)
 
     return response 
\ No newline at end of file
diff --git a/core/runtime/firewall.py b/core/runtime/firewall.py
index ffec54a..6485ea9 100644
--- a/core/runtime/firewall.py
+++ b/core/runtime/firewall.py
@@ -21,7 +21,8 @@ def buildFirewall(listener, outputs):
 
             if filter.get("execute", False):
                 from core.apirequest.execute import executeRequest
-                response, outputs = executeRequest(filter["execute"], outputs, resolved)
+
+                response = executeRequest(filter["execute"], outputs, resolved)
 
             if firewall_log:
                 logging.info(filter.get("print"))
diff --git a/core/runtime/managefailure.py b/core/runtime/managefailure.py
index b1504a3..1b7be86 100644
--- a/core/runtime/managefailure.py
+++ b/core/runtime/managefailure.py
@@ -22,7 +22,7 @@ def manageFailure(error, action, outputs):
                 else:
                     print(f"{type(error).__name__} detected during {action.name}. Applying recovery policy.")
                     
-                    response = buildAction(repair, outputs, None)
+                    response = buildAction(repair, outputs)
 
                 return outputs
     print(f"{error}")
diff --git a/core/server/createlistener.py b/core/server/createlistener.py
index 2e3383a..ffc74c4 100644
--- a/core/server/createlistener.py
+++ b/core/server/createlistener.py
@@ -2,7 +2,6 @@ import json
 import logging
 
 from core.runtime.outputs import buildOutput
-from core.execution.executioncontract import executeContract
 from core.runtime.firewall import buildFirewall
 
 
@@ -32,11 +31,13 @@ def buildListener(listener, self):
         allow, status_code = buildFirewall(listener, outputs)
 
         if allow:
+            from core.execution.executioncontract import executeContract
+            
             #Print allowed items for logging purposes
             logging.info(outputs["firewall_allowed"])
 
             #Process and forward to RMASS
-            responses = executeContract(listener.execute, outputs, None)
+            responses = executeContract(listener.execute, outputs)