diff --git a/samples/aspnet/Elsa.Samples.AspNet.DynamicActivityProvider/Workflows/get-all-users-workflow.json b/samples/aspnet/Elsa.Samples.AspNet.DynamicActivityProvider/Workflows/get-all-users-workflow.json
index e4baa0daa..8ba8e07d9 100644
--- a/samples/aspnet/Elsa.Samples.AspNet.DynamicActivityProvider/Workflows/get-all-users-workflow.json
+++ b/samples/aspnet/Elsa.Samples.AspNet.DynamicActivityProvider/Workflows/get-all-users-workflow.json
@@ -1 +1 @@
-{"id":"906cd28a12454b06b71bb724cd5891d0","definitionId":"4b3bbe91862c42ba921e21f70b429d8e","name":"Get Users","createdAt":"2023-07-13T14:02:19.276895+00:00","version":20,"variables":[{"id":"c4c6fbc0926f40d7a93e61eb7668b40b","name":"Users","typeName":"Object","isArray":true,"storageDriverTypeName":"Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"}],"inputs":[],"outputs":[],"outcomes":[],"customProperties":{},"isReadonly":false,"isLatest":true,"isPublished":false,"options":{"autoUpdateConsumingWorkflows":false},"root":{"type":"Elsa.Flowchart","version":1,"id":"Flowchart1","metadata":{},"customProperties":{"NotFoundConnectionsKey":[],"canStartWorkflow":false,"runAsynchronously":false},"start":"HttpEndpoint1","activities":[{"path":{"typeName":"String","expression":{"type":"Literal","value":"users/all"},"memoryReference":{"id":"6f30b933-ed1c-47fb-9d13-7b50f425e806"}},"supportedMethods":{"typeName":"String[]","expression":{"type":"Object","value":"[\u0022GET\u0022]"},"memoryReference":{"id":"d7ee590e-02b4-485d-8730-cc8656c55a99"}},"authorize":{"typeName":"Boolean","expression":{"type":"Literal","value":"False"},"memoryReference":{"id":"HttpEndpoint1:input-1"}},"policy":{"typeName":"String","expression":{"type":"Literal"},"memoryReference":{"id":"HttpEndpoint1:input-2"}},"parsedContent":null,"routeData":null,"queryStringData":null,"headers":null,"result":null,"id":"HttpEndpoint1","name":null,"type":"Elsa.HttpEndpoint","version":1,"customProperties":{"canStartWorkflow":true,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":120,"y":260}}}},{"statusCode":{"typeName":"System.Net.HttpStatusCode, System.Net.Primitives","expression":{"type":"Literal","value":"OK"},"memoryReference":{"id":"WriteHttpResponse1:input-1"}},"content":{"typeName":"Object","expression":{"type":"JavaScript","value":"const users = getUsers();\nreturn users;"},"memoryReference":{"id":"09552413-74b1-4156-86a3-6679feeec83e"}},"contentType":{"typeName":"String","expression":{"type":"Literal","value":"application/json"},"memoryReference":{"id":"a7b8ff37-34a3-4400-88b2-026f19de8901"}},"responseHeaders":{"typeName":"Elsa.Http.Models.HttpResponseHeaders, Elsa.Http","expression":{"type":"Literal","value":"{}"},"memoryReference":{"id":"WriteHttpResponse1:input-2"}},"id":"WriteHttpResponse1","name":null,"type":"Elsa.WriteHttpResponse","version":1,"customProperties":{"canStartWorkflow":false,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":920,"y":260}}}},{"variable":{"id":"c4c6fbc0926f40d7a93e61eb7668b40b","name":"Users","typeName":"Object","value":"","storageDriverTypeName":"Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"},"value":{"typeName":"Object","expression":{"type":"JavaScript","value":"getParsedContentFromGetUsers1()"},"memoryReference":{"id":"b1f4ed34-25d8-42f4-a59b-03541b11bfa6"}},"id":"SetVariable1","name":null,"type":"Elsa.SetVariable","version":1,"customProperties":{"canStartWorkflow":false,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":660,"y":260}},"displayText":"Set Users"}},{"expectedStatusCodes":[],"unmatchedStatusCode":null,"url":{"typeName":"System.Uri, System.Private.Uri","memoryReference":{"id":"9ba5ad9b-b88a-45de-8e08-aec043e22a10"}},"method":{"typeName":"String","memoryReference":{"id":"ab690185-cda3-44e6-8aaa-bb1c2a2e7941"}},"content":null,"contentType":null,"authorization":null,"requestHeaders":{"typeName":"Elsa.Http.Models.HttpRequestHeaders, Elsa.Http","expression":{"type":"Literal","value":"{}"},"memoryReference":{}},"parsedContent":null,"result":null,"id":"GetUsers1","name":null,"type":"Demo.Reqres.GetUsers","version":0,"customProperties":{"canStartWorkflow":false,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":460,"y":260}}}}],"connections":[{"source":{"activity":"HttpEndpoint1","port":"Done"},"target":{"activity":"GetUsers1","port":"In"}},{"source":{"activity":"SetVariable1","port":"Done"},"target":{"activity":"WriteHttpResponse1","port":"In"}},{"source":{"activity":"GetUsers1","port":"Done"},"target":{"activity":"SetVariable1","port":"In"}}]}}
\ No newline at end of file
+{"id":"906cd28a12454b06b71bb724cd5891d0","definitionId":"4b3bbe91862c42ba921e21f70b429d8e","name":"Get Users","createdAt":"2023-07-13T14:02:19.276895+00:00","version":20,"variables":[{"id":"c4c6fbc0926f40d7a93e61eb7668b40b","name":"Users","typeName":"Object","isArray":true,"storageDriverTypeName":"Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"}],"inputs":[],"outputs":[],"outcomes":[],"customProperties":{},"isReadonly":false,"isLatest":true,"isPublished":false,"options":{"autoUpdateConsumingWorkflows":false},"root":{"type":"Elsa.Flowchart","version":1,"id":"Flowchart1","metadata":{},"customProperties":{"NotFoundConnectionsKey":[],"canStartWorkflow":false,"runAsynchronously":false},"start":"HttpEndpoint1","activities":[{"path":{"typeName":"String","expression":{"type":"Literal","value":"users/all"},"memoryReference":{"id":"6f30b933-ed1c-47fb-9d13-7b50f425e806"}},"supportedMethods":{"typeName":"String[]","expression":{"type":"Object","value":"[\u0022GET\u0022]"},"memoryReference":{"id":"d7ee590e-02b4-485d-8730-cc8656c55a99"}},"authorize":{"typeName":"Boolean","expression":{"type":"Literal","value":"False"},"memoryReference":{"id":"HttpEndpoint1:input-1"}},"policy":{"typeName":"String","expression":{"type":"Literal"},"memoryReference":{"id":"HttpEndpoint1:input-2"}},"parsedContent":null,"routeData":null,"queryStringData":null,"headers":null,"result":null,"id":"HttpEndpoint1","name":null,"type":"Elsa.HttpEndpoint","version":1,"customProperties":{"canStartWorkflow":true,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":120,"y":260}}}},{"statusCode":{"typeName":"System.Net.HttpStatusCode, System.Net.Primitives","expression":{"type":"Literal","value":"OK"},"memoryReference":{"id":"WriteHttpResponse1:input-1"}},"content":{"typeName":"Object","expression":{"type":"JavaScript","value":"const users = getUsers();\nreturn users;"},"memoryReference":{"id":"09552413-74b1-4156-86a3-6679feeec83e"}},"contentType":{"typeName":"String","expression":{"type":"Literal","value":"application/json"},"memoryReference":{"id":"a7b8ff37-34a3-4400-88b2-026f19de8901"}},"responseHeaders":{"typeName":"Elsa.Http.Models.HttpResponseHeaders, Elsa.Http","expression":{"type":"Literal","value":"{}"},"memoryReference":{"id":"WriteHttpResponse1:input-2"}},"id":"WriteHttpResponse1","name":null,"type":"Elsa.WriteHttpResponse","version":1,"customProperties":{"canStartWorkflow":false,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":920,"y":260}}}},{"variable":{"id":"c4c6fbc0926f40d7a93e61eb7668b40b","name":"Users","typeName":"Object","value":"","storageDriverTypeName":"Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"},"value":{"typeName":"Object","expression":{"type":"JavaScript","value":"getParsedContentFromGetUsers1()"},"memoryReference":{"id":"b1f4ed34-25d8-42f4-a59b-03541b11bfa6"}},"id":"SetVariable1","name":null,"type":"Elsa.SetVariable","version":1,"customProperties":{"canStartWorkflow":false,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":660,"y":260}},"displayText":"Set Users"}},{"expectedStatusCodes":[],"unmatchedStatusCode":null,"url":{"typeName":"System.Uri, System.Private.Uri","memoryReference":{"id":"9ba5ad9b-b88a-45de-8e08-aec043e22a10"}},"method":{"typeName":"String","memoryReference":{"id":"ab690185-cda3-44e6-8aaa-bb1c2a2e7941"}},"content":null,"contentType":null,"authorization":null,"requestHeaders":{"typeName":"Elsa.Http.Models.HttpRequestHeaders, Elsa.Http","expression":{"type":"Literal","value":"{}"},"memoryReference":{}},"parsedContent":null,"result":null,"id":"GetUsers1","name":null,"type":"Demo.Reqres.GetUsers","version":0,"customProperties":{"canStartWorkflow":false,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":460,"y":260}}}}],"connections":[{"source":{"activity":"HttpEndpoint1","port":"Done"},"target":{"activity":"GetUsers1","port":"In"}},{"source":{"activity":"SetVariable1","port":"Done"},"target":{"activity":"WriteHttpResponse1","port":"In"}},{"source":{"activity":"GetUsers1","port":"Done"},"target":{"activity":"SetVariable1","port":"In"}}]}}
\ No newline at end of file
diff --git a/samples/aspnet/Elsa.Samples.AspNet.DynamicActivityProvider/Workflows/get-user-workflow.json b/samples/aspnet/Elsa.Samples.AspNet.DynamicActivityProvider/Workflows/get-user-workflow.json
index 0e06e5525..ab6e19031 100644
--- a/samples/aspnet/Elsa.Samples.AspNet.DynamicActivityProvider/Workflows/get-user-workflow.json
+++ b/samples/aspnet/Elsa.Samples.AspNet.DynamicActivityProvider/Workflows/get-user-workflow.json
@@ -1 +1 @@
-{"id":"cfd60b01f85148b29e99b72d8c91754f","definitionId":"91390522c8674589bf9383e9c8e05447","name":"Get User","createdAt":"2023-07-13T14:10:52.554187+00:00","version":9,"variables":[{"id":"be5481f1f8f64df39012282404fbe7c7","name":"User","typeName":"Object","isArray":false,"value":"","storageDriverTypeName":"Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"},{"id":"abd12e6b760840e38e7e79e8430d33db","name":"UserId","typeName":"Int32","isArray":false,"value":"0","storageDriverTypeName":"Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"}],"inputs":[],"outputs":[],"outcomes":[],"customProperties":{},"isReadonly":false,"isLatest":true,"isPublished":true,"options":{"autoUpdateConsumingWorkflows":false},"root":{"type":"Elsa.Flowchart","version":1,"id":"Flowchart1","metadata":{},"customProperties":{"NotFoundConnectionsKey":[],"canStartWorkflow":false,"runAsynchronously":false},"start":"HttpEndpoint1","activities":[{"path":{"typeName":"String","expression":{"type":"Literal","value":"users/{userId}"},"memoryReference":{"id":"36cc8af8-3b83-49fd-aca2-1b8ba40583e8"}},"supportedMethods":{"typeName":"String[]","expression":{"type":"Object","value":"[\u0022GET\u0022]"},"memoryReference":{"id":"7389a64a-0fdb-4b8b-af55-72bad1eb72c9"}},"authorize":{"typeName":"Boolean","expression":{"type":"Literal","value":"False"},"memoryReference":{"id":"HttpEndpoint1:input-1"}},"policy":null,"parsedContent":null,"routeData":{"typeName":"ObjectDictionary","memoryReference":{"id":"ed6d5b4f6e794477837ee29e746e8ccb"}},"queryStringData":null,"headers":null,"result":null,"id":"HttpEndpoint1","name":null,"type":"Elsa.HttpEndpoint","version":1,"customProperties":{"canStartWorkflow":true,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":260,"y":220}}}},{"variable":{"id":"abd12e6b760840e38e7e79e8430d33db","name":"UserId","typeName":"Int32","value":"0","storageDriverTypeName":"Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"},"value":{"typeName":"Object","expression":{"type":"JavaScript","value":"getRouteDataFromHttpEndpoint1()[\u0022userid\u0022]"},"memoryReference":{"id":"4ae05d95-e23f-4158-b53f-1043728d2ad1"}},"id":"SetVariable1","name":null,"type":"Elsa.SetVariable","version":1,"customProperties":{"canStartWorkflow":false,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":520,"y":220}},"displayText":"Set UserId"}},{"expectedStatusCodes":[],"unmatchedStatusCode":null,"url":{"typeName":"System.Uri, System.Private.Uri","memoryReference":{"id":"31406d9b-528a-4149-aed6-4dacfd6d566a"}},"method":{"typeName":"String","memoryReference":{"id":"91cbdddc-1df1-42ed-b63a-8ed7cfae115a"}},"content":null,"contentType":null,"authorization":null,"requestHeaders":{"typeName":"Elsa.Http.Models.HttpRequestHeaders, Elsa.Http","expression":{"type":"Literal","value":"{}"},"memoryReference":{}},"parsedContent":{"typeName":"Object","memoryReference":{"id":"be5481f1f8f64df39012282404fbe7c7"}},"result":null,"id":"GetUser1","name":null,"type":"Demo.Reqres.GetUser","version":0,"customProperties":{"canStartWorkflow":false,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":760,"y":220}}},"userId":{"typeName":"Int32","expression":{"type":"JavaScript","value":"getUserId()"},"memoryReference":{"id":"66cf67ac-5c36-48cd-8a3a-d24fb831e1b0"}}},{"statusCode":{"typeName":"System.Net.HttpStatusCode, System.Net.Primitives","expression":{"type":"Literal","value":"OK"},"memoryReference":{"id":"WriteHttpResponse1:input-1"}},"content":{"typeName":"Object","expression":{"type":"JavaScript","value":"getUser()"},"memoryReference":{"id":"36f78ecf-9b4c-4245-b1af-a44d9730b52e"}},"contentType":{"typeName":"String","expression":{"type":"Literal","value":"application/json"},"memoryReference":{"id":"5146a788-d413-4ea4-9ac7-99fcf717bb33"}},"responseHeaders":{"typeName":"Elsa.Http.Models.HttpResponseHeaders, Elsa.Http","expression":{"type":"Literal","value":"{}"},"memoryReference":{"id":"WriteHttpResponse1:input-2"}},"id":"WriteHttpResponse1","name":null,"type":"Elsa.WriteHttpResponse","version":1,"customProperties":{"canStartWorkflow":false,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":940,"y":220}}}}],"connections":[{"source":{"activity":"HttpEndpoint1","port":"Done"},"target":{"activity":"SetVariable1","port":"In"}},{"source":{"activity":"SetVariable1","port":"Done"},"target":{"activity":"GetUser1","port":"In"}},{"source":{"activity":"GetUser1","port":"Done"},"target":{"activity":"WriteHttpResponse1","port":"In"}}]}}
\ No newline at end of file
+{"id":"cfd60b01f85148b29e99b72d8c91754f","definitionId":"91390522c8674589bf9383e9c8e05447","name":"Get User","createdAt":"2023-07-13T14:10:52.554187+00:00","version":9,"variables":[{"id":"be5481f1f8f64df39012282404fbe7c7","name":"User","typeName":"Object","isArray":false,"value":"","storageDriverTypeName":"Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"},{"id":"abd12e6b760840e38e7e79e8430d33db","name":"UserId","typeName":"Int32","isArray":false,"value":"0","storageDriverTypeName":"Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"}],"inputs":[],"outputs":[],"outcomes":[],"customProperties":{},"isReadonly":false,"isLatest":true,"isPublished":true,"options":{"autoUpdateConsumingWorkflows":false},"root":{"type":"Elsa.Flowchart","version":1,"id":"Flowchart1","metadata":{},"customProperties":{"NotFoundConnectionsKey":[],"canStartWorkflow":false,"runAsynchronously":false},"start":"HttpEndpoint1","activities":[{"path":{"typeName":"String","expression":{"type":"Literal","value":"users/{userId}"},"memoryReference":{"id":"36cc8af8-3b83-49fd-aca2-1b8ba40583e8"}},"supportedMethods":{"typeName":"String[]","expression":{"type":"Object","value":"[\u0022GET\u0022]"},"memoryReference":{"id":"7389a64a-0fdb-4b8b-af55-72bad1eb72c9"}},"authorize":{"typeName":"Boolean","expression":{"type":"Literal","value":"False"},"memoryReference":{"id":"HttpEndpoint1:input-1"}},"policy":null,"parsedContent":null,"routeData":{"typeName":"ObjectDictionary","memoryReference":{"id":"ed6d5b4f6e794477837ee29e746e8ccb"}},"queryStringData":null,"headers":null,"result":null,"id":"HttpEndpoint1","name":null,"type":"Elsa.HttpEndpoint","version":1,"customProperties":{"canStartWorkflow":true,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":260,"y":220}}}},{"variable":{"id":"abd12e6b760840e38e7e79e8430d33db","name":"UserId","typeName":"Int32","value":"0","storageDriverTypeName":"Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"},"value":{"typeName":"Object","expression":{"type":"JavaScript","value":"getRouteDataFromHttpEndpoint1()[\u0022userid\u0022]"},"memoryReference":{"id":"4ae05d95-e23f-4158-b53f-1043728d2ad1"}},"id":"SetVariable1","name":null,"type":"Elsa.SetVariable","version":1,"customProperties":{"canStartWorkflow":false,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":520,"y":220}},"displayText":"Set UserId"}},{"expectedStatusCodes":[],"unmatchedStatusCode":null,"url":{"typeName":"System.Uri, System.Private.Uri","memoryReference":{"id":"31406d9b-528a-4149-aed6-4dacfd6d566a"}},"method":{"typeName":"String","memoryReference":{"id":"91cbdddc-1df1-42ed-b63a-8ed7cfae115a"}},"content":null,"contentType":null,"authorization":null,"requestHeaders":{"typeName":"Elsa.Http.Models.HttpRequestHeaders, Elsa.Http","expression":{"type":"Literal","value":"{}"},"memoryReference":{}},"parsedContent":{"typeName":"Object","memoryReference":{"id":"be5481f1f8f64df39012282404fbe7c7"}},"result":null,"id":"GetUser1","name":null,"type":"Demo.Reqres.GetUser","version":0,"customProperties":{"canStartWorkflow":false,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":760,"y":220}}},"userId":{"typeName":"Int32","expression":{"type":"JavaScript","value":"getUserId()"},"memoryReference":{"id":"66cf67ac-5c36-48cd-8a3a-d24fb831e1b0"}}},{"statusCode":{"typeName":"System.Net.HttpStatusCode, System.Net.Primitives","expression":{"type":"Literal","value":"OK"},"memoryReference":{"id":"WriteHttpResponse1:input-1"}},"content":{"typeName":"Object","expression":{"type":"JavaScript","value":"getUser()"},"memoryReference":{"id":"36f78ecf-9b4c-4245-b1af-a44d9730b52e"}},"contentType":{"typeName":"String","expression":{"type":"Literal","value":"application/json"},"memoryReference":{"id":"5146a788-d413-4ea4-9ac7-99fcf717bb33"}},"responseHeaders":{"typeName":"Elsa.Http.Models.HttpResponseHeaders, Elsa.Http","expression":{"type":"Literal","value":"{}"},"memoryReference":{"id":"WriteHttpResponse1:input-2"}},"id":"WriteHttpResponse1","name":null,"type":"Elsa.WriteHttpResponse","version":1,"customProperties":{"canStartWorkflow":false,"runAsynchronously":false},"metadata":{"designer":{"position":{"x":940,"y":220}}}}],"connections":[{"source":{"activity":"HttpEndpoint1","port":"Done"},"target":{"activity":"SetVariable1","port":"In"}},{"source":{"activity":"SetVariable1","port":"Done"},"target":{"activity":"GetUser1","port":"In"}},{"source":{"activity":"GetUser1","port":"Done"},"target":{"activity":"WriteHttpResponse1","port":"In"}}]}}
\ No newline at end of file
diff --git a/samples/aspnet/Elsa.Samples.AspNet.JsonWorkflowProvider/Workflows/main.json b/samples/aspnet/Elsa.Samples.AspNet.JsonWorkflowProvider/Workflows/main.json
index a82eb5d6f..cd1d5f623 100644
--- a/samples/aspnet/Elsa.Samples.AspNet.JsonWorkflowProvider/Workflows/main.json
+++ b/samples/aspnet/Elsa.Samples.AspNet.JsonWorkflowProvider/Workflows/main.json
@@ -11,7 +11,7 @@
       "typeName": "String",
       "isArray": false,
       "value": "",
-      "storageDriverTypeName": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
+      "storageDriverTypeName": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
     }
   ],
   "inputs": [],
diff --git a/samples/aspnet/Elsa.Samples.AspNet.JsonWorkflowProvider/Workflows/sub.json b/samples/aspnet/Elsa.Samples.AspNet.JsonWorkflowProvider/Workflows/sub.json
index 47cd85a13..94e65f06f 100644
--- a/samples/aspnet/Elsa.Samples.AspNet.JsonWorkflowProvider/Workflows/sub.json
+++ b/samples/aspnet/Elsa.Samples.AspNet.JsonWorkflowProvider/Workflows/sub.json
@@ -11,13 +11,13 @@
       "typeName": "String",
       "isArray": false,
       "value": "",
-      "storageDriverTypeName": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
+      "storageDriverTypeName": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
     }
   ],
   "inputs": [
     {
-      "uiHint": "single-line",
-      "storageDriverType": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core",
+      "uiHint": "singleline",
+      "storageDriverType": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core",
       "type": "String",
       "name": "fromMain",
       "displayName": "fromMain",
diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ImportAndExecute/Workflows/implicit-loop.json b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ImportAndExecute/Workflows/implicit-loop.json
index 9c0cba8fc..d078f8e95 100644
--- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ImportAndExecute/Workflows/implicit-loop.json
+++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ImportAndExecute/Workflows/implicit-loop.json
@@ -11,7 +11,7 @@
       "typeName": "Int32",
       "isArray": false,
       "value": "0",
-      "storageDriverTypeName": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
+      "storageDriverTypeName": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
     }
   ],
   "inputs": [],
