diff --git a/Data/Config.xlsx b/Data/Config.xlsx
index 9f21906..63431ae 100644
Binary files a/Data/Config.xlsx and b/Data/Config.xlsx differ
diff --git a/Framework/GetAppCredentials.xaml b/Framework/GetAppCredential.xaml
similarity index 72%
rename from Framework/GetAppCredentials.xaml
rename to Framework/GetAppCredential.xaml
index cc12f6c..32c9e06 100644
--- a/Framework/GetAppCredentials.xaml
+++ b/Framework/GetAppCredential.xaml
@@ -1,4 +1,4 @@
-<Activity mc:Ignorable="sap sap2010 sads" x:Class="GetCredentials"
+<Activity mc:Ignorable="sap sap2010 sads" x:Class="GetAppCredential"
  xmlns="http://schemas.microsoft.com/netfx/2009/xaml/activities"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
  xmlns:mva="clr-namespace:Microsoft.VisualBasic.Activities;assembly=System.Activities"
@@ -70,12 +70,12 @@
       <AssemblyReference>UiPath.Excel</AssemblyReference>
     </sco:Collection>
   </TextExpression.ReferencesForImplementation>
-  <TryCatch sap2010:Annotation.AnnotationText="Securely fetch or create and use a set of credentials.&#xA;&#xA;First, there is an attempt to fetch credentials from Orchestrator using the name received as argument. &#xA;If it is not possible to retrieve those credentials from Orchestrator, there is an attempt to fetch them from the Windows Credential Manager (WCM). &#xA;If the credentials are not defined in the WCM, the user is prompted to create the credentials that will be added to the WCM and returned for use during the process execution.&#xA;&#xA;The Private property is used to prevent the generation of logs that might contain information about the credentials." DisplayName="Private: Get Application Credentials" sap2010:WorkflowViewState.IdRef="TryCatch_2">
+  <TryCatch sap2010:Annotation.AnnotationText="Securely fetch or create and use a credential.&#xA;&#xA;First, there is an attempt to fetch the credential from Orchestrator using the name received as argument. &#xA;If it is not possible to retrieve that credential from Orchestrator, there is an attempt to fetch it from the Windows Credential Manager (WCM). &#xA;If the credential is not defined in the WCM, the user is prompted to create the credential that will be added to the WCM and returned for use during the process execution.&#xA;&#xA;The Private property is used to prevent the generation of logs that might contain information about the credential." DisplayName="Private: Get Application Credential" sap2010:WorkflowViewState.IdRef="TryCatch_2">
     <TryCatch.Variables>
       <Variable x:TypeArguments="x:String" Name="StringPassword" />
     </TryCatch.Variables>
     <TryCatch.Try>
-      <ui:GetRobotCredential TimeoutMS="{x:Null}" sap2010:Annotation.AnnotationText="Attempt to retrieve credentials from Orchestrator." AssetName="[in_Credential]" DisplayName="Get credentials" sap2010:WorkflowViewState.IdRef="GetRobotCredential_2" Password="[out_Password]" Username="[out_Username]" />
+      <ui:GetRobotCredential TimeoutMS="{x:Null}" AssetName="[in_Credential]" DisplayName="Get credential from Orchestrator" sap2010:WorkflowViewState.IdRef="GetRobotCredential_2" Password="[out_Password]" Username="[out_Username]" />
     </TryCatch.Try>
     <TryCatch.Catches>
       <Catch x:TypeArguments="s:Exception" sap2010:WorkflowViewState.IdRef="Catch`1_2">
@@ -83,23 +83,23 @@
           <ActivityAction.Argument>
             <DelegateInArgument x:TypeArguments="s:Exception" Name="Exception" />
           </ActivityAction.Argument>
-          <If sap2010:Annotation.AnnotationText="The Private property is used to prevent the generation of logs that might contain information about the credentials." Condition="[out_Username Is Nothing Or out_Password Is Nothing]" DisplayName="Private: Fetch local credentials" sap2010:WorkflowViewState.IdRef="If_4">
+          <If sap2010:Annotation.AnnotationText="The Private property is used to prevent the generation of logs that might contain information about the credential." Condition="[out_Username Is Nothing Or out_Password Is Nothing]" DisplayName="Private: Fetch local credential" sap2010:WorkflowViewState.IdRef="If_4">
             <If.Then>
-              <Sequence sap2010:Annotation.AnnotationText="The Private property is used to prevent the generation of logs that might contain information about the credentials." DisplayName="Private: Get asset from Windows Credential Manager" sap2010:WorkflowViewState.IdRef="Sequence_6">
+              <Sequence sap2010:Annotation.AnnotationText="The Private property is used to prevent the generation of logs that might contain information about the credential." DisplayName="Private: Get asset from Windows Credential Manager" sap2010:WorkflowViewState.IdRef="Sequence_6">
                 <Sequence.Variables>
-                  <Variable x:TypeArguments="x:Boolean" Name="CredentialsFound" />
+                  <Variable x:TypeArguments="x:Boolean" Name="CredentialFound" />
                 </Sequence.Variables>
-                <ui:GetSecureCredential sap2010:Annotation.AnnotationText="Attempt to retrieve credentials from the Windows Credential Manager." CredentialType="Generic" DisplayName="Get secure credential" sap2010:WorkflowViewState.IdRef="GetSecureCredential_1" Password="[out_Password]" PersistanceType="Enterprise" Result="[CredentialsFound]" Target="[in_Credential]" Username="[out_Username]" />
-                <If Condition="[Not CredentialsFound]" DisplayName="If credentials are not defined in the Windows Credential Manager" sap2010:WorkflowViewState.IdRef="If_3">
+                <ui:GetSecureCredential sap2010:Annotation.AnnotationText="Attempt to retrieve credential from the Windows Credential Manager (WCM)." CredentialType="Generic" DisplayName="Get secure credential" sap2010:WorkflowViewState.IdRef="GetSecureCredential_1" Password="[out_Password]" PersistanceType="Enterprise" Result="[CredentialFound]" Target="[in_Credential]" Username="[out_Username]" />
+                <If Condition="[Not CredentialFound]" DisplayName="If credential is not defined in the Windows Credential Manager" sap2010:WorkflowViewState.IdRef="If_3">
                   <If.Then>
-                    <Sequence sap2010:Annotation.AnnotationText="The Private property is used to prevent the generation of logs that might contain information about the credentials." DisplayName="Request and store credentials" sap2010:WorkflowViewState.IdRef="Sequence_5">
-                      <ui:RequestCredential sap2010:Annotation.AnnotationText="Request credentials from user." DisplayName="Request credentials" sap2010:WorkflowViewState.IdRef="RequestCredential_2" Message="[&quot;Please provide &quot;&quot;&quot; + in_Credential + &quot;&quot;&quot; access credentials&quot;]" Password="[StringPassword]" Result="[CredentialsFound]" Title="Hello! This is Robot" Username="[out_Username]" />
-                      <If sap2010:Annotation.AnnotationText="Throw exception in case of no credentials, or add provided credentials to Windows Credential Manager." Condition="[Not CredentialsFound]" DisplayName="If credential request is cancelled" sap2010:WorkflowViewState.IdRef="If_5">
+                    <Sequence sap2010:Annotation.AnnotationText="The Private property is used to prevent the generation of logs that might contain information about the credential." DisplayName="Request and store credential" sap2010:WorkflowViewState.IdRef="Sequence_5">
+                      <ui:RequestCredential DisplayName="Request user credential" sap2010:WorkflowViewState.IdRef="RequestCredential_2" Message="[&quot;Please provide &quot;&quot;&quot; + in_Credential + &quot;&quot;&quot; access credential.&quot;]" Password="[StringPassword]" Result="[CredentialFound]" Title="Credential Needed" Username="[out_Username]" />
+                      <If sap2010:Annotation.AnnotationText="Throw exception in case of no credential, or add provided credential to Windows Credential Manager." Condition="[Not CredentialFound]" DisplayName="If credential request is cancelled" sap2010:WorkflowViewState.IdRef="If_5">
                         <If.Then>
-                          <Throw DisplayName="Throw (no credentials)" Exception="[new Exception(&quot;Credentials not supplied&quot;)]" sap2010:WorkflowViewState.IdRef="Throw_1" />
+                          <Throw DisplayName="Throw (no credential)" Exception="[New Exception(&quot;Credential not supplied.&quot;)]" sap2010:WorkflowViewState.IdRef="Throw_1" />
                         </If.Then>
                         <If.Else>
-                          <ui:AddCredential sap2010:Annotation.AnnotationText="Add provided credentials to the Windows Credential Manager to avoid requesting them in later executions of the process." CredentialType="Generic" DisplayName="Add Credential" sap2010:WorkflowViewState.IdRef="AddCredential_2" Password="[StringPassword]" PersistanceType="Enterprise" Target="[in_Credential]" Username="[out_Username]" />
+                          <ui:AddCredential sap2010:Annotation.AnnotationText="Add provided credential to the Windows Credential Manager to avoid requesting them in later executions of the process." CredentialType="Generic" DisplayName="Add user credential" sap2010:WorkflowViewState.IdRef="AddCredential_2" Password="[StringPassword]" PersistanceType="Enterprise" Target="[in_Credential]" Username="[out_Username]" />
                         </If.Else>
                       </If>
                       <Sequence sap2010:Annotation.AnnotationText="Convert manually provided password to SecureString." DisplayName="Convert password" sap2010:WorkflowViewState.IdRef="Sequence_9">
@@ -136,31 +136,19 @@
         </ActivityAction>
       </Catch>
     </TryCatch.Catches>
-    <sads:DebugSymbol.Symbol>d1JDOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXEZyYW1ld29ya1xHZXRBcHBDcmVkZW50aWFscy54YW1sJ0kDjAEOAgEBTgdOsQICATdWC4cBEAIBAk6UAU6lAQIBPE6eAk6uAgIBOk6EAk6UAgIBOFayAVboAQIBA1gPhQEaAgEGXBFcjwMCAS5dEYQBFgIBB1zhAlzyAgIBNVz8AlyMAwIBM1zFAlzZAgIBMVyQAlygAgIBL10fXTcCAQhfFYIBIAIBCmAXYKsDAgEkYRdoHAIBGGkXgQEiAgELYNABYLkCAgEsYJgDYKgDAgEqYN0CYPECAgEoYPgCYI4DAgEnYMMCYNUCAgElYa8BYccBAgEZYxtjtQECASJmG2afAwIBG2oZcSICARRyGYABJgIBDGNRY4gBAgEjZvECZoIDAgEgZowDZpwDAgEeZroCZswCAgEcb0tvXwIBF2xMbFoCARVyoAFyvgECARJ4H30uAgENfEZ8WQIBEHpRel8CAQ4=</sads:DebugSymbol.Symbol>
+    <sads:DebugSymbol.Symbol>d1FDOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXEZyYW1ld29ya1xHZXRBcHBDcmVkZW50aWFsLnhhbWwnSQOMAQ4CAQFOB07rAQIBN1YLhwEQAgECTj1OTgIBPE7YAU7oAQIBOk6+AU7OAQIBOFaxAVbnAQIBA1gPhQEaAgEGXBFckwMCAS5dEYQBFgIBB1zlAlz2AgIBNVyAA1yQAwIBM1zKAlzdAgIBMVyVAlylAgIBL10fXTYCAQhfFYIBIAIBCmAXYOgCAgEkYRdoHAIBGGkXgQEiAgELYJEBYPoBAgEsYNUCYOUCAgEqYJ4CYLECAgEoYLgCYMsCAgEnYIQCYJYCAgElYa0BYcQBAgEZYxtjtAECASJmG2ajAwIBG2oZcSICARRyGYABJgIBDGNQY4cBAgEjZvUCZoYDAgEgZpADZqADAgEeZr4CZtACAgEcb0tvXwIBF2xMbFoCARVyoAFyvgECARJ4H30uAgENfEZ8WQIBEHpRel8CAQ4=</sads:DebugSymbol.Symbol>
   </TryCatch>
   <sap2010:WorkflowViewState.ViewStateManager>
     <sap2010:ViewStateManager>
-      <sap2010:ViewStateData Id="GetRobotCredential_2" sap:VirtualizedContainerService.HintSize="200,64">
-        <sap:WorkflowViewStateService.ViewState>
-          <scg:Dictionary x:TypeArguments="x:String, x:Object">
-            <x:Boolean x:Key="IsAnnotationDocked">True</x:Boolean>
-          </scg:Dictionary>
-        </sap:WorkflowViewStateService.ViewState>
-      </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="GetSecureCredential_1" sap:VirtualizedContainerService.HintSize="200,79">
-        <sap:WorkflowViewStateService.ViewState>
-          <scg:Dictionary x:TypeArguments="x:String, x:Object">
-            <x:Boolean x:Key="IsAnnotationDocked">True</x:Boolean>
-          </scg:Dictionary>
-        </sap:WorkflowViewStateService.ViewState>
-      </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="RequestCredential_2" sap:VirtualizedContainerService.HintSize="200,49">
+      <sap2010:ViewStateData Id="GetRobotCredential_2" sap:VirtualizedContainerService.HintSize="200,22" />
+      <sap2010:ViewStateData Id="GetSecureCredential_1" sap:VirtualizedContainerService.HintSize="464,79">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsAnnotationDocked">True</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
+      <sap2010:ViewStateData Id="RequestCredential_2" sap:VirtualizedContainerService.HintSize="200,22" />
       <sap2010:ViewStateData Id="Throw_1" sap:VirtualizedContainerService.HintSize="200,22" />
       <sap2010:ViewStateData Id="AddCredential_2" sap:VirtualizedContainerService.HintSize="200,109">
         <sap:WorkflowViewStateService.ViewState>
@@ -190,7 +178,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Sequence_5" sap:VirtualizedContainerService.HintSize="222,541">
+      <sap2010:ViewStateData Id="Sequence_5" sap:VirtualizedContainerService.HintSize="222,514">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -198,38 +186,39 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="If_3" sap:VirtualizedContainerService.HintSize="200,51">
+      <sap2010:ViewStateData Id="If_3" sap:VirtualizedContainerService.HintSize="464,662">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
-            <x:Boolean x:Key="IsExpanded">False</x:Boolean>
+            <x:Boolean x:Key="IsExpanded">True</x:Boolean>
             <x:Boolean x:Key="IsPinned">False</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Sequence_6" sap:VirtualizedContainerService.HintSize="222,366">
+      <sap2010:ViewStateData Id="Sequence_6" sap:VirtualizedContainerService.HintSize="486,947">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
             <x:Boolean x:Key="IsAnnotationDocked">True</x:Boolean>
+            <x:Boolean x:Key="IsPinned">False</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="If_4" sap:VirtualizedContainerService.HintSize="464,556">
+      <sap2010:ViewStateData Id="If_4" sap:VirtualizedContainerService.HintSize="611,1137">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsAnnotationDocked">True</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Catch`1_2" sap:VirtualizedContainerService.HintSize="404,21">
+      <sap2010:ViewStateData Id="Catch`1_2" sap:VirtualizedContainerService.HintSize="617,1206">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
-            <x:Boolean x:Key="IsExpanded">False</x:Boolean>
+            <x:Boolean x:Key="IsExpanded">True</x:Boolean>
             <x:Boolean x:Key="IsPinned">False</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="TryCatch_2" sap:VirtualizedContainerService.HintSize="418,498">
+      <sap2010:ViewStateData Id="TryCatch_2" sap:VirtualizedContainerService.HintSize="631,1530">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -238,7 +227,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="GetCredentials_1" sap:VirtualizedContainerService.HintSize="458,578" />
+      <sap2010:ViewStateData Id="GetCredentials_1" sap:VirtualizedContainerService.HintSize="671,1610" />
     </sap2010:ViewStateManager>
   </sap2010:WorkflowViewState.ViewStateManager>
 </Activity>
\ No newline at end of file
diff --git a/Framework/InitAllSettings.xaml b/Framework/InitAllSettings.xaml
index 5a12e34..921cc79 100644
--- a/Framework/InitAllSettings.xaml
+++ b/Framework/InitAllSettings.xaml
@@ -105,7 +105,7 @@
                     <If.Then>
                       <Assign DisplayName="Add Config key/value pair" sap2010:WorkflowViewState.IdRef="Assign_15">
                         <Assign.To>
-                          <OutArgument x:TypeArguments="x:Object">[out_Config(row("Name").ToString.Trim)]</OutArgument>
+                          <OutArgument x:TypeArguments="x:Object">[out_Config(Row("Name").ToString.Trim)]</OutArgument>
                         </Assign.To>
                         <Assign.Value>
                           <InArgument x:TypeArguments="x:Object">[Row("Value")]</InArgument>
@@ -137,11 +137,11 @@
                   <TryCatch.Try>
                     <Sequence DisplayName="Get asset from Orchestrator" sap2010:WorkflowViewState.IdRef="Sequence_11">
                       <Sequence.Variables>
-                        <Variable x:TypeArguments="ui:GenericValue" Name="assetValue" />
+                        <Variable x:TypeArguments="ui:GenericValue" Name="AssetValue" />
                       </Sequence.Variables>
-                      <ui:GetRobotAsset TimeoutMS="{x:Null}" AssetName="[row(&quot;Asset&quot;).ToString]" DisplayName="Get Asset" sap2010:WorkflowViewState.IdRef="GetRobotAsset_4">
+                      <ui:GetRobotAsset TimeoutMS="{x:Null}" AssetName="[row(&quot;Asset&quot;).ToString]" DisplayName="Get Orchestrator asset" sap2010:WorkflowViewState.IdRef="GetRobotAsset_4">
                         <ui:GetRobotAsset.Value>
-                          <OutArgument x:TypeArguments="ui:GenericValue">[assetValue]</OutArgument>
+                          <OutArgument x:TypeArguments="ui:GenericValue">[AssetValue]</OutArgument>
                         </ui:GetRobotAsset.Value>
                       </ui:GetRobotAsset>
                       <Assign DisplayName="Assign asset value in Config" sap2010:WorkflowViewState.IdRef="Assign_23">
@@ -189,20 +189,20 @@
   </Sequence>
   <sap2010:WorkflowViewState.ViewStateManager>
     <sap2010:ViewStateManager>
-      <sap2010:ViewStateData Id="Assign_1" sap:VirtualizedContainerService.HintSize="418,60" />
-      <sap2010:ViewStateData Id="ReadRange_2" sap:VirtualizedContainerService.HintSize="314,87" />
+      <sap2010:ViewStateData Id="Assign_1" sap:VirtualizedContainerService.HintSize="532,60" />
+      <sap2010:ViewStateData Id="ReadRange_2" sap:VirtualizedContainerService.HintSize="494,87" />
       <sap2010:ViewStateData Id="Assign_15" sap:VirtualizedContainerService.HintSize="242,60" />
-      <sap2010:ViewStateData Id="If_1" sap:VirtualizedContainerService.HintSize="200,93">
+      <sap2010:ViewStateData Id="If_1" sap:VirtualizedContainerService.HintSize="464,235">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsAnnotationDocked">True</x:Boolean>
-            <x:Boolean x:Key="IsExpanded">False</x:Boolean>
+            <x:Boolean x:Key="IsExpanded">True</x:Boolean>
             <x:Boolean x:Key="IsPinned">False</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="ForEachRow_2" sap:VirtualizedContainerService.HintSize="314,241" />
-      <sap2010:ViewStateData Id="Sequence_5" sap:VirtualizedContainerService.HintSize="336,534">
+      <sap2010:ViewStateData Id="ForEachRow_2" sap:VirtualizedContainerService.HintSize="494,383" />
+      <sap2010:ViewStateData Id="Sequence_5" sap:VirtualizedContainerService.HintSize="516,676">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -211,7 +211,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="ForEach`1_3" sap:VirtualizedContainerService.HintSize="418,668">
+      <sap2010:ViewStateData Id="ForEach`1_3" sap:VirtualizedContainerService.HintSize="532,810">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -219,7 +219,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="ReadRange_3" sap:VirtualizedContainerService.HintSize="314,87" />
+      <sap2010:ViewStateData Id="ReadRange_3" sap:VirtualizedContainerService.HintSize="448,87" />
       <sap2010:ViewStateData Id="GetRobotAsset_4" sap:VirtualizedContainerService.HintSize="242,22" />
       <sap2010:ViewStateData Id="Assign_23" sap:VirtualizedContainerService.HintSize="242,60" />
       <sap2010:ViewStateData Id="Sequence_11" sap:VirtualizedContainerService.HintSize="264,246">
@@ -230,7 +230,7 @@
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
       <sap2010:ViewStateData Id="LogMessage_4" sap:VirtualizedContainerService.HintSize="314,91" />
-      <sap2010:ViewStateData Id="If_5" sap:VirtualizedContainerService.HintSize="464,281">
+      <sap2010:ViewStateData Id="If_5" sap:VirtualizedContainerService.HintSize="464,266">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -247,15 +247,15 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="TryCatch_3" sap:VirtualizedContainerService.HintSize="200,51">
+      <sap2010:ViewStateData Id="TryCatch_3" sap:VirtualizedContainerService.HintSize="418,473">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
-            <x:Boolean x:Key="IsExpanded">False</x:Boolean>
+            <x:Boolean x:Key="IsExpanded">True</x:Boolean>
             <x:Boolean x:Key="IsPinned">False</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="ForEachRow_3" sap:VirtualizedContainerService.HintSize="314,208">
+      <sap2010:ViewStateData Id="ForEachRow_3" sap:VirtualizedContainerService.HintSize="448,621">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -263,7 +263,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Sequence_6" sap:VirtualizedContainerService.HintSize="336,501">
+      <sap2010:ViewStateData Id="Sequence_6" sap:VirtualizedContainerService.HintSize="470,899">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -273,7 +273,7 @@
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
       <sap2010:ViewStateData Id="LogMessage_5" sap:VirtualizedContainerService.HintSize="314,91" />
-      <sap2010:ViewStateData Id="Catch`1_2" sap:VirtualizedContainerService.HintSize="404,21">
+      <sap2010:ViewStateData Id="Catch`1_2" sap:VirtualizedContainerService.HintSize="474,21">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">False</x:Boolean>
@@ -281,7 +281,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="TryCatch_2" sap:VirtualizedContainerService.HintSize="418,728">
+      <sap2010:ViewStateData Id="TryCatch_2" sap:VirtualizedContainerService.HintSize="532,1126">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -289,7 +289,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Sequence_2" sap:VirtualizedContainerService.HintSize="440,1762">
+      <sap2010:ViewStateData Id="Sequence_2" sap:VirtualizedContainerService.HintSize="554,2272">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -297,7 +297,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="GetAllSettings_1" sap:VirtualizedContainerService.HintSize="480,1842" />
+      <sap2010:ViewStateData Id="GetAllSettings_1" sap:VirtualizedContainerService.HintSize="594,2352" />
     </sap2010:ViewStateManager>
   </sap2010:WorkflowViewState.ViewStateManager>
 </Activity>
\ No newline at end of file
diff --git a/Framework/KillAllProcesses.xaml b/Framework/KillAllProcesses.xaml
index 78db9d7..b549abf 100644
--- a/Framework/KillAllProcesses.xaml
+++ b/Framework/KillAllProcesses.xaml
@@ -55,7 +55,7 @@
       <AssemblyReference>System.ServiceModel</AssemblyReference>
     </sco:Collection>
   </TextExpression.ReferencesForImplementation>
-  <Sequence sap2010:Annotation.AnnotationText="Use the Kill Process activity to force the termination of the Windows processes representing applications used in the business process.&#xA;Note that killing processes might have undesired outcomes, like losing unsaved changes to files." DisplayName="Kill All Processes" sap2010:WorkflowViewState.IdRef="Sequence_2">
+  <Sequence sap2010:Annotation.AnnotationText="Use the Kill Process activity to force the termination of the Windows processes representing applications used in the business process.&#xA;Note that killing processes might have undesired outcomes, such as losing unsaved changes to files." DisplayName="Kill All Processes" sap2010:WorkflowViewState.IdRef="Sequence_2">
     <ui:LogMessage DisplayName="Log message (Kill processes)" sap2010:WorkflowViewState.IdRef="LogMessage_1" Level="Trace" Message="Killing processes..." />
     <sads:DebugSymbol.Symbol>d1FDOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXEZyYW1ld29ya1xLaWxsQWxsUHJvY2Vzc2VzLnhhbWwDOgM9DgIBATsFO50BAgECO4QBO5oBAgED</sads:DebugSymbol.Symbol>
   </Sequence>
@@ -70,7 +70,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="CloseAllApplications_1" sap:VirtualizedContainerService.HintSize="376,382" />
+      <sap2010:ViewStateData Id="CloseAllApplications_1" sap:VirtualizedContainerService.HintSize="376,422" />
     </sap2010:ViewStateManager>
   </sap2010:WorkflowViewState.ViewStateManager>
 </Activity>
\ No newline at end of file
diff --git a/Framework/SetTransactionStatus.xaml b/Framework/SetTransactionStatus.xaml
index 831d0b0..ec1b5fa 100644
--- a/Framework/SetTransactionStatus.xaml
+++ b/Framework/SetTransactionStatus.xaml
@@ -14,14 +14,14 @@
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <x:Members>
     <x:Property sap2010:Annotation.AnnotationText="Dictionary structure to store configuration data." Name="in_Config" Type="InArgument(scg:Dictionary(x:String, x:Object))" />
-    <x:Property sap2010:Annotation.AnnotationText="Exception variable that is used during transitions between states." Name="in_SystemError" Type="InArgument(s:Exception)" />
-    <x:Property sap2010:Annotation.AnnotationText="Exception variable that is used during transitions between states." Name="in_BusinessRuleException" Type="InArgument(ui:BusinessRuleException)" />
     <x:Property sap2010:Annotation.AnnotationText="Transaction item to be processed." Name="in_TransactionItem" Type="InArgument(ui:QueueItem)" />
-    <x:Property sap2010:Annotation.AnnotationText="This variable controls the number of attempts of retrying the process in case of System Error." Name="io_RetryNumber" Type="InOutArgument(x:Int32)" />
+    <x:Property sap2010:Annotation.AnnotationText="This variable controls the number of attempts of retrying the process in case of System Exception." Name="io_RetryNumber" Type="InOutArgument(x:Int32)" />
     <x:Property sap2010:Annotation.AnnotationText="Sequential counter of transaction items." Name="io_TransactionNumber" Type="InOutArgument(x:Int32)" />
     <x:Property sap2010:Annotation.AnnotationText="Allow the optional addition of information about the transaction item." Name="in_TransactionField1" Type="InArgument(x:String)" />
     <x:Property sap2010:Annotation.AnnotationText="Allow the optional addition of information about the transaction item." Name="in_TransactionField2" Type="InArgument(x:String)" />
     <x:Property sap2010:Annotation.AnnotationText="Transaction ID used for information and logging purposes." Name="in_TransactionID" Type="InArgument(x:String)" />
+    <x:Property sap2010:Annotation.AnnotationText="Exception variable that is used during transitions between states." Name="in_SystemException" Type="InArgument(s:Exception)" />
+    <x:Property sap2010:Annotation.AnnotationText="Exception variable that is used during transitions between states." Name="in_BusinessRuleException" Type="InArgument(ui:BusinessRuleException)" />
   </x:Members>
   <mva:VisualBasic.Settings>
     <x:Null />
@@ -73,17 +73,19 @@
       <AssemblyReference>Microsoft.VisualStudio.Services.Common</AssemblyReference>
       <AssemblyReference>System.ComponentModel.Composition</AssemblyReference>
       <AssemblyReference>System.Runtime.WindowsRuntime</AssemblyReference>
+      <AssemblyReference>UiPath.Excel</AssemblyReference>
+      <AssemblyReference>UiPath.Python</AssemblyReference>
     </sco:Collection>
   </TextExpression.ReferencesForImplementation>