@@ -36,7 +36,7 @@
           "name": "Counter",
           "typeName": "Int32",
           "value": "0",
-          "storageDriverTypeName": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
+          "storageDriverTypeName": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
         },
         "value": {
           "typeName": "Object",
diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JsonObjectSerialization/Workflows/instance-serialization.json b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JsonObjectSerialization/Workflows/instance-serialization.json
index ee7820723..db19854e7 100644
--- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JsonObjectSerialization/Workflows/instance-serialization.json
+++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JsonObjectSerialization/Workflows/instance-serialization.json
@@ -12,14 +12,14 @@
       "name": "Variable1",
       "typeName": "Object",
       "isArray": false,
-      "storageDriverTypeName": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
+      "storageDriverTypeName": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
     },
     {
       "id": "4e256dab27d33eac",
       "name": "Variable2",
       "typeName": "Object",
       "isArray": false,
-      "storageDriverTypeName": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
+      "storageDriverTypeName": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
     }
   ],
   "inputs": [],
@@ -50,7 +50,7 @@
           "id": "d4f37df0c6781767",
           "name": "Variable1",
           "typeName": "Object",
-          "storageDriverTypeName": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
+          "storageDriverTypeName": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
         },
         "value": {
           "typeName": "Object",
@@ -89,7 +89,7 @@
           "id": "4e256dab27d33eac",
           "name": "Variable2",
           "typeName": "Object",
-          "storageDriverTypeName": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
+          "storageDriverTypeName": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
         },
         "value": {
           "typeName": "Object",
diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildCompletion/Workflows/child.json b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildCompletion/Workflows/child.json
index 2af972129..c4656687a 100644
--- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildCompletion/Workflows/child.json
+++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildCompletion/Workflows/child.json
@@ -11,7 +11,7 @@
       "name": "Variable1",
       "typeName": "Object",
       "isArray": false,
-      "storageDriverTypeName": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
+      "storageDriverTypeName": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
     }
   ],
   "inputs": [],
diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildInputs/Workflows/child.json b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildInputs/Workflows/child.json
index 2f89aac94..af7f93822 100644
--- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildInputs/Workflows/child.json
+++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildInputs/Workflows/child.json
@@ -7,8 +7,8 @@
   "variables": [],
   "inputs": [
     {
-      "uiHint": "single-line",
-      "storageDriverType": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core",
+      "uiHint": "singleline",
+      "storageDriverType": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core",
       "type": "Object",
       "name": "Input1",
       "displayName": "Input1",
diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildInputs/Workflows/parent1.json b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildInputs/Workflows/parent1.json
index 0fe003b43..0c488c3a2 100644
--- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildInputs/Workflows/parent1.json
+++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildInputs/Workflows/parent1.json
@@ -7,8 +7,8 @@
   "variables": [],
   "inputs": [
     {
-      "uiHint": "single-line",
-      "storageDriverType": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core",
+      "uiHint": "singleline",
+      "storageDriverType": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core",
       "type": "Object",
       "name": "Input1",
       "displayName": "Input1",
diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildInputs/Workflows/parent2.json b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildInputs/Workflows/parent2.json
index 948b8eeed..62e5cdce5 100644
--- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildInputs/Workflows/parent2.json
+++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildInputs/Workflows/parent2.json
@@ -7,8 +7,8 @@
   "variables": [],
   "inputs": [
     {
-      "uiHint": "single-line",
-      "storageDriverType": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core",
+      "uiHint": "singleline",
+      "storageDriverType": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core",
       "type": "Object",
       "name": "Input1",
       "displayName": "Input1",
diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/calculator.json b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/calculator.json
index 716f1e9f4..a8c9b719a 100644
--- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/calculator.json
+++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/calculator.json
@@ -11,7 +11,7 @@
       "name": "TheSum",
       "typeName": "Int32",
       "isArray": false,
-      "storageDriverTypeName": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
+      "storageDriverTypeName": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
     }
   ],
   "inputs": [],
diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/consumer.json b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/consumer.json
index f0a582b93..38a374e88 100644
--- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/consumer.json
+++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/consumer.json
@@ -11,7 +11,7 @@
       "name": "Variable1",
       "typeName": "Object",
       "isArray": false,
-      "storageDriverTypeName": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
+      "storageDriverTypeName": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
     }
   ],
   "inputs": [],
diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/d.json b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/d.json
index 87c2a5124..e77f56b54 100644
--- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/d.json
+++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/d.json
@@ -11,14 +11,14 @@
       "name": "Variable1",
       "typeName": "Object",
       "isArray": false,
-      "storageDriverTypeName": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
+      "storageDriverTypeName": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
     },
     {
       "id": "3a8b25edc9bf109",
       "name": "Variable2",
       "typeName": "Object",
       "isArray": false,
-      "storageDriverTypeName": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
+      "storageDriverTypeName": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core"
     }
   ],
   "inputs": [],
diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/sum.json b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/sum.json
index f1e2c7215..19416a264 100644
--- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/sum.json
+++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/ParentChildOutputMapping/Workflows/sum.json
@@ -8,8 +8,8 @@
   "variables": [],
   "inputs": [
     {
-      "uiHint": "single-line",
-      "storageDriverType": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core",
+      "uiHint": "singleline",
+      "storageDriverType": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core",
       "type": "Int32",
       "name": "A",
       "displayName": "A",
@@ -17,8 +17,8 @@
       "isArray": false
     },
     {
-      "uiHint": "single-line",
-      "storageDriverType": "Elsa.Workflows.Core.Services.WorkflowStorageDriver, Elsa.Workflows.Core",
+      "uiHint": "singleline",
+      "storageDriverType": "Elsa.Workflows.Services.WorkflowStorageDriver, Elsa.Workflows.Core",
       "type": "Int32",
       "name": "B",
       "displayName": "B",