-  <Flowchart sap2010:Annotation.AnnotationText="Set and log the transaction's status along with extra log fields. &#xA;There can be three possible statuses: Success, Business Rule Exception and System Error (Application Exception).&#xA;&#xA;Business Rule Exception characterizes an irregular situation according to the process's rules and prevents the transaction to be processed. The transaction is not retried in this case, since the result will be the same until the problem that causes the exception is solved.&#xA;For example, it can be considered a BusinessRuleException if a process expects to read an email's attachment, but the sender didn't attach any file. In this case, immediate retries of the transaction will not yield a different result.&#xA;&#xA;On the other hand, system errors are characterized by exceptions whose types are different than BusinessRuleException. When this kind of exception happens, the transaction item can be retried after closing and reopening the applications involved in the process. The rationale behind this is that the exception was caused by a problem in the applications, which might be solved by restarting them.&#xA;&#xA;If Orchestrator queues are the source of transactions, the Set Transaction Status activity is used to update the status. In addition, the retry mechanism is also implemented by Orchestrator.&#xA;&#xA;If Orchestrator queues are not used, the status can be set, for example, by writing to a specific column in a spreadsheet. In such cases, the retry mechanism is covered by the framework and the number of retries is defined in the configuration file.&#xA;&#xA;At the end, io_TransactionNumber is incremented, which makes the framework get the next transaction to be processed." DisplayName="Set Transaction Status" sap2010:WorkflowViewState.IdRef="Flowchart_2">
+  <Flowchart sap2010:Annotation.AnnotationText="Set and log the transaction's status along with extra log fields. &#xA;There can be three possible statuses: Success, Business Rule Exception and System Exception (Application Exception).&#xA;&#xA;Business Rule Exception characterizes an irregular situation according to the process's rules and prevents the transaction to be processed. The transaction is not retried in this case, since the result will be the same until the problem that causes the exception is solved.&#xA;For example, it can be considered a BusinessRuleException if a process expects to read an email's attachment, but the sender didn't attach any file. In this case, immediate retries of the transaction will not yield a different result.&#xA;&#xA;On the other hand, system exceptions are characterized by exceptions whose types are different than BusinessRuleException. When this kind of exception happens, the transaction item can be retried after closing and reopening the applications involved in the process. The rationale behind this is that the exception was caused by a problem in the applications, which might be solved by restarting them.&#xA;&#xA;If Orchestrator queues are the source of transactions, the Set Transaction Status activity is used to update the status. In addition, the retry mechanism is also implemented by Orchestrator.&#xA;&#xA;If Orchestrator queues are not used, the status can be set, for example, by writing to a specific column in a spreadsheet. In such cases, the retry mechanism is covered by the framework and the number of retries is defined in the configuration file.&#xA;&#xA;At the end, io_TransactionNumber is incremented, which makes the framework get the next transaction to be processed." DisplayName="Set Transaction Status" sap2010:WorkflowViewState.IdRef="Flowchart_2">
     <Flowchart.StartNode>
-      <FlowDecision x:Name="__ReferenceID12" Condition="[in_BusinessRuleException is Nothing and in_SystemError is Nothing]" DisplayName="Success" sap2010:WorkflowViewState.IdRef="FlowDecision_1">
+      <FlowDecision x:Name="__ReferenceID12" Condition="[in_BusinessRuleException is Nothing and in_SystemException is Nothing]" DisplayName="Success" sap2010:WorkflowViewState.IdRef="FlowDecision_1">
         <FlowDecision.True>
           <FlowStep x:Name="__ReferenceID16" sap2010:WorkflowViewState.IdRef="FlowStep_10">
             <Sequence sap2010:Annotation.AnnotationText="If the transaction item is processed without any exceptions, its status is updated as Successful.&#xA;" DisplayName="Success" sap2010:WorkflowViewState.IdRef="Sequence_6">
               <If Condition="[in_TransactionItem isNot Nothing AndAlso (in_TransactionItem.GetType is GetType(Uipath.Core.QueueItem))]" DisplayName="If TransactionItem is a QueueItem (Success)" sap2010:WorkflowViewState.IdRef="If_2">
                 <If.Then>
-                  <ui:SetTransactionStatus ContinueOnError="{x:Null}" Reason="{x:Null}" ServiceBaseAddress="{x:Null}" TimeoutMS="{x:Null}" DisplayName="Set transaction status (Successful)" ErrorType="Application" Status="Successful" TransactionItem="[in_TransactionItem]">
+                  <ui:SetTransactionStatus ContinueOnError="{x:Null}" Reason="{x:Null}" ServiceBaseAddress="{x:Null}" TimeoutMS="{x:Null}" DisplayName="Set transaction status (Successful)" ErrorType="Application" sap2010:WorkflowViewState.IdRef="SetTransactionStatus_1" Status="Successful" TransactionItem="[in_TransactionItem]">
                     <ui:SetTransactionStatus.Output>
                       <scg:Dictionary x:TypeArguments="x:String, InArgument" />
                     </ui:SetTransactionStatus.Output>
@@ -145,7 +147,7 @@
                 <Sequence sap2010:Annotation.AnnotationText="If a BussinessRuleException is thrown during the process, the transaction item's status is updated as Failed (BusinessRuleException).&#xA;" DisplayName="Business Rule Exception" sap2010:WorkflowViewState.IdRef="Sequence_3">
                   <If Condition="[in_TransactionItem isNot Nothing AndAlso (in_TransactionItem.GetType is GetType(Uipath.Core.QueueItem))]" DisplayName="If TransactionItem is a QueueItem (BusinessRuleException)" sap2010:WorkflowViewState.IdRef="If_3">
                     <If.Then>
-                      <ui:SetTransactionStatus ContinueOnError="{x:Null}" ServiceBaseAddress="{x:Null}" TimeoutMS="{x:Null}" DisplayName="Set transaction status (BusinessRuleException status" ErrorType="Business" sap2010:WorkflowViewState.IdRef="SetTransactionStatus_2" Reason="[in_BusinessRuleException.Message]" Status="Failed" TransactionItem="[in_TransactionItem]">
+                      <ui:SetTransactionStatus ContinueOnError="{x:Null}" ServiceBaseAddress="{x:Null}" TimeoutMS="{x:Null}" DisplayName="Set transaction status (BusinessRuleException status)" ErrorType="Business" sap2010:WorkflowViewState.IdRef="SetTransactionStatus_2" Reason="[in_BusinessRuleException.Message]" Status="Failed" TransactionItem="[in_TransactionItem]">
                         <ui:SetTransactionStatus.Output>
                           <scg:Dictionary x:TypeArguments="x:String, InArgument" />
                         </ui:SetTransactionStatus.Output>
@@ -183,22 +185,22 @@
             </FlowDecision.True>
             <FlowDecision.False>
               <FlowStep x:Name="__ReferenceID15" sap2010:WorkflowViewState.IdRef="FlowStep_9">
-                <Sequence sap2010:Annotation.AnnotationText="If a system error occurs during the process, the transaction item's status is updated as Failed (Application)." DisplayName="System Error" sap2010:WorkflowViewState.IdRef="Sequence_5">
+                <Sequence sap2010:Annotation.AnnotationText="If a system exceptions occurs during the process, the transaction item's status is updated as Failed (Application)." DisplayName="System Exception" sap2010:WorkflowViewState.IdRef="Sequence_5">
                   <Sequence.Variables>
                     <Variable x:TypeArguments="x:Boolean" Name="QueueRetry" />
                   </Sequence.Variables>
-                  <If Condition="[in_TransactionItem isNot Nothing AndAlso (in_TransactionItem.GetType is GetType(Uipath.Core.QueueItem))]" DisplayName="If TransactionItem is a QueueItem (SystemError)" sap2010:WorkflowViewState.IdRef="If_4">
+                  <Assign DisplayName="Assign QueryRetry" sap2010:WorkflowViewState.IdRef="Assign_33">
+                    <Assign.To>
+                      <OutArgument x:TypeArguments="x:Boolean">[QueueRetry]</OutArgument>
+                    </Assign.To>
+                    <Assign.Value>
+                      <InArgument x:TypeArguments="x:Boolean">[in_TransactionItem isNot Nothing AndAlso (in_TransactionItem.GetType is GetType(Uipath.Core.QueueItem))]</InArgument>
+                    </Assign.Value>
+                  </Assign>
+                  <If Condition="[QueueRetry]" DisplayName="If TransactionItem is a QueueItem (System Exception)" sap2010:WorkflowViewState.IdRef="If_4">
                     <If.Then>
                       <Sequence DisplayName="Set transaction item status" sap2010:WorkflowViewState.IdRef="Sequence_7">
-                        <Assign DisplayName="Assign QueueRetry (True)" sap2010:WorkflowViewState.IdRef="Assign_22">
-                          <Assign.To>
-                            <OutArgument x:TypeArguments="x:Boolean">[QueueRetry]</OutArgument>
-                          </Assign.To>
-                          <Assign.Value>
-                            <InArgument x:TypeArguments="x:Boolean">True</InArgument>
-                          </Assign.Value>
-                        </Assign>
-                        <ui:SetTransactionStatus ContinueOnError="{x:Null}" ServiceBaseAddress="{x:Null}" TimeoutMS="{x:Null}" DisplayName="Set transaction status (SystemError)" ErrorType="Application" sap2010:WorkflowViewState.IdRef="SetTransactionStatus_3" Reason="[in_SystemError.Message]" Status="Failed" TransactionItem="[in_TransactionItem]">
+                        <ui:SetTransactionStatus ContinueOnError="{x:Null}" ServiceBaseAddress="{x:Null}" TimeoutMS="{x:Null}" DisplayName="Set transaction status (System Exception)" ErrorType="Application" sap2010:WorkflowViewState.IdRef="SetTransactionStatus_3" Reason="[in_SystemException.Message]" Status="Failed" TransactionItem="[in_TransactionItem]">
                           <ui:SetTransactionStatus.Output>
                             <scg:Dictionary x:TypeArguments="x:String, InArgument" />
                           </ui:SetTransactionStatus.Output>
@@ -213,18 +215,8 @@
                         </Assign>
                       </Sequence>
                     </If.Then>
-                    <If.Else>
-                      <Assign DisplayName="Assign QueueRetry (False)" sap2010:WorkflowViewState.IdRef="Assign_23">
-                        <Assign.To>
-                          <OutArgument x:TypeArguments="x:Boolean">[QueueRetry]</OutArgument>
-                        </Assign.To>
-                        <Assign.Value>
-                          <InArgument x:TypeArguments="x:Boolean">False</InArgument>
-                        </Assign.Value>
-                      </Assign>
-                    </If.Else>
                   </If>
-                  <ui:AddLogFields DisplayName="Add transaction log fields (SystemError)" sap2010:WorkflowViewState.IdRef="AddLogFields_6">
+                  <ui:AddLogFields DisplayName="Add transaction log fields (SystemException)" sap2010:WorkflowViewState.IdRef="AddLogFields_6">
                     <ui:AddLogFields.Fields>
                       <InArgument x:TypeArguments="x:String" x:Key="logF_TransactionStatus">ApplicationException</InArgument>
                       <InArgument x:TypeArguments="x:String" x:Key="logF_TransactionNumber">[io_TransactionNumber.ToString]</InArgument>
@@ -240,7 +232,7 @@
                           <FlowDecision x:Name="__ReferenceID2" Condition="[io_RetryNumber&gt;=cint(in_Config(&quot;MaxRetryNumber&quot;))]" DisplayName="Max retries reached?" sap2010:WorkflowViewState.IdRef="FlowDecision_11">
                             <FlowDecision.True>
                               <FlowStep x:Name="__ReferenceID3" sap2010:WorkflowViewState.IdRef="FlowStep_29">
-                                <ui:LogMessage DisplayName="Log message (Max retries reached)" sap2010:WorkflowViewState.IdRef="LogMessage_17" Level="Error" Message="[in_Config(&quot;LogMessage_ApplicationException&quot;).ToString+&quot; Max number of retries reached. &quot;+in_SystemError.Message+&quot; at Source: &quot;+in_SystemError.Source]" />
+                                <ui:LogMessage DisplayName="Log message (Max retries reached)" sap2010:WorkflowViewState.IdRef="LogMessage_17" Level="Error" Message="[in_Config(&quot;LogMessage_ApplicationException&quot;).ToString+&quot; Max number of retries reached. &quot;+in_SystemException.Message+&quot; at Source: &quot;+in_SystemException.Source]" />
                                 <FlowStep.Next>
                                   <FlowStep x:Name="__ReferenceID4" sap2010:WorkflowViewState.IdRef="FlowStep_28">
                                     <Assign DisplayName="Reset retry counter" sap2010:WorkflowViewState.IdRef="Assign_27">
@@ -269,7 +261,7 @@
                             </FlowDecision.True>
                             <FlowDecision.False>
                               <FlowStep x:Name="__ReferenceID5" sap2010:WorkflowViewState.IdRef="FlowStep_32">
-                                <ui:LogMessage DisplayName="Log message (Retry)" sap2010:WorkflowViewState.IdRef="LogMessage_18" Level="Warn" Message="[in_Config(&quot;LogMessage_ApplicationException&quot;).ToString+&quot; Retry: &quot;+io_RetryNumber.ToString+&quot;. &quot;+in_SystemError.Message+&quot; at Source: &quot;+in_SystemError.Source]" />
+                                <ui:LogMessage DisplayName="Log message (Retry)" sap2010:WorkflowViewState.IdRef="LogMessage_18" Level="Warn" Message="[in_Config(&quot;LogMessage_ApplicationException&quot;).ToString+&quot; Retry: &quot;+io_RetryNumber.ToString+&quot;. &quot;+in_SystemException.Message+&quot; at Source: &quot;+in_SystemException.Source]" />
                                 <FlowStep.Next>
                                   <FlowDecision x:Name="__ReferenceID9" Condition="[QueueRetry]" DisplayName="Use Orchestrator's retry?" sap2010:WorkflowViewState.IdRef="FlowDecision_10">
                                     <FlowDecision.True>
@@ -304,7 +296,7 @@
                         </FlowDecision.True>
                         <FlowDecision.False>
                           <FlowStep x:Name="__ReferenceID7" sap2010:WorkflowViewState.IdRef="FlowStep_34">
-                            <ui:LogMessage DisplayName="Log message (No retry)" sap2010:WorkflowViewState.IdRef="LogMessage_19" Level="Error" Message="[in_Config(&quot;LogMessage_ApplicationException&quot;).ToString+in_SystemError.Message+&quot; at Source: &quot;+in_SystemError.Source]" />
+                            <ui:LogMessage DisplayName="Log message (No retry)" sap2010:WorkflowViewState.IdRef="LogMessage_19" Level="Error" Message="[in_Config(&quot;LogMessage_ApplicationException&quot;).ToString+in_SystemException.Message+&quot; at Source: &quot;+in_SystemException.Source]" />
                             <FlowStep.Next>
                               <FlowStep x:Name="__ReferenceID8" sap2010:WorkflowViewState.IdRef="FlowStep_33">
                                 <Assign DisplayName="Increment TransactionNumber (No retry)" sap2010:WorkflowViewState.IdRef="Assign_31">
@@ -359,7 +351,7 @@
                           <ActivityAction.Argument>
                             <DelegateInArgument x:TypeArguments="s:Exception" Name="Exception" />
                           </ActivityAction.Argument>
-                          <ui:LogMessage DisplayName="Log message (Screenshot not taken)" sap2010:WorkflowViewState.IdRef="LogMessage_20" Level="Warn" Message="[&quot;Take screenshot failed with error: &quot;+Exception.Message+&quot; at Source: &quot;+exception.Source]" />
+                          <ui:LogMessage DisplayName="Log message (Screenshot not taken)" sap2010:WorkflowViewState.IdRef="LogMessage_20" Level="Warn" Message="[&quot;Take screenshot failed with error: &quot;+Exception.Message+&quot; at Source: &quot;+Exception.Source]" />
                         </ActivityAction>
                       </Catch>
                     </TryCatch.Catches>
@@ -417,10 +409,11 @@
     <x:Reference>__ReferenceID15</x:Reference>
     <x:Reference>__ReferenceID16</x:Reference>
     <x:Reference>__ReferenceID0</x:Reference>
-    <sads:DebugSymbol.Symbol>d1VDOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXEZyYW1ld29ya1xTZXRUcmFuc2FjdGlvblN0YXR1cy54YW1segF3AYEBAQJOA6UDDwIBAVA4UH0DAa4BjgE8jgFmAwGtAboBEZcDHAIBQJEBEbIBHAIBJncRiAEcAgEcUw10GAIBAr4BE+IBGAMBmQHjARPrASUDAY8B7AETzwIfAgFf0AIT2gIoAgFZ2wIT7gIeAgFQ7wITlgMeAgFBkgETmgEYAgE6mwETsQEeAgEneBN/HAIBIYABE4cBHAIBHVQPXBQCARddD3MaAgEDvgEhvgGMAQMBmgHAARfWASIDAZ8B2QEX4AEgAwGbAegBXegBcwMBlwHpAV3pAXMDAZUB5gFd5gF8AwGTAecBWecBawMBkQHlAV3lAXEDAZAB7gFH7gF7AwGNAbMCHbMCowIDAYgBtgIhvQIqAwGDAfABS/ABjQEDAYABkAIhkALfAgIBepICU5ICYQIBeKECKagCMgIBc5UCKZwCMgIBbvMBIfMB3wICAWn2ASX9AS4CAWWAAimHAjICAWDTAkDTAlYCAV7UAkDUAlYCAV3VAkDVAlICAVzWAkDWAlYCAVvXAkDXAlYCAVrdAhfiAi8CAVXqAhvqApICAgFR8QIX9QIvAgFO/QIbkgMmAgFCkgEhkgGMAQIBO5QBF5gBMQIBPJwBFaQBJwIBMKUBFaUBhgICAS6mARWwASoCASh9PX1VAgEkej56VAIBIoUBPYUBPgIBIIIBPoIBTgIBHlQdVIgBAgEYVhNaLQIBGV4RZiMCAQ1nEWfFAQIBCmgRciYCAQTBARnIASIDAakByQEZzQEzAwGkAc4BGdUBIgMBoAHeAUPeAUgDAZ4B2wFE2wFQAwGcAbMClwGzAqACAwGJAbsCS7sCYwMBhgG4Aky4AmIDAYQBkAKXAZAC3AICAXumAlOmAmUCAXajAlSjAmQCAXSaAlOaAmsCAXGXAlSXAmoCAW/zAaYB8wHcAgIBavsBT/sBUAIBaPgBUPgBYAIBZoUCU4UCawIBY4ICVIICagIBYd8CVN8CgwECAVfdAr4B3QLdAQIBVuoCoAHqAo8CAgFS8QLFAfEC6gECAU/+Ah3+ApUCAgFK/wIdkQMoAgFDlAGWApQBugICAT+UAdsClAHxAgIBPaEBX6EBdQIBOKIBX6IBdQIBNp8BX58BfgIBNKABW6ABbQIBMp4BX54BcAIBMaUBnAGlAYMCAgEvqQFCqQFYAgEtqgFCqgFYAgEsqwFCqwFUAgErrAFCrAFYAgEqrQFCrQFYAgEpVvoBVpACAgEaY1tjcQIBFWRbZHECARNhW2F6AgERYldiaQIBD2BbYGICAQ5njAFnwgECAQtrPmtUAgEJbD5sVAIBCG0+bVACAQduPm5UAgEGbz5vVAIBBcYBRcYBSQMBrAHDAUbDAVIDAaoByQGLAskBpQIDAacByQHGAskB3AIDAaUB0wFD0wFfAwGjAdABRNABVAMBoQH+AqkB/gKSAgIBS4EDIYUDOQIBSI0DJY0DlQICAUSBA8sBgQPsAQIBSY0DrQGNA5ICAgFF</sads:DebugSymbol.Symbol>
+    <sads:DebugSymbol.Symbol>d1VDOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXEZyYW1ld29ya1xTZXRUcmFuc2FjdGlvblN0YXR1cy54YW1sdwF3AYEBAQJQA50DDwIBAVI4UoEBAwGrAZABPJABZgMBqgG8ARGPAxwCAUCTARG0ARwCASZ5EYoBHAIBHFUNdhgCAQLAARPHARwDAaYByAET2gEYAwGZAdsBE+MBJQMBjwHkARPHAh8CAV/IAhPSAigCAVnTAhPmAh4CAVDnAhOOAx4CAUGUAROcARgCATqdAROzAR4CASd6E4EBHAIBIYIBE4kBHAIBHVYPXhQCARdfD3UaAgEDxQE/xQGoAQMBqQHCAUDCAUwDAacByAEhyAEvAwGaAcoBF9gBIgMBnAHgAV3gAXMDAZcB4QFd4QFzAwGVAd4BXd4BfAMBkwHfAVnfAWsDAZEB3QFd3QFxAwGQAeYBR+YBewMBjQGrAh2rAqsCAwGIAa4CIbUCKgMBgwHoAUvoAY0BAwGAAYgCIYgC5wICAXqKAlOKAmECAXiZAimgAjICAXONAimUAjICAW7rASHrAecCAgFp7gEl9QEuAgFl+AEp/wEyAgFgywJAywJWAgFezAJAzAJWAgFdzQJAzQJSAgFczgJAzgJWAgFbzwJAzwJWAgFa1QIX2gIvAgFV4gIb4gKSAgIBUekCF+0CLwIBTvUCG4oDJgIBQpQBIZQBjAECATuWAReaATECATyeARWmAScCATCnARWnAYYCAgEuqAEVsgEqAgEofz1/VQIBJHw+fFQCASKHAT2HAT4CASCEAT6EAU4CAR5WHVaIAQIBGFgTXC0CARlgEWgjAgENaRFpxQECAQpqEXQmAgEEywEZzwEzAwGhAdABGdcBIgMBnQGrApcBqwKoAgMBiQGzAkuzAmMDAYYBsAJMsAJiAwGEAYgClwGIAuQCAgF7ngJTngJlAgF2mwJUmwJkAgF0kgJTkgJrAgFxjwJUjwJqAgFv6wGmAesB5AICAWrzAU/zAVACAWjwAVDwAWACAWb9AVP9AWsCAWP6AVT6AWoCAWHXAlTXAoMBAgFX1QK+AdUC3QECAVbiAqAB4gKPAgIBUukCxQHpAuoBAgFP9gId9gKVAgIBSvcCHYkDKAIBQ5YBlwKWAbsCAgE/lgHcApYB8gICAT2jAV+jAXUCATikAV+kAXUCATahAV+hAX4CATSiAVuiAW0CATKgAV+gAXACATGnAZwBpwGDAgIBL6sBQqsBWAIBLawBQqwBWAIBLK0BQq0BVAIBK64BQq4BWAIBKq8BQq8BWAIBKVizAljJAgIBGmVbZXECARVmW2ZxAgETY1tjegIBEWRXZGkCAQ9iW2JiAgEOaYwBacIBAgELbT5tVAIBCW4+blQCAQhvPm9QAgEHcD5wVAIBBnE+cVQCAQXLAZACywGuAgMBpAHLAc8CywHlAgMBogHVAUPVAV8DAaAB0gFE0gFUAwGeAfYCqQH2ApICAgFL+QIh/QI5AgFIhQMlhQOVAgIBRPkCywH5AuwBAgFJhQOtAYUDkgICAUU=</sads:DebugSymbol.Symbol>
   </Flowchart>
   <sap2010:WorkflowViewState.ViewStateManager>
     <sap2010:ViewStateManager>
+      <sap2010:ViewStateData Id="SetTransactionStatus_1" sap:VirtualizedContainerService.HintSize="694,1225" />
       <sap2010:ViewStateData Id="If_2" sap:VirtualizedContainerService.HintSize="464,208" />
       <sap2010:ViewStateData Id="AddLogFields_4" sap:VirtualizedContainerService.HintSize="314,22" />
       <sap2010:ViewStateData Id="LogMessage_15" sap:VirtualizedContainerService.HintSize="314,91" />
@@ -513,20 +506,19 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Assign_22" sap:VirtualizedContainerService.HintSize="242,60" />
+      <sap2010:ViewStateData Id="Assign_33" sap:VirtualizedContainerService.HintSize="785,60" />
       <sap2010:ViewStateData Id="SetTransactionStatus_3" sap:VirtualizedContainerService.HintSize="242,22" />
       <sap2010:ViewStateData Id="Assign_21" sap:VirtualizedContainerService.HintSize="242,60" />
-      <sap2010:ViewStateData Id="Sequence_7" sap:VirtualizedContainerService.HintSize="200,51">
+      <sap2010:ViewStateData Id="Sequence_7" sap:VirtualizedContainerService.HintSize="264,246">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
-            <x:Boolean x:Key="IsExpanded">False</x:Boolean>
+            <x:Boolean x:Key="IsExpanded">True</x:Boolean>
             <x:Boolean x:Key="IsPinned">False</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Assign_23" sap:VirtualizedContainerService.HintSize="242,60" />
-      <sap2010:ViewStateData Id="If_4" sap:VirtualizedContainerService.HintSize="467,208" />
-      <sap2010:ViewStateData Id="AddLogFields_6" sap:VirtualizedContainerService.HintSize="467,22" />
+      <sap2010:ViewStateData Id="If_4" sap:VirtualizedContainerService.HintSize="785,394" />
+      <sap2010:ViewStateData Id="AddLogFields_6" sap:VirtualizedContainerService.HintSize="785,22" />
       <sap2010:ViewStateData Id="LogMessage_17" sap:VirtualizedContainerService.HintSize="200,51">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
@@ -650,10 +642,10 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Flowchart_7" sap:VirtualizedContainerService.HintSize="467,51">
+      <sap2010:ViewStateData Id="Flowchart_7" sap:VirtualizedContainerService.HintSize="785,698">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
-            <x:Boolean x:Key="IsExpanded">False</x:Boolean>
+            <x:Boolean x:Key="IsExpanded">True</x:Boolean>
             <x:Boolean x:Key="IsPinned">False</x:Boolean>
             <av:Point x:Key="ShapeLocation">300,2.4</av:Point>
             <av:Size x:Key="ShapeSize">60,75</av:Size>
@@ -663,18 +655,18 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="RemoveLogFields_7" sap:VirtualizedContainerService.HintSize="467,22" />
+      <sap2010:ViewStateData Id="RemoveLogFields_7" sap:VirtualizedContainerService.HintSize="785,22" />
       <sap2010:ViewStateData Id="InvokeWorkflowFile_4" sap:VirtualizedContainerService.HintSize="314,87" />
       <sap2010:ViewStateData Id="LogMessage_20" sap:VirtualizedContainerService.HintSize="314,91" />
-      <sap2010:ViewStateData Id="Catch`1_4" sap:VirtualizedContainerService.HintSize="404,21">
+      <sap2010:ViewStateData Id="Catch`1_4" sap:VirtualizedContainerService.HintSize="400,160">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
-            <x:Boolean x:Key="IsExpanded">False</x:Boolean>
+            <x:Boolean x:Key="IsExpanded">True</x:Boolean>
             <x:Boolean x:Key="IsPinned">False</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="TryCatch_4" sap:VirtualizedContainerService.HintSize="467,356">
+      <sap2010:ViewStateData Id="TryCatch_4" sap:VirtualizedContainerService.HintSize="785,364">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -718,7 +710,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="TryCatch_6" sap:VirtualizedContainerService.HintSize="467,371">
+      <sap2010:ViewStateData Id="TryCatch_6" sap:VirtualizedContainerService.HintSize="785,371">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -727,7 +719,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Sequence_5" sap:VirtualizedContainerService.HintSize="200,138">
+      <sap2010:ViewStateData Id="Sequence_5" sap:VirtualizedContainerService.HintSize="807,2322">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">False</x:Boolean>
@@ -766,7 +758,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Flowchart_2" sap:VirtualizedContainerService.HintSize="654,1130">
+      <sap2010:ViewStateData Id="Flowchart_2" sap:VirtualizedContainerService.HintSize="654,1145">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">False</x:Boolean>
@@ -779,7 +771,6 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="SetTransactionStatus_1" sap:VirtualizedContainerService.HintSize="694,1210" />
     </sap2010:ViewStateManager>
   </sap2010:WorkflowViewState.ViewStateManager>
 </Activity>
\ No newline at end of file
diff --git a/Main.xaml b/Main.xaml
index e458d5f..f60e67a 100644
--- a/Main.xaml
+++ b/Main.xaml
@@ -84,9 +84,9 @@
           <TryCatch DisplayName="Try initializing settings and applications" sap2010:WorkflowViewState.IdRef="TryCatch_2">
             <TryCatch.Try>
               <Sequence DisplayName="Load configurations and open applications" sap2010:WorkflowViewState.IdRef="Sequence_4">
-                <Assign DisplayName="Assign SystemError (initialization)" sap2010:WorkflowViewState.IdRef="Assign_5">
+                <Assign DisplayName="Assign SystemException (initialization)" sap2010:WorkflowViewState.IdRef="Assign_5">
                   <Assign.To>
-                    <OutArgument x:TypeArguments="s:Exception">[SystemError]</OutArgument>
+                    <OutArgument x:TypeArguments="s:Exception">[SystemException]</OutArgument>
                   </Assign.To>
                   <Assign.Value>
                     <InArgument x:TypeArguments="s:Exception">[Nothing]</InArgument>
@@ -102,7 +102,7 @@
                           <OutArgument x:TypeArguments="scg:Dictionary(x:String, x:Object)" x:Key="out_Config">[Config]</OutArgument>
                         </ui:InvokeWorkflowFile.Arguments>
                       </ui:InvokeWorkflowFile>
-                      <If sap2010:Annotation.AnnotationText="Overwrite queue name from in configuration file in case the argument OrchestratorQueueName is specified.&#xA;This provides backward compatibility with &lt; 2018.3 and allows default values to come from Config.xlsx" Condition="[Not string.IsNullOrEmpty(in_OrchestratorQueueName)]" DisplayName="If OrchestratorQueueName is specified" sap2010:WorkflowViewState.IdRef="If_10">
+                      <If sap2010:Annotation.AnnotationText="Overwrite queue name from in configuration file in case the argument in_OrchestratorQueueName is specified.&#xA;This provides backward compatibility with &lt; 2018.3 and allows default values to come from Config.xlsx" Condition="[Not string.IsNullOrEmpty(in_OrchestratorQueueName)]" DisplayName="If in_OrchestratorQueueName is specified" sap2010:WorkflowViewState.IdRef="If_10">
                         <If.Then>
                           <Assign DisplayName="Assign OrchestratorQueueName" sap2010:WorkflowViewState.IdRef="Assign_20">
                             <Assign.To>
@@ -140,9 +140,9 @@
                   <ActivityAction.Argument>
                     <DelegateInArgument x:TypeArguments="s:Exception" Name="exception" />
                   </ActivityAction.Argument>
-                  <Assign sap2010:Annotation.AnnotationText="Failures during the initialization are considered SystemError and will lead to the End Process state, thus finalizing the execution." DisplayName="Assign SystemError" sap2010:WorkflowViewState.IdRef="Assign_21">
+                  <Assign sap2010:Annotation.AnnotationText="Failures during the initialization are considered system exceptions and will lead to the End Process state, thus finalizing the execution." DisplayName="Assign SystemException" sap2010:WorkflowViewState.IdRef="Assign_21">
                     <Assign.To>
-                      <OutArgument x:TypeArguments="s:Exception">[SystemError]</OutArgument>
+                      <OutArgument x:TypeArguments="s:Exception">[SystemException]</OutArgument>
                     </Assign.To>
                     <Assign.Value>
                       <InArgument x:TypeArguments="s:Exception">[Exception]</InArgument>
@@ -220,7 +220,7 @@
                 <State.Transitions>
                   <Transition DisplayName="New Transaction" sap2010:WorkflowViewState.IdRef="Transition_6">
                     <Transition.To>
-                      <State x:Name="__ReferenceID3" sap2010:Annotation.AnnotationText="Process a single transaction. &#xA;The result of the processing can be: 1) Success, 2) Business Rule Exception, 3) System Error. &#xA;In the case of System Error, the transaction can be automatically retried." DisplayName="Process Transaction" sap2010:WorkflowViewState.IdRef="State_3">
+                      <State x:Name="__ReferenceID3" sap2010:Annotation.AnnotationText="Process a single transaction. &#xA;The result of the processing can be: 1) Success, 2) Business Rule Exception, 3) System Exception. &#xA;In the case of System Exception, the transaction can be automatically retried." DisplayName="Process Transaction" sap2010:WorkflowViewState.IdRef="State_3">
                         <State.Entry>
                           <TryCatch DisplayName="Try to process transaction" sap2010:WorkflowViewState.IdRef="TryCatch_9">
                             <TryCatch.Try>
@@ -245,14 +245,14 @@
                               <Catch x:TypeArguments="ui:BusinessRuleException" sap2010:WorkflowViewState.IdRef="Catch`1_9">
                                 <ActivityAction x:TypeArguments="ui:BusinessRuleException">
                                   <ActivityAction.Argument>
-                                    <DelegateInArgument x:TypeArguments="ui:BusinessRuleException" Name="exception" />
+                                    <DelegateInArgument x:TypeArguments="ui:BusinessRuleException" Name="Exception" />
                                   </ActivityAction.Argument>
-                                  <Assign DisplayName="Set transaction status to Rule Exception" sap2010:WorkflowViewState.IdRef="Assign_26">
+                                  <Assign DisplayName="Set transaction status to BusinessRuleException" sap2010:WorkflowViewState.IdRef="Assign_26">
                                     <Assign.To>
                                       <OutArgument x:TypeArguments="ui:BusinessRuleException">[BusinessRuleException]</OutArgument>
                                     </Assign.To>
                                     <Assign.Value>
-                                      <InArgument x:TypeArguments="ui:BusinessRuleException">[exception]</InArgument>
+                                      <InArgument x:TypeArguments="ui:BusinessRuleException">[Exception]</InArgument>
                                     </Assign.Value>
                                   </Assign>
                                 </ActivityAction>
@@ -260,14 +260,14 @@
                               <Catch x:TypeArguments="s:Exception" sap2010:WorkflowViewState.IdRef="Catch`1_10">
                                 <ActivityAction x:TypeArguments="s:Exception">
                                   <ActivityAction.Argument>
-                                    <DelegateInArgument x:TypeArguments="s:Exception" Name="exception" />
+                                    <DelegateInArgument x:TypeArguments="s:Exception" Name="Exception" />
                                   </ActivityAction.Argument>
-                                  <Assign DisplayName="Set transaction status to SystemError" sap2010:WorkflowViewState.IdRef="Assign_27">
+                                  <Assign DisplayName="Set transaction status to SystemException" sap2010:WorkflowViewState.IdRef="Assign_27">
                                     <Assign.To>
-                                      <OutArgument x:TypeArguments="s:Exception">[SystemError]</OutArgument>
+                                      <OutArgument x:TypeArguments="s:Exception">[SystemException]</OutArgument>
                                     </Assign.To>
                                     <Assign.Value>
-                                      <InArgument x:TypeArguments="s:Exception">[exception]</InArgument>
+                                      <InArgument x:TypeArguments="s:Exception">[Exception]</InArgument>
                                     </Assign.Value>
                                   </Assign>
                                 </ActivityAction>
@@ -279,14 +279,14 @@
                                   <ui:InvokeWorkflowFile ContinueOnError="{x:Null}" DisplayName="Invoke SetTransactionStatus workflow" sap2010:WorkflowViewState.IdRef="InvokeWorkflowFile_25" UnSafe="False" WorkflowFileName="Framework\SetTransactionStatus.xaml">
                                     <ui:InvokeWorkflowFile.Arguments>
                                       <InArgument x:TypeArguments="scg:Dictionary(x:String, x:Object)" x:Key="in_Config">[Config]</InArgument>
-                                      <InArgument x:TypeArguments="s:Exception" x:Key="in_SystemError">[SystemError]</InArgument>
-                                      <InArgument x:TypeArguments="ui:BusinessRuleException" x:Key="in_BusinessRuleException">[BusinessRuleException]</InArgument>
                                       <InArgument x:TypeArguments="ui:QueueItem" x:Key="in_TransactionItem">[TransactionItem]</InArgument>
                                       <InOutArgument x:TypeArguments="x:Int32" x:Key="io_RetryNumber">[RetryNumber]</InOutArgument>
                                       <InOutArgument x:TypeArguments="x:Int32" x:Key="io_TransactionNumber">[TransactionNumber]</InOutArgument>
                                       <InArgument x:TypeArguments="x:String" x:Key="in_TransactionField1">[TransactionField1]</InArgument>
                                       <InArgument x:TypeArguments="x:String" x:Key="in_TransactionField2">[TransactionField2]</InArgument>
                                       <InArgument x:TypeArguments="x:String" x:Key="in_TransactionID">[TransactionID]</InArgument>
+                                      <InArgument x:TypeArguments="s:Exception" x:Key="in_SystemException">[SystemException]</InArgument>
+                                      <InArgument x:TypeArguments="ui:BusinessRuleException" x:Key="in_BusinessRuleException">[BusinessRuleException]</InArgument>
                                     </ui:InvokeWorkflowFile.Arguments>
                                   </ui:InvokeWorkflowFile>
                                 </TryCatch.Try>
@@ -305,9 +305,9 @@
                           </TryCatch>
                         </State.Entry>
                         <State.Transitions>
-                          <Transition DisplayName="Error" sap2010:WorkflowViewState.IdRef="Transition_4" To="{x:Reference __ReferenceID0}" Condition="[SystemError IsNot Nothing]" />
-                          <Transition sap2010:Annotation.AnnotationText="Business Rule Exception" DisplayName="BRE" sap2010:WorkflowViewState.IdRef="Transition_1" To="{x:Reference __ReferenceID1}" Condition="[BusinessRuleException IsNot Nothing]" />
-                          <Transition sap2010:Annotation.AnnotationText="There is no need for any action in case of successful transaction.&#xA;The process should simply go to next transaction." DisplayName="Successful transaction" sap2010:WorkflowViewState.IdRef="Transition_5" To="{x:Reference __ReferenceID1}" Condition="[SystemError Is Nothing And BusinessRuleException is Nothing]" />
+                          <Transition DisplayName="System Exception" sap2010:WorkflowViewState.IdRef="Transition_4" To="{x:Reference __ReferenceID0}" Condition="[SystemException IsNot Nothing]" />
+                          <Transition sap2010:Annotation.AnnotationText="Business Rule Exception" DisplayName="Business Rule Exception" sap2010:WorkflowViewState.IdRef="Transition_1" To="{x:Reference __ReferenceID1}" Condition="[BusinessRuleException IsNot Nothing]" />
+                          <Transition sap2010:Annotation.AnnotationText="There is no need for any action in case of successful transaction.&#xA;The process should simply go to next transaction." DisplayName="Successful transaction" sap2010:WorkflowViewState.IdRef="Transition_5" To="{x:Reference __ReferenceID1}" Condition="[SystemException Is Nothing And BusinessRuleException is Nothing]" />
                         </State.Transitions>
                       </State>
                     </Transition.To>
@@ -358,15 +358,15 @@
               </State>
             </Transition.To>
             <Transition.Action>
-              <ui:Comment sap2010:WorkflowViewState.IdRef="Comment_1" Text="Default transition is picked up if there are no errors during initialization" />
+              <ui:Comment DisplayName="Comment (default transition)" sap2010:WorkflowViewState.IdRef="Comment_1" Text="Default transition is picked up if there are no errors during initialization" />
             </Transition.Action>
-            <Transition.Condition>[SystemError is Nothing]</Transition.Condition>
+            <Transition.Condition>[SystemException is Nothing]</Transition.Condition>
           </Transition>
-          <Transition DisplayName="System Error" sap2010:WorkflowViewState.IdRef="Transition_3" To="{x:Reference __ReferenceID2}">
+          <Transition DisplayName="System Exception" sap2010:WorkflowViewState.IdRef="Transition_3" To="{x:Reference __ReferenceID2}">
             <Transition.Action>
-              <ui:LogMessage DisplayName="Log Message (initialization failure)" sap2010:WorkflowViewState.IdRef="LogMessage_26" Level="Fatal" Message="[&quot;System error at initialization: &quot; + SystemError.Message + &quot; at Source: &quot; + SystemError.Source]" />
+              <ui:LogMessage DisplayName="Log Message (initialization failure)" sap2010:WorkflowViewState.IdRef="LogMessage_26" Level="Fatal" Message="[&quot;System exception at initialization: &quot; + SystemException.Message + &quot; at Source: &quot; + SystemException.Source]" />
             </Transition.Action>
-            <Transition.Condition>[SystemError isNot Nothing]</Transition.Condition>
+            <Transition.Condition>[SystemException isNot Nothing]</Transition.Condition>
           </Transition>
         </State.Transitions>
       </State>
@@ -377,33 +377,33 @@
     <x:Reference>__ReferenceID0</x:Reference>
     <StateMachine.Variables>
       <Variable x:TypeArguments="ui:QueueItem" sap2010:Annotation.AnnotationText="Transaction item to be processed. The type of this variable can be changed to match the transaction type in the process. For example, when processing data from a spreadsheet that is read into a DataTable, this type can be changed to DataRow. In another scenario, if each transactions are paths to invoice files to be processed, this type can be changed to String." Name="TransactionItem" />
-      <Variable x:TypeArguments="s:Exception" sap2010:Annotation.AnnotationText="Exception variable that is used during transitions between states." Name="SystemError" />
+      <Variable x:TypeArguments="s:Exception" sap2010:Annotation.AnnotationText="Exception variable that is used during transitions between states." Name="SystemException" />
       <Variable x:TypeArguments="ui:BusinessRuleException" sap2010:Annotation.AnnotationText="Exception variable that is used during transitions between states." Name="BusinessRuleException" />
       <Variable x:TypeArguments="x:Int32" sap2010:Annotation.AnnotationText="Sequential counter of transaction items." Default="1" Name="TransactionNumber" />
       <Variable x:TypeArguments="scg:Dictionary(x:String, x:Object)" sap2010:Annotation.AnnotationText="Dictionary structure to store configuration data. When passing configuration data between different states, it is recommended to add the data to this structure instead of creating new variables and arguments." Name="Config" />
-      <Variable x:TypeArguments="x:Int32" sap2010:Annotation.AnnotationText="This variable controls the number of attemps of retrying the process in case of System Error." Default="0" Name="RetryNumber" />
+      <Variable x:TypeArguments="x:Int32" sap2010:Annotation.AnnotationText="This variable controls the number of attemps of retrying the process in case of System Exception." Default="0" Name="RetryNumber" />
       <Variable x:TypeArguments="x:String" sap2010:Annotation.AnnotationText="Allow the optional addition of information about the transaction item." Name="TransactionField2" />
       <Variable x:TypeArguments="x:String" sap2010:Annotation.AnnotationText="Allow the optional addition of information about the transaction item." Name="TransactionField1" />
       <Variable x:TypeArguments="x:String" sap2010:Annotation.AnnotationText="Transaction ID used for information and logging purposes. Ideally, the ID should be unique for each transaction. Examples of IDs include invoice number, client number, filename, etc." Name="TransactionID" />
       <Variable x:TypeArguments="sd:DataTable" sap2010:Annotation.AnnotationText="This variable can be used in case transactions are stored in a DataTable (for example, after being retrieved from a spreadsheet)." Name="TransactionData" />
     </StateMachine.Variables>
-    <sads:DebugSymbol.Symbol>dztDOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXE1haW4ueGFtbHFQA4cDEgIBAf4CgAH+AoMBAwGsAYADtQGAA7gBAwGrAZ8BD+YCFwIBdt8BF7gCHwIBQMECF94CHwIBNFIH9AIPAgECoQET2gEeAwGBAb0CK70CSgIBf7sCF7sC/QECAXvjAivjAkcCAXrhAhfhAugBAgF44QEbsQImAgFHtAKWAbQCswECAUS1AtABtQL3AQIBQ7YCxAK2AoMDAgFCwwIb3AImAgE2VAuaARYCAQ7rAiPrAjsCAQvpAg/pAp0BAgEK8QIj8QI+AgEI7wIP7wKQAgIBBKUBFaUBiwEDAagBpgEV2QEaAwGCAbsCoQG7AvoBAgF84QKlAeEC5QECAXnjAR/yASoCAWuVAh+vAioCAVL6ASOBAiwCAU2JAiOQAiwCAUjFAh/JAjcCAT7RAiPYAi4CATdWD4cBGgIBFI8BE5YBHAIBD+8ClwHvAo0CAgEFpQF6pQGIAQMBqQGmASOmATEDAYMBqAEZsgEkAwGhAbUBGdcBJAMBhQHkASHrASoCAXLsASHxATkCAWyXAiOjAjsCAVerAierAqoCAgFT/wFe/wFpAgFQ/AFf/AF2AgFOjgJRjgJcAgFLiwJSiwJfAgFJxQLcAcUCgQICAT/SAiXSAqgCAgE60wIl1wI9AgE4VxFeGgIBMF8RgQEWAgEZggERhgEpAgEVlAFBlAFMAgESkQFCkQFPAgEQqQEbqQHLAQMBpgGqARuxASQDAaIBtwEdwQE1AwGRAckBIdMBLAMBhgHpAVzpAWUCAXXmAV3mAXQCAXPvAXjvAYABAgFw7gFr7gF8AgFu7AHRAewB3wECAW2aAmiaAnUCAWmbAn+bApYBAgFnoAJroAJ+AgFlnwJrnwJ+AgFjnQJnnQJ0AgFhmQJ6mQKCAQIBX5wCbZwCfgIBXZ4CbZ4CgAECAVuhAmehAnYCAVmXAuABlwKFAgIBWKsCuQGrAqcCAgFU0gKyAdICpQICATvTAuwB0wKNAgIBOVw/XEgCATNZQFlNAgExX5sBX7ABAgEaYRV/IAIBHIQBaIQBcAIBF4IBzQGCAfEBAgEWqQGiAakByAEDAacBrwFKrwFTAwGlAawBS6wBXAMBowG9AWe9AXoDAZ8BvAFnvAF6AwGdAb4BY74BcgMBmwG7AWm7AXoDAZkBuQFkuQF3AwGXAboBdLoBfAMBlQG/AWq/AXsDAZMBtwHYAbcB+wEDAZIBygEjygHcAgMBiwHLASPSASwDAYcBYhdoLwIBKmkXdBwCASJ1F3kvAgEgehd+KQIBHcoBsAHKAdkCAwGMAdABUtABWwMBigHNAVPNAWQDAYgBZnBmeAIBLmLPAWLvAQIBLWVcZXcCASxkWGRoAgEraZ8CadUCAgEjaxtyJAIBJXWLBHWsBAIBIXxjfJABAgEecEZwYAIBKG1HbWgCASY=</sads:DebugSymbol.Symbol>
+    <sads:DebugSymbol.Symbol>dztDOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXE1haW4ueGFtbHFQA4cDEgIBAf4CgAH+AoMBAwGsAYADuQGAA7wBAwGrAZ8BD+YCFwIBdt8BF7gCHwIBQMECF94CHwIBNFIH9AIPAgECoQET2gEeAwGBAb0CK70CSgIBf7sCF7sC/QECAXvjAivjAkcCAXrhAhfhAugBAgF44QEbsQImAgFHtAKhAbQCwgECAUS1AuQBtQKLAgIBQ7YCxAK2AocDAgFCwwIb3AImAgE2VAuaARYCAQ7rAiPrAj8CAQvpAg/pAsgBAgEK8QIj8QJCAgEI7wIP7wKcAgIBBKUBFaUBiwEDAagBpgEV2QEaAwGCAbsCoQG7AvoBAgF84QKlAeEC5QECAXnjAR/yASoCAWuVAh+vAioCAVL6ASOBAiwCAU2JAiOQAiwCAUjFAh/JAjcCAT7RAiPYAi4CATdWD4cBGgIBFI8BE5YBHAIBD+8ClwHvApkCAgEFpQF6pQGIAQMBqQGmASOmATEDAYMBqAEZsgEkAwGhAbUBGdcBJAMBhQHkASHrASoCAXLsASHxATkCAWyXAiOjAjsCAVerAierAqoCAgFT/wFe/wFpAgFQ/AFf/AF2AgFOjgJRjgJcAgFLiwJSiwJjAgFJxQLcAcUCgQICAT/SAiXSAqgCAgE60wIl1wI9AgE4VxFeGgIBMF8RgQEWAgEZggERhgEpAgEVlAFBlAFMAgESkQFCkQFTAgEQqQEbqQHLAQMBpgGqARuxASQDAaIBtwEdwQE1AwGRAckBIdMBLAMBhgHpAVzpAWUCAXXmAV3mAXQCAXPvAXjvAYABAgFw7gFr7gF8AgFu7AHRAewB3wECAW2hAn+hApYBAgFpngJrngJ+AgFnnQJrnQJ+AgFlmwJnmwJ0AgFjoAJsoAJ9AgFhmQJ6mQKCAQIBX5oCbZoCfgIBXZwCbZwCgAECAVufAmefAnYCAVmXAuABlwKFAgIBWKsCuQGrAqcCAgFU0gKyAdICpQICATvTAuwB0wKNAgIBOVw/XEgCATNZQFlRAgExX5sBX7ABAgEaYRV/IAIBHIQBaIQBcAIBF4IBzQGCAfEBAgEWqQGiAakByAEDAacBrwFKrwFTAwGlAawBS6wBXAMBowG9AWe9AXoDAZ8BvAFnvAF6AwGdAb4BY74BcgMBmwG7AWm7AXoDAZkBuQFkuQF3AwGXAboBdLoBfAMBlQG/AWq/AXsDAZMBtwHYAbcB+wEDAZIBygEjygHcAgMBiwHLASPSASwDAYcBYhdoLwIBKmkXdBwCASJ1F3kvAgEgehd+KQIBHcoBsAHKAdkCAwGMAdABUtABWwMBigHNAVPNAWQDAYgBZnBmeAIBLmLPAWLvAQIBLWVcZXcCASxkWGRoAgEraaICadgCAgEjaxtyJAIBJXWLBHWsBAIBIXxjfJABAgEecEZwYAIBKG1HbWgCASY=</sads:DebugSymbol.Symbol>
   </StateMachine>
   <sap2010:WorkflowViewState.ViewStateManager>
     <sap2010:ViewStateManager>
-      <sap2010:ViewStateData Id="Assign_5" sap:VirtualizedContainerService.HintSize="464,60" />
-      <sap2010:ViewStateData Id="InvokeWorkflowFile_12" sap:VirtualizedContainerService.HintSize="314,87" />
-      <sap2010:ViewStateData Id="Assign_20" sap:VirtualizedContainerService.HintSize="242,62" />
-      <sap2010:ViewStateData Id="If_10" sap:VirtualizedContainerService.HintSize="314,198">
+      <sap2010:ViewStateData Id="Assign_5" sap:VirtualizedContainerService.HintSize="611,60" />
+      <sap2010:ViewStateData Id="InvokeWorkflowFile_12" sap:VirtualizedContainerService.HintSize="464,87" />
+      <sap2010:ViewStateData Id="Assign_20" sap:VirtualizedContainerService.HintSize="242,60" />
+      <sap2010:ViewStateData Id="If_10" sap:VirtualizedContainerService.HintSize="464,280">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
-            <x:Boolean x:Key="IsExpanded">False</x:Boolean>
+            <x:Boolean x:Key="IsExpanded">True</x:Boolean>
             <x:Boolean x:Key="IsPinned">False</x:Boolean>
             <x:Boolean x:Key="IsAnnotationDocked">True</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="InvokeWorkflowFile_19" sap:VirtualizedContainerService.HintSize="314,213">
+      <sap2010:ViewStateData Id="InvokeWorkflowFile_19" sap:VirtualizedContainerService.HintSize="464,213">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsAnnotationDocked">True</x:Boolean>
@@ -419,14 +419,14 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Sequence_17" sap:VirtualizedContainerService.HintSize="336,881">
+      <sap2010:ViewStateData Id="Sequence_17" sap:VirtualizedContainerService.HintSize="486,963">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="If_1" sap:VirtualizedContainerService.HintSize="464,1071">
+      <sap2010:ViewStateData Id="If_1" sap:VirtualizedContainerService.HintSize="611,1138">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -436,7 +436,7 @@
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
       <sap2010:ViewStateData Id="InvokeWorkflowFile_5" sap:VirtualizedContainerService.HintSize="464,87" />
-      <sap2010:ViewStateData Id="Sequence_4" sap:VirtualizedContainerService.HintSize="486,1422">
+      <sap2010:ViewStateData Id="Sequence_4" sap:VirtualizedContainerService.HintSize="633,1489">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -444,22 +444,22 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Assign_21" sap:VirtualizedContainerService.HintSize="242,132">
+      <sap2010:ViewStateData Id="Assign_21" sap:VirtualizedContainerService.HintSize="242,87">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsAnnotationDocked">True</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Catch`1_3" sap:VirtualizedContainerService.HintSize="400,201">
+      <sap2010:ViewStateData Id="Catch`1_3" sap:VirtualizedContainerService.HintSize="400,21">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
-            <x:Boolean x:Key="IsExpanded">True</x:Boolean>
+            <x:Boolean x:Key="IsExpanded">False</x:Boolean>
             <x:Boolean x:Key="IsPinned">False</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="TryCatch_2" sap:VirtualizedContainerService.HintSize="414,363">
+      <sap2010:ViewStateData Id="TryCatch_2" sap:VirtualizedContainerService.HintSize="651,1716">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -467,7 +467,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="ShouldStop_2" sap:VirtualizedContainerService.HintSize="779,22" />
+      <sap2010:ViewStateData Id="ShouldStop_2" sap:VirtualizedContainerService.HintSize="775,22" />
       <sap2010:ViewStateData Id="LogMessage_27" sap:VirtualizedContainerService.HintSize="314,91" />
       <sap2010:ViewStateData Id="Assign_22" sap:VirtualizedContainerService.HintSize="314,60" />
       <sap2010:ViewStateData Id="Sequence_23" sap:VirtualizedContainerService.HintSize="336,315">
@@ -489,15 +489,15 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Catch`1_8" sap:VirtualizedContainerService.HintSize="404,21">
+      <sap2010:ViewStateData Id="Catch`1_8" sap:VirtualizedContainerService.HintSize="400,386">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
-            <x:Boolean x:Key="IsExpanded">False</x:Boolean>
+            <x:Boolean x:Key="IsExpanded">True</x:Boolean>
             <x:Boolean x:Key="IsPinned">False</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="TryCatch_7" sap:VirtualizedContainerService.HintSize="418,314">
+      <sap2010:ViewStateData Id="TryCatch_7" sap:VirtualizedContainerService.HintSize="414,548">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -505,8 +505,8 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="If_11" sap:VirtualizedContainerService.HintSize="779,463" />
-      <sap2010:ViewStateData Id="Sequence_25" sap:VirtualizedContainerService.HintSize="200,258">
+      <sap2010:ViewStateData Id="If_11" sap:VirtualizedContainerService.HintSize="775,696" />
+      <sap2010:ViewStateData Id="Sequence_25" sap:VirtualizedContainerService.HintSize="797,954">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">False</x:Boolean>
@@ -525,7 +525,7 @@
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
       <sap2010:ViewStateData Id="Assign_26" sap:VirtualizedContainerService.HintSize="242,60" />
-      <sap2010:ViewStateData Id="Catch`1_9" sap:VirtualizedContainerService.HintSize="404,21">
+      <sap2010:ViewStateData Id="Catch`1_9" sap:VirtualizedContainerService.HintSize="422,21">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">False</x:Boolean>
@@ -534,7 +534,7 @@
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
       <sap2010:ViewStateData Id="Assign_27" sap:VirtualizedContainerService.HintSize="242,60" />
-      <sap2010:ViewStateData Id="Catch`1_10" sap:VirtualizedContainerService.HintSize="404,21">
+      <sap2010:ViewStateData Id="Catch`1_10" sap:VirtualizedContainerService.HintSize="422,21">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">False</x:Boolean>
@@ -542,9 +542,9 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="InvokeWorkflowFile_25" sap:VirtualizedContainerService.HintSize="314,86.6666666666667" />
-      <sap2010:ViewStateData Id="LogMessage_32" sap:VirtualizedContainerService.HintSize="314,94.6666666666667" />
-      <sap2010:ViewStateData Id="Catch`1_11" sap:VirtualizedContainerService.HintSize="404.666666666667,22">
+      <sap2010:ViewStateData Id="InvokeWorkflowFile_25" sap:VirtualizedContainerService.HintSize="314,87" />
+      <sap2010:ViewStateData Id="LogMessage_32" sap:VirtualizedContainerService.HintSize="314,91" />
+      <sap2010:ViewStateData Id="Catch`1_11" sap:VirtualizedContainerService.HintSize="404,21">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">False</x:Boolean>
@@ -552,8 +552,8 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="TryCatch_8" sap:VirtualizedContainerService.HintSize="418.666666666667,324.666666666667" />
-      <sap2010:ViewStateData Id="TryCatch_9" sap:VirtualizedContainerService.HintSize="418,560">
+      <sap2010:ViewStateData Id="TryCatch_8" sap:VirtualizedContainerService.HintSize="418,354" />
+      <sap2010:ViewStateData Id="TryCatch_9" sap:VirtualizedContainerService.HintSize="436,643">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -574,7 +574,7 @@
       <sap2010:ViewStateData Id="Transition_1" sap:VirtualizedContainerService.HintSize="430,532">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
-            <av:PointCollection x:Key="ConnectorLocation">401.05,637 401.05,667 611,667 611,247.6 505.5,247.6</av:PointCollection>
+            <av:PointCollection x:Key="ConnectorLocation">401.05,637 401.05,664 608,664 608,247.6 505.5,247.6</av:PointCollection>
             <x:Int32 x:Key="SrcConnectionPointIndex">43</x:Int32>
             <x:Int32 x:Key="DestConnectionPointIndex">20</x:Int32>
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -585,7 +585,7 @@
       <sap2010:ViewStateData Id="Transition_5" sap:VirtualizedContainerService.HintSize="430,547">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
-            <av:PointCollection x:Key="ConnectorLocation">443.25,637 443.25,652.4 535.5,652.4 535.5,292.4 505.5,292.4</av:PointCollection>
+            <av:PointCollection x:Key="ConnectorLocation">443.25,637 443.25,663 535,663 535,292.4 505.5,292.4</av:PointCollection>
             <x:Int32 x:Key="SrcConnectionPointIndex">59</x:Int32>
             <x:Int32 x:Key="DestConnectionPointIndex">52</x:Int32>
             <x:Boolean x:Key="IsAnnotationDocked">True</x:Boolean>
@@ -651,7 +651,7 @@
       <sap2010:ViewStateData Id="Transition_7" sap:VirtualizedContainerService.HintSize="429.6,969.6">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
-            <av:PointCollection x:Key="ConnectorLocation">390,326 390,374 135,374 135,342.5</av:PointCollection>
+            <av:PointCollection x:Key="ConnectorLocation">390,326 390,356 135,356 135,342.5</av:PointCollection>
             <x:Int32 x:Key="SrcConnectionPointIndex">39</x:Int32>
             <x:Int32 x:Key="DestConnectionPointIndex">39</x:Int32>
             <x:Boolean x:Key="IsAnnotationDocked">True</x:Boolean>
@@ -677,13 +677,13 @@
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Int32 x:Key="SrcConnectionPointIndex">39</x:Int32>
             <x:Int32 x:Key="DestConnectionPointIndex">38</x:Int32>
-            <av:PointCollection x:Key="ConnectorLocation">391.5,111.5 391.5,141.5 390,141.5 390,214</av:PointCollection>
+            <av:PointCollection x:Key="ConnectorLocation">391.5,111.5 391.5,143 390,143 390,214</av:PointCollection>
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
       <sap2010:ViewStateData Id="LogMessage_26" sap:VirtualizedContainerService.HintSize="314,91" />
-      <sap2010:ViewStateData Id="Transition_3" sap:VirtualizedContainerService.HintSize="429.6,802.4">
+      <sap2010:ViewStateData Id="Transition_3" sap:VirtualizedContainerService.HintSize="430,796">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <av:PointCollection x:Key="ConnectorLocation">391.5,111.5 391.5,141.5 128.8,141.5 128.8,208.5</av:PointCollection>
@@ -693,7 +693,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="State_2" sap:VirtualizedContainerService.HintSize="234,103">
+      <sap2010:ViewStateData Id="State_2" sap:VirtualizedContainerService.HintSize="677,2132">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <av:Point x:Key="ShapeLocation">274.5,8.5</av:Point>
@@ -717,7 +717,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Main2_1" sap:VirtualizedContainerService.HintSize="826,976" />
+      <sap2010:ViewStateData Id="Main2_1" sap:VirtualizedContainerService.HintSize="826,896" />
     </sap2010:ViewStateManager>
   </sap2010:WorkflowViewState.ViewStateManager>
 </Activity>
\ No newline at end of file
diff --git a/Process.xaml b/Process.xaml
index d377689..10d4da5 100644
--- a/Process.xaml
+++ b/Process.xaml
@@ -65,10 +65,14 @@
       <AssemblyReference>System.Runtime.WindowsRuntime</AssemblyReference>
     </sco:Collection>
   </TextExpression.ReferencesForImplementation>
-  <Sequence sap2010:Annotation.AnnotationText="Invoke major steps of the business process, which are usually implemented by different workflows.&#xA;&#xA;If a BusinessRuleException is thrown, the transaction will be skipped. &#xA;If another kind of exception (ApplicationException) occurs, the current transaction can be retried. " DisplayName="Process" sap2010:WorkflowViewState.IdRef="Sequence_1" sads:DebugSymbol.Symbol="dz5DOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXFByb2Nlc3MueGFtbAFEA0TFAwIBAQ==" />
+  <Sequence sap2010:Annotation.AnnotationText="Invoke major steps of the business process, which are usually implemented by different workflows.&#xA;&#xA;If a BusinessRuleException is thrown, the transaction will be skipped. &#xA;If another kind of exception (ApplicationException) occurs, the current transaction can be retried. " DisplayName="Process" sap2010:WorkflowViewState.IdRef="Sequence_1">
+    <ui:Comment DisplayName="Comment (placeholder)" sap2010:WorkflowViewState.IdRef="Comment_1" Text="//  Invoke steps of the process" />
+    <sads:DebugSymbol.Symbol>dz5DOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXFByb2Nlc3MueGFtbAJEA0cOAgEBRQVFigECAQI=</sads:DebugSymbol.Symbol>
+  </Sequence>
   <sap2010:WorkflowViewState.ViewStateManager>
     <sap2010:ViewStateManager>
-      <sap2010:ViewStateData Id="Sequence_1" sap:VirtualizedContainerService.HintSize="200,291">
+      <sap2010:ViewStateData Id="Comment_1" sap:VirtualizedContainerService.HintSize="314,55" />
+      <sap2010:ViewStateData Id="Sequence_1" sap:VirtualizedContainerService.HintSize="336,296">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -76,7 +80,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="ProcessTransaction_1" sap:VirtualizedContainerService.HintSize="240,531" />
+      <sap2010:ViewStateData Id="ProcessTransaction_1" sap:VirtualizedContainerService.HintSize="376,376" />
     </sap2010:ViewStateManager>
   </sap2010:WorkflowViewState.ViewStateManager>
 </Activity>
\ No newline at end of file
diff --git a/README.md b/README.md
index 30c7e1a..91f5163 100644
--- a/README.md
+++ b/README.md
@@ -1,50 +1,40 @@
 ### Documentation is included in the Documentation folder ###
 
-[ReFrameWork Documentation](https://github.com/UiPath/ReFrameWork/blob/master/Documentation/REFramework%20documentation.pdf)
+[REFrameWork Documentation](https://github.com/UiPath/ReFrameWork/blob/master/Documentation/REFramework%20documentation.pdf)
 
-### ReFrameWork Template ###
+### REFrameWork Template ###
 **Robotic Enterprise Framework**
 
-* built on top of *Transactional Business Process* template
-* using *State Machine* layout for the phases of automation project
-* offering high level exception handling and application recovery
-* keeps external settings in *Config.xlsx* file and Orchestrator assets
-* pulls credentials from *Credential Manager* and Orchestrator assets
-* gets transaction data from Orchestrator queue and updates back status
-* takes screenshots in case of application exceptions
-* provides extra utility workflows like sending a templated email
-* runs sample Notepad application with dummy Excel input data
-* 
+* Built on top of *Transactional Business Process* template
+* Uses *State Machine* layout for the phases of automation project
+* Offers high level logging, exception handling and recovery
+* Keeps external settings in *Config.xlsx* file and Orchestrator assets
+* Pulls credentials from Orchestrator assets and *Windows Credential Manager*
+* Gets transaction data from Orchestrator queue and updates back status
+* Takes screenshots in case of system exceptions
 
 
 ### How It Works ###
 
 1. **INITIALIZE PROCESS**
- + *InitiAllSettings* - Load config data from file and from assets
- + *InitiAllApplications* - Login to applications as per Config("OpenApps") field
-   + *GetAppCredentials* - From Orchestrator assets or local Credential Manager
- + If failing, retry a few times as per Config("ProcessRetries")
+ + ./Framework/*InitiAllSettings* - Load configuration data from Config.xlsx file and from assets
+ + ./Framework/*GetAppCredential* - Retrieve credentials from Orchestrator assets or local Windows Credential Manager
+ + ./Framework/*InitiAllApplications* - Open and login to applications used throughout the process
 
 2. **GET TRANSACTION DATA**
-   + ./Framework/*GetTransactionData* - Fetches from Orchestrator queue as per Config("TransactionQueue")
-   + ./*GetTransactionData* - Sample for working with Excel input files
+ + ./Framework/*GetTransactionData* - Fetches transactions from an Orchestrator queue defined by Config("OrchestratorQueueName") or any other configured data source
 
 3. **PROCESS TRANSACTION**
- + Try *ProcessTransaction*
- + If application exceptions happen
-   + *SaveErrorScreen* - In Config("ErrorsFolder") with the exception message
-   + Going to re/INITIALIZE
- + *SetTransactionStatus* - As Success, Failed or Rejected with reason
-   + ./Framework/*SetTransactionStatus* - Updates the Orchestrator queue item
-   + ./*SetTransactionStatus* - Sample for updating Excel input file
+ + *Process* - Process trasaction and invoke other workflows related to the process being automated 
+ + ./Framework/*SetTransactionStatus* - Updates the status of the processed transaction (Orchestrator transactions by default): Success, Business Rule Exception or System Exception
 
 4. **END PROCESS**
- + *CloseAllApplications* - As listed in Config("CloseApps")
+ + ./Framework/*CloseAllApplications* - Logs out and closes applications used throughout the process
 
 
 ### For New Project ###
 
-1. Check out the Config.xlsx file and add/customize any required fields and values
-2. Implement OpenApp and CloseApp workflows, linking them in the Config.xlsx fields
-3. Implement GetTransactionData and SetTransactionStatus or use ./Framework versions for Orchestrator queues
-4. Implement ProcessTransaction workflow and any invoked others
+1. Check the Config.xlsx file and add/customize any required fields and values
+2. Implement InitiAllApplications.xaml and CloseAllApplicatoins.xaml workflows, linking them in the Config.xlsx fields
+3. Implement GetTransactionData.xaml and SetTransactionStatus.xaml according to the transaction type being used (Orchestrator queues by default)
+4. Implement Process.xaml workflow and invoke other workflows related to the process being automated
diff --git a/Tests/RunAllTests.xaml b/Tests/RunAllTests.xaml
index d06091d..e4e0e02 100644
--- a/Tests/RunAllTests.xaml
+++ b/Tests/RunAllTests.xaml
@@ -70,13 +70,6 @@
     </sco:Collection>
   </TextExpression.ReferencesForImplementation>
   <Sequence sap2010:Annotation.AnnotationText="Run all tests defined in _Tests.xlsx and log their results.&#xA;All tests are invoked in the same order they are defined in the Excel file, and this can affect their output." DisplayName="Run All Tests" sap2010:WorkflowViewState.IdRef="Sequence_2">
-    <Sequence.Variables>
-      <Variable x:TypeArguments="sd:DataTable" Name="dt_Tests" />
-      <Variable x:TypeArguments="x:Int32" Default="0" Name="TestCounter" />
-      <Variable x:TypeArguments="x:Int32" Default="0" Name="FailedTestsCounter" />
-      <Variable x:TypeArguments="x:Int32" Default="0" Name="PassedTestsCounter" />
-      <Variable x:TypeArguments="s:DateTime" Default="[now]" Name="StartTime" />
-    </Sequence.Variables>
     <If Condition="[Not File.Exists(in_TestLogFile)]" DisplayName="If log file does not exist, create it" sap2010:WorkflowViewState.IdRef="If_4">
       <If.Then>
         <ui:CreateFile Name="{x:Null}" ContinueOnError="True" DisplayName="Create Log file" sap2010:WorkflowViewState.IdRef="CreateFile_1" Path="[in_TestLogFile]" />
@@ -233,7 +226,7 @@
         </ActivityAction>
       </ui:ExcelApplicationScope.Body>
     </ui:ExcelApplicationScope>
-    <sads:DebugSymbol.Symbol>d1FDOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXFRlc3RfRnJhbWV3b3JrXFJ1bkFsbFRlc3RzLnhhbWxqAWEBcwECSAPtAQ4CAQFLM0s2AgEFTDNMNgIBBE0zTTYCAQNONk49AgECUAVUCgMBhwFVBesBIAIBBlATUDYDAYgBUglSpgEDAYkBVaABVbMBAwGGAVsL6AEWAgEHUjhSPgMBjAFSkQFSowEDAYoBYDtgPgIBC2E7YT4CAQpiPmJFAgEJYztjPgIBCGUNayEDAYEBbA1s7QECAX1tDW2oAgIBeW4Nbs4BAgF1bw1vqQICAXFwDXCtAgIBbXEN2wEdAgEg3AEN3AHMAQIBG90BDd0BugECARfeAQ3eAZcDAgET3wEN5wEiAgEMZTxlRQMBhAFoE2hCAwGDAWWsAWWzAQMBggFslQFs6gEDAYABbE1sXwIBfm2dAW2lAgIBfG1VbWcCAXpumAFuywECAXhuUG5iAgF2b5gBb6ABAgF0b6sBb7QBAgFycJgBcKIBAgFwcK0BcLYBAgFucSZxLwIBa3cT2AEeAgEh3AHFAdwByQECAR/cAT3cAUYCAR3cAa8B3AG3AQIBHN0BlQHdAbcBAgEa3QFN3QFfAgEY3gGRAd4BlAMCARbeAUneAVsCARTfAeYC3wGzAwIBEt8BvgPfAcQDAgER3wHOAd8B1AECARDfAasB3wG9AQIBDt8BhwLfAagCAgENeReWASICAVDFARfWASICAUeeARurATMCATSzARvAATMCASJ6GYEBIgIBZoIBGYIBywECAWODARmHATECAWGIARmVATECAVHGARnNASICAUzOARnVASICAUimAWKmAYABAgFGowFdowFtAgFEqQFcqQFqAgFCoAFmoAF6AgFApAFapAFmAgE+ogFmogF6AgE8pQFhpQF8AgE7qAFfqAFkAgE6pwFepwFpAgE4oQFcoQFpAgE2ngHeAZ4B/gECATW7AWK7AYABAgEzuAFduAFtAgExvgFcvgFqAgEvtQFmtQF6AgEtuQFauQFmAgErtwFmtwF6AgEpugFhugF8AgEovQFfvQFiAgEnvAFevAFpAgEmtgFctgFpAgEkswHMAbMB7AECASN/Q39SAgFpfER8UQIBZ4IBlQGCAcgBAgFkgwHBAYMB6wECAWKQAWCQAX4CAWCMAVuMAWsCAV6TAVqTAWgCAVyOAWSOAXgCAVqLAWSLAXgCAViPAV+PAXoCAVeSAV2SAWQCAVaRAVyRAWUCAVWKAVqKAWcCAVOIAc4BiAHuAQIBUssBRMsBUAIBTsgBRcgBVAIBTdMBRNMBUgIBStABRdABVgIBSQ==</sads:DebugSymbol.Symbol>
+    <sads:DebugSymbol.Symbol>d0hDOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXFRlc3RzXFJ1bkFsbFRlc3RzLnhhbWxmAWEBcwECSAPmAQ4CAQFJBU0KAwGDAU4F5AEgAgECSRNJNgMBhAFLCUumAQMBhQFOoAFOswEDAYIBVAvhARYCAQNLOEs+AwGIAUuRAUujAQMBhgFZO1k+AgEHWjtaPgIBBls+W0UCAQVcO1w+AgEEXg1kIQIBfWUNZe0BAgF5Zg1mqAICAXVnDWfOAQIBcWgNaKkCAgFtaQ1prQICAWlqDdQBHQIBHNUBDdUBzAECARfWAQ3WAboBAgET1wEN1wGXAwIBD9gBDeABIgIBCF48XkUDAYABYRNhQgIBf16sAV6zAQIBfmWVAWXqAQIBfGVNZV8CAXpmnQFmpQICAXhmVWZnAgF2Z5gBZ8sBAgF0Z1BnYgIBcmiYAWigAQIBcGirAWi0AQIBbmmYAWmiAQIBbGmtAWm2AQIBamomai8CAWdwE9EBHgIBHdUBxQHVAckBAgEb1QE91QFGAgEZ1QGvAdUBtwECARjWAZUB1gG3AQIBFtYBTdYBXwIBFNcBkQHXAZQDAgES1wFJ1wFbAgEQ2AHmAtgBswMCAQ7YAb4D2AHEAwIBDdgBzgHYAdQBAgEM2AGrAdgBvQECAQrYAYcC2AGoAgIBCXIXjwEiAgFMvgEXzwEiAgFDlwEbpAEzAgEwrAEbuQEzAgEecxl6IgIBYnsZe8sBAgFffBmAATECAV2BARmOATECAU2/ARnGASICAUjHARnOASICAUSfAWKfAYABAgFCnAFdnAFtAgFAogFcogFqAgE+mQFmmQF6AgE8nQFanQFmAgE6mwFmmwF6AgE4ngFhngF8AgE3oQFfoQFkAgE2oAFeoAFpAgE0mgFcmgFpAgEylwHeAZcB/gECATG0AWK0AYABAgEvsQFdsQFtAgEttwFctwFqAgErrgFmrgF6AgEpsgFasgFmAgEnsAFmsAF6AgElswFhswF8AgEktgFftgFiAgEjtQFetQFpAgEirwFcrwFpAgEgrAHMAawB7AECAR94Q3hSAgFldUR1UQIBY3uVAXvIAQIBYHzBAXzrAQIBXokBYIkBfgIBXIUBW4UBawIBWowBWowBaAIBWIcBZIcBeAIBVoQBZIQBeAIBVIgBX4gBegIBU4sBXYsBZAIBUooBXIoBZQIBUYMBWoMBZwIBT4EBzgGBAe4BAgFOxAFExAFQAgFKwQFFwQFUAgFJzAFEzAFSAgFGyQFFyQFWAgFF</sads:DebugSymbol.Symbol>
   </Sequence>
   <sap2010:WorkflowViewState.ViewStateManager>
     <sap2010:ViewStateManager>
@@ -283,14 +276,14 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="TryCatch_2" sap:VirtualizedContainerService.HintSize="418,560">
+      <sap2010:ViewStateData Id="TryCatch_2" sap:VirtualizedContainerService.HintSize="418,845">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsAnnotationDocked">True</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="ForEachRow_2" sap:VirtualizedContainerService.HintSize="448,707">
+      <sap2010:ViewStateData Id="ForEachRow_2" sap:VirtualizedContainerService.HintSize="448,992">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -310,15 +303,15 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="Sequence_15" sap:VirtualizedContainerService.HintSize="470,2006">
+      <sap2010:ViewStateData Id="Sequence_15" sap:VirtualizedContainerService.HintSize="470,2291">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="ExcelApplicationScope_2" sap:VirtualizedContainerService.HintSize="484,2115" />
-      <sap2010:ViewStateData Id="Sequence_2" sap:VirtualizedContainerService.HintSize="506,2544">
+      <sap2010:ViewStateData Id="ExcelApplicationScope_2" sap:VirtualizedContainerService.HintSize="484,2400" />
+      <sap2010:ViewStateData Id="Sequence_2" sap:VirtualizedContainerService.HintSize="506,2829">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
             <x:Boolean x:Key="IsExpanded">True</x:Boolean>
@@ -326,7 +319,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="RunAllTests_1" sap:VirtualizedContainerService.HintSize="546,2624" />
+      <sap2010:ViewStateData Id="RunAllTests_1" sap:VirtualizedContainerService.HintSize="546,2909" />
     </sap2010:ViewStateManager>
   </sap2010:WorkflowViewState.ViewStateManager>
 </Activity>
\ No newline at end of file
diff --git a/Tests/RunAllTests_Logging.xaml b/Tests/RunAllTests_Logging.xaml
index 4e3f55c..4808d0a 100644
--- a/Tests/RunAllTests_Logging.xaml
+++ b/Tests/RunAllTests_Logging.xaml
@@ -14,7 +14,7 @@
     <x:Property sap2010:Annotation.AnnotationText="Overall counter for tests." Name="in_TestCounter" Type="InArgument(x:Int32)" />
     <x:Property sap2010:Annotation.AnnotationText="Counter for tests that failed." Name="io_FailedTestsCounter" Type="InOutArgument(x:Int32)" />
     <x:Property sap2010:Annotation.AnnotationText="Filepath to which logs about tests should be written." Name="in_TestLogFile" Type="InArgument(x:String)" />
-    <x:Property sap2010:Annotation.AnnotationText="Status of the test to be written to the report." Name="out_Status" Type="InArgument(x:String)" />
+    <x:Property sap2010:Annotation.AnnotationText="Status of the test to be written to the report." Name="out_Status" Type="OutArgument(x:String)" />
     <x:Property sap2010:Annotation.AnnotationText="Counter for tests that succeeded." Name="io_PassedTestsCounter" Type="InOutArgument(x:Int32)" />
     <x:Property sap2010:Annotation.AnnotationText="Expected outcome of the test. It can be &quot;Success&quot;, &quot;AppEx&quot; or &quot;BRE&quot;." Name="in_ExpectedOutcome" Type="InArgument(x:String)" />
     <x:Property sap2010:Annotation.AnnotationText="Filename of the workflow that implements a test." Name="in_WorkflowFilename" Type="InArgument(x:String)" />
@@ -75,7 +75,7 @@
     </sco:Collection>
   </TextExpression.ReferencesForImplementation>
   <Sequence sap2010:Annotation.AnnotationText="Log the result of running the test, based on the type of test and its outcome." DisplayName="Run All Tests - Logging" sap2010:WorkflowViewState.IdRef="Sequence_3">
-    <If Condition="[in_ExpectedOutcome = in_ActualOutcome]" DisplayName="If" sap2010:WorkflowViewState.IdRef="If_1">
+    <If Condition="[in_ExpectedOutcome = in_ActualOutcome]" DisplayName="If outcome is the expected one" sap2010:WorkflowViewState.IdRef="If_1">
       <If.Then>
         <Sequence DisplayName="Test passed" sap2010:WorkflowViewState.IdRef="Sequence_1">
           <Assign DisplayName="Assign io_PassedTestsCounter" sap2010:WorkflowViewState.IdRef="Assign_1">
@@ -145,12 +145,12 @@
         </Sequence>
       </If.Else>
     </If>
-    <sads:DebugSymbol.Symbol>d1lDOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXFRlc3RfRnJhbWV3b3JrXFJ1bkFsbFRlc3RzX0xvZ2dpbmcueGFtbCJNA5UBDgIBAU4FkwEKAgECThNOPAIBA1AJYhQCASdlCZEBFAIBBlELWBQCATBZC1mXAgIBLFoLYRQCAShmC20UAgEibgtuyQICAR5vC3YUAgEadwuQARQCAQdWNVZOAgEzUzZTTQIBMVmLAVmUAgIBL1lEWVYCAS1fNl86AgErXDdcQwIBKWs1a04CASVoNmhNAgEjbosBbsYCAgEhbkRuVgIBH3Q2dDoCAR1xN3FDAgEbd2V3ewIBCHgNfxYCARSAAQ2HARYCAQ6IAQ2PARYCAQp9OH15AgEXejl6RwIBFYUBOIUBewIBEYIBOYIBRwIBD40BOI0BTAIBDYoBOYoBRwIBCw==</sads:DebugSymbol.Symbol>
+    <sads:DebugSymbol.Symbol>d1BDOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXFRlc3RzXFJ1bkFsbFRlc3RzX0xvZ2dpbmcueGFtbCJNA5UBDgIBAU4FkwEKAgECThNOPAIBA1AJYhQCASdlCZEBFAIBBlELWBQCATBZC1mXAgIBLFoLYRQCAShmC20UAgEibgtuyQICAR5vC3YUAgEadwuQARQCAQdWNVZOAgEzUzZTTQIBMVmLAVmUAgIBL1lEWVYCAS1fNl86AgErXDdcQwIBKWs1a04CASVoNmhNAgEjbosBbsYCAgEhbkRuVgIBH3Q2dDoCAR1xN3FDAgEbd2V3ewIBCHgNfxYCARSAAQ2HARYCAQ6IAQ2PARYCAQp9OH15AgEXejl6RwIBFYUBOIUBewIBEYIBOYIBRwIBD40BOI0BTAIBDYoBOYoBRwIBCw==</sads:DebugSymbol.Symbol>
   </Sequence>
   <sap2010:WorkflowViewState.ViewStateManager>
     <sap2010:ViewStateManager>
       <sap2010:ViewStateData Id="Assign_1" sap:VirtualizedContainerService.HintSize="314,60" />
-      <sap2010:ViewStateData Id="AppendLine_1" sap:VirtualizedContainerService.HintSize="314,86.6666666666667" />
+      <sap2010:ViewStateData Id="AppendLine_1" sap:VirtualizedContainerService.HintSize="314,87" />
       <sap2010:ViewStateData Id="Assign_2" sap:VirtualizedContainerService.HintSize="314,62" />
       <sap2010:ViewStateData Id="Sequence_1" sap:VirtualizedContainerService.HintSize="336,413">
         <sap:WorkflowViewStateService.ViewState>
@@ -196,7 +196,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="RunAllTests_Logging_1" sap:VirtualizedContainerService.HintSize="759,925" />
+      <sap2010:ViewStateData Id="RunAllTests_Logging_1" sap:VirtualizedContainerService.HintSize="759,885" />
     </sap2010:ViewStateManager>
   </sap2010:WorkflowViewState.ViewStateManager>
 </Activity>
\ No newline at end of file
diff --git a/Tests/TestWorkflowTemplate.xaml b/Tests/TestWorkflowTemplate.xaml
index 49b3732..b27532e 100644
--- a/Tests/TestWorkflowTemplate.xaml
+++ b/Tests/TestWorkflowTemplate.xaml
@@ -1,7 +1,8 @@
-<Activity mc:Ignorable="sap sap2010 sads" x:Class="TestWorkflowTemplate" mva:VisualBasic.Settings="{x:Null}"
+<Activity mc:Ignorable="sap sap2010 sads" x:Class="TestWorkflowTemplate" mva:VisualBasic.Settings="{x:Null}" sap2010:WorkflowViewState.IdRef="TestWorkflowTemplate_1"
  xmlns="http://schemas.microsoft.com/netfx/2009/xaml/activities"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
  xmlns:mva="clr-namespace:Microsoft.VisualBasic.Activities;assembly=System.Activities"
+ xmlns:s="clr-namespace:System;assembly=mscorlib"
  xmlns:sads="http://schemas.microsoft.com/netfx/2010/xaml/activities/debugger"
  xmlns:sap="http://schemas.microsoft.com/netfx/2009/xaml/activities/presentation"
  xmlns:sap2010="http://schemas.microsoft.com/netfx/2010/xaml/activities/presentation"
@@ -53,23 +54,22 @@
       <AssemblyReference>PresentationCore</AssemblyReference>
     </sco:Collection>
   </TextExpression.ReferencesForImplementation>
-  <Sequence sap2010:Annotation.AnnotationText="Template workflow used to create tests for workflows in the process.&#xA;Create a new test workflow by copying and renaming this file." DisplayName="Test">
+  <Sequence sap2010:Annotation.AnnotationText="Template workflow used to create tests for workflows in the process.&#xA;Create a new test workflow by copying and renaming this file." DisplayName="Test" sap2010:WorkflowViewState.IdRef="Sequence_1">
     <Sequence.Variables>
       <Variable x:TypeArguments="scg:Dictionary(x:String, x:Object)" sap2010:Annotation.AnnotationText="Dictionary structure to store configuration data." Name="Config" />
     </Sequence.Variables>
-    <ui:InvokeWorkflowFile ContinueOnError="{x:Null}" DisplayName="Initialize All Settings" UnSafe="False" WorkflowFileName="Framework\InitAllSettings.xaml">
+    <ui:InvokeWorkflowFile ContinueOnError="{x:Null}" DisplayName="Invoke InitAllSettings workflow" sap2010:WorkflowViewState.IdRef="InvokeWorkflowFile_2" UnSafe="False" WorkflowFileName="Framework\InitAllSettings.xaml">
       <ui:InvokeWorkflowFile.Arguments>
-        <OutArgument x:TypeArguments="scg:Dictionary(x:String, x:Object)" x:Key="Config">[Config]</OutArgument>
+        <InArgument x:TypeArguments="x:String" x:Key="in_ConfigFile">Data\Config.xlsx</InArgument>
+        <InArgument x:TypeArguments="s:String[]" x:Key="in_ConfigSheets">[{"Settings", "Constants"}]</InArgument>
+        <OutArgument x:TypeArguments="scg:Dictionary(x:String, x:Object)" x:Key="out_Config">[Config]</OutArgument>
       </ui:InvokeWorkflowFile.Arguments>
-      <sap2010:WorkflowViewState.IdRef>InvokeWorkflowFile_1</sap2010:WorkflowViewState.IdRef>
     </ui:InvokeWorkflowFile>
-    <sap2010:WorkflowViewState.IdRef>Sequence_1</sap2010:WorkflowViewState.IdRef>
-    <sads:DebugSymbol.Symbol>d0tDOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXFRlc3RXb3JrZmxvd1RlbXBsYXRlLnhhbWwEOANEDgIBATwFQR0CAQI+Wj5iAgEEPH08nQECAQM=</sads:DebugSymbol.Symbol>
+    <sads:DebugSymbol.Symbol>d1FDOlxVc2Vyc1xNYXRldXMgQ3J1elxEb2N1bWVudHNcR2l0SHViXFJlRnJhbWVXb3JrXFRlc3RzXFRlc3RXb3JrZmxvd1RlbXBsYXRlLnhhbWwGOQNFDgIBAT0FQx0CAQJBXkFmAgEGPbwBPdwBAgEFQEpAZQIBBD9GP1YCAQM=</sads:DebugSymbol.Symbol>
   </Sequence>
-  <sap2010:WorkflowViewState.IdRef>TestWorkflowTemplate_1</sap2010:WorkflowViewState.IdRef>
   <sap2010:WorkflowViewState.ViewStateManager>
     <sap2010:ViewStateManager>
-      <sap2010:ViewStateData Id="InvokeWorkflowFile_1" sap:VirtualizedContainerService.HintSize="314,87" />
+      <sap2010:ViewStateData Id="InvokeWorkflowFile_2" sap:VirtualizedContainerService.HintSize="314,87" />
       <sap2010:ViewStateData Id="Sequence_1" sap:VirtualizedContainerService.HintSize="336,283">
         <sap:WorkflowViewStateService.ViewState>
           <scg:Dictionary x:TypeArguments="x:String, x:Object">
@@ -78,7 +78,7 @@
           </scg:Dictionary>
         </sap:WorkflowViewStateService.ViewState>
       </sap2010:ViewStateData>
-      <sap2010:ViewStateData Id="TestWorkflowTemplate_1" sap:VirtualizedContainerService.HintSize="376,403" />
+      <sap2010:ViewStateData Id="TestWorkflowTemplate_1" sap:VirtualizedContainerService.HintSize="376,363" />
     </sap2010:ViewStateManager>
   </sap2010:WorkflowViewState.ViewStateManager>
 </Activity>
\ No newline at end of file