diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/listener/SetCorrelationKeyListener.java b/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/listener/SetCorrelationKeyListener.java
new file mode 100644
index 0000000..ca63063
--- /dev/null
+++ b/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/listener/SetCorrelationKeyListener.java
@@ -0,0 +1,33 @@
+package de.medizininformatik_initiative.feasibility_dsf_process.client.listener;
+
+import dev.dsf.bpe.v1.ProcessPluginApi;
+import dev.dsf.bpe.v1.constants.BpmnExecutionVariables;
+import dev.dsf.bpe.v1.variables.Target;
+import dev.dsf.bpe.v1.variables.Variables;
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.camunda.bpm.engine.delegate.ExecutionListener;
+import org.springframework.beans.factory.InitializingBean;
+
+import java.util.Objects;
+
+public class SetCorrelationKeyListener implements ExecutionListener, InitializingBean
+{
+    private final ProcessPluginApi api;
+
+    public SetCorrelationKeyListener(ProcessPluginApi api) {
+        this.api = api;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        Objects.requireNonNull(api, "api");
+    }
+
+    @Override
+    public void notify(DelegateExecution execution) throws Exception {
+        Variables variables = api.getVariables(execution);
+        Target target = variables.getTarget();
+
+        execution.setVariableLocal(BpmnExecutionVariables.CORRELATION_KEY, target.getCorrelationKey());
+    }
+}
diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/message/SendDicRequest.java b/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/message/SendDicRequest.java
new file mode 100644
index 0000000..1c8044a
--- /dev/null
+++ b/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/message/SendDicRequest.java
@@ -0,0 +1,40 @@
+package de.medizininformatik_initiative.feasibility_dsf_process.message;
+
+import dev.dsf.bpe.v1.ProcessPluginApi;
+import dev.dsf.bpe.v1.activity.AbstractTaskMessageSend;
+import dev.dsf.bpe.v1.variables.Variables;
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.hl7.fhir.r4.model.Reference;
+import org.hl7.fhir.r4.model.Task;
+import org.hl7.fhir.r4.model.Task.ParameterComponent;
+
+import java.util.stream.Stream;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY;
+import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE;
+
+public class SendDicRequest extends AbstractTaskMessageSend {
+
+    public SendDicRequest(ProcessPluginApi api) {
+        super(api);
+    }
+
+    @Override
+    protected Stream<ParameterComponent> getAdditionalInputParameters(DelegateExecution execution,
+                                                                      Variables variables) {
+        return Stream.of(api.getTaskHelper().createInput(
+                new Reference(checkNotNull(variables.getString("measure-id"), "variable 'measure-id' not set")),
+                CODESYSTEM_FEASIBILITY, CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE));
+    }
+
+    @Override
+    protected void handleIntermediateThrowEventError(DelegateExecution execution, Variables variables,
+                                                     Exception exception, String errorMessage) {
+        execution.setVariableLocal("sendError", true);
+    }
+
+    @Override
+    protected void addErrorMessage(Task task, String errorMessage) {
+    }
+}
diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadMeasureReport.java b/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadMeasureReport.java
index 45c6bf2..34b6612 100644
--- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadMeasureReport.java
+++ b/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadMeasureReport.java
@@ -44,7 +44,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) {
         FhirWebserviceClient client = clientProvider
                 .getWebserviceClientByReference(measureReportId);
         MeasureReport measureReport = downloadMeasureReport(client, measureReportId);
-        execution.setVariable(VARIABLE_MEASURE_REPORT, measureReport);
+        execution.setVariableLocal(VARIABLE_MEASURE_REPORT, measureReport);
     }
 
     private MeasureReport downloadMeasureReport(FhirWebserviceClient client, IdType measureReportId) {
diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/LogReceiveTimeout.java b/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/LogReceiveTimeout.java
new file mode 100644
index 0000000..c125ae9
--- /dev/null
+++ b/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/LogReceiveTimeout.java
@@ -0,0 +1,28 @@
+package de.medizininformatik_initiative.feasibility_dsf_process.service;
+
+import dev.dsf.bpe.v1.ProcessPluginApi;
+import dev.dsf.bpe.v1.activity.AbstractServiceDelegate;
+import dev.dsf.bpe.v1.variables.Target;
+import dev.dsf.bpe.v1.variables.Variables;
+import org.camunda.bpm.engine.delegate.BpmnError;
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LogReceiveTimeout extends AbstractServiceDelegate {
+
+    private static final Logger logger = LoggerFactory.getLogger(LogReceiveTimeout.class);
+
+    public LogReceiveTimeout(ProcessPluginApi api) {
+        super(api);
+    }
+
+    @Override
+    protected void doExecute(DelegateExecution execution, Variables variables) throws BpmnError, Exception {
+        Target target = variables.getTarget();
+        logger.warn("Timeout while waiting for result from {} (endpoint url: {}).",
+                target.getOrganizationIdentifierValue(),
+                target.getEndpointUrl());
+    }
+
+}
diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SendDicRequests.java b/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SendDicRequests.java
deleted file mode 100644
index a003739..0000000
--- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SendDicRequests.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package de.medizininformatik_initiative.feasibility_dsf_process.service;
-
-import dev.dsf.bpe.v1.ProcessPluginApi;
-import dev.dsf.bpe.v1.activity.AbstractServiceDelegate;
-import dev.dsf.bpe.v1.constants.CodeSystems.BpmnMessage;
-import dev.dsf.bpe.v1.constants.NamingSystems;
-import dev.dsf.bpe.v1.variables.Target;
-import dev.dsf.bpe.v1.variables.Targets;
-import dev.dsf.bpe.v1.variables.Variables;
-import org.camunda.bpm.engine.delegate.BpmnError;
-import org.camunda.bpm.engine.delegate.DelegateExecution;
-import org.camunda.bpm.engine.impl.el.FixedValue;
-import org.hl7.fhir.r4.model.CodeableConcept;
-import org.hl7.fhir.r4.model.Coding;
-import org.hl7.fhir.r4.model.Identifier;
-import org.hl7.fhir.r4.model.Meta;
-import org.hl7.fhir.r4.model.Reference;
-import org.hl7.fhir.r4.model.StringType;
-import org.hl7.fhir.r4.model.Task;
-import org.hl7.fhir.r4.model.Task.ParameterComponent;
-import org.hl7.fhir.r4.model.Task.TaskStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-import java.util.concurrent.ForkJoinPool;
-import java.util.stream.Collectors;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY;
-import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE;
-import static org.hl7.fhir.r4.model.Task.TaskIntent.ORDER;
-
-public class SendDicRequests extends AbstractServiceDelegate {
-
-    private static final Logger logger = LoggerFactory.getLogger(SendDicRequests.class);
-
-    private final ForkJoinPool forkJoinPool;
-
-    // set via field injection
-    private FixedValue instantiatesCanonical;
-    private FixedValue messageName;
-    private FixedValue profile;
-
-    public SendDicRequests(ProcessPluginApi api, ForkJoinPool forkJoinPool) {
-        super(api);
-        this.forkJoinPool = forkJoinPool;
-    }
-
-    public void setInstantiatesCanonical(FixedValue instantiatesCanonical) {
-        this.instantiatesCanonical = instantiatesCanonical;
-    }
-
-    public void setMessageName(FixedValue messageName) {
-        this.messageName = messageName;
-    }
-
-    public void setProfile(FixedValue profile) {
-        this.profile = profile;
-    }
-
-    @Override
-    protected void doExecute(DelegateExecution execution, Variables variables) throws BpmnError, Exception {
-        Targets targets = variables.getTargets();
-        Task targetTaskTemplate = createTargetTaskTemplate(execution, variables);
-
-        forkJoinPool.submit(
-                () -> targets.getEntries()
-                        .parallelStream()
-                        .map((target) -> {
-                            Task targetTask = targetTaskTemplate.copy();
-
-                            targetTask.getRestriction().addRecipient(getRecipient(target));
-
-                            String correlationKey = target.getCorrelationKey();
-                            if (correlationKey != null) {
-                                ParameterComponent correlationKeyInput = new ParameterComponent(
-                                        new CodeableConcept(
-                                                new Coding(BpmnMessage.URL, BpmnMessage.Codes.CORRELATION_KEY, null)),
-                                        new StringType(correlationKey));
-                                targetTask.getInput().add(correlationKeyInput);
-                            }
-
-                            return sendTask(targetTask, target);
-                        })
-                        .collect(Collectors.toList()))
-                .get();
-    }
-
-    private Task createTargetTaskTemplate(DelegateExecution execution, Variables variables) {
-        String instantiatesCanonical = checkNotNull(this.instantiatesCanonical).getExpressionText();
-        String messageName = checkNotNull(this.messageName).getExpressionText();
-        String profile = checkNotNull(this.profile).getExpressionText();
-        Reference measure = new Reference()
-                .setReference(checkNotNull(variables.getString("measure-id"), "variable 'measure-id' not set"));
-        String businessKey = execution.getBusinessKey();
-        Task targetTask = new Task();
-        targetTask.copy();
-        targetTask.setMeta(new Meta().addProfile(profile));
-        targetTask.setStatus(TaskStatus.REQUESTED);
-        targetTask.setIntent(ORDER);
-        targetTask.setAuthoredOn(new Date());
-        targetTask.setRequester(getRequester());
-        targetTask.setInstantiatesCanonical(instantiatesCanonical);
-
-        ParameterComponent messageNameInput = new ParameterComponent(
-                new CodeableConcept(new Coding(BpmnMessage.URL, BpmnMessage.Codes.MESSAGE_NAME, null)),
-                new StringType(messageName));
-        targetTask.addInput(messageNameInput);
-
-        ParameterComponent businessKeyInput = new ParameterComponent(
-                new CodeableConcept(new Coding(BpmnMessage.URL, BpmnMessage.Codes.BUSINESS_KEY, null)),
-                new StringType(businessKey));
-        targetTask.getInput().add(businessKeyInput);
-        targetTask.getInput().add(api.getTaskHelper().createInput(measure, CODESYSTEM_FEASIBILITY,
-                CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE));
-        return targetTask;
-    }
-
-    private Reference getRequester() {
-        return new Reference().setType("Organization")
-                .setIdentifier(new Identifier().setSystem(NamingSystems.OrganizationIdentifier.SID)
-                        .setValue(api.getOrganizationProvider().getLocalOrganizationIdentifierValue().get()));
-    }
-
-    private Reference getRecipient(Target target) {
-        return new Reference().setType("Organization")
-                .setIdentifier(new Identifier().setSystem(NamingSystems.OrganizationIdentifier.SID)
-                        .setValue(target.getOrganizationIdentifierValue()));
-    }
-
-    private Boolean sendTask(Task task, Target target) {
-        try {
-            logger.info("Sending task to target organization {}, endpoint {}",
-                    target.getOrganizationIdentifierValue(), target.getEndpointUrl());
-            api.getFhirWebserviceClientProvider()
-                    .getWebserviceClient(target.getEndpointUrl())
-                    .create(task);
-            return true;
-        } catch (Exception e) {
-            logger.error("Error sending task to target organization {}, endpoint {}: {}",
-                    target.getOrganizationIdentifierValue(), target.getEndpointUrl(), e.getMessage());
-            return false;
-        }
-    }
-}
diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreLiveResult.java b/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreLiveResult.java
index c430875..218ab0f 100644
--- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreLiveResult.java
+++ b/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreLiveResult.java
@@ -40,7 +40,7 @@ public StoreLiveResult(ProcessPluginApi api) {
     protected void doExecute(DelegateExecution execution, Variables variables) {
         Task task = variables.getLatestTask();
 
-        MeasureReport measureReport = variables.getResource(VARIABLE_MEASURE_REPORT);
+        MeasureReport measureReport = (MeasureReport) execution.getVariableLocal(VARIABLE_MEASURE_REPORT);
         addReadAccessTag(measureReport);
 
         MeasureReport storedMeasureReport = storeMeasureReport(measureReport);
diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/FeasibilityConfig.java b/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/FeasibilityConfig.java
index 5312955..fb6040c 100755
--- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/FeasibilityConfig.java
+++ b/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/FeasibilityConfig.java
@@ -1,5 +1,6 @@
 package de.medizininformatik_initiative.feasibility_dsf_process.spring.config;
 
+import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import de.medizininformatik_initiative.feasibility_dsf_process.EnhancedFhirWebserviceClientProvider;
 import de.medizininformatik_initiative.feasibility_dsf_process.EnhancedFhirWebserviceClientProviderImpl;
@@ -10,6 +11,8 @@
 import de.medizininformatik_initiative.feasibility_dsf_process.Obfuscator;
 import de.medizininformatik_initiative.feasibility_dsf_process.RateLimit;
 import de.medizininformatik_initiative.feasibility_dsf_process.client.flare.FlareWebserviceClient;
+import de.medizininformatik_initiative.feasibility_dsf_process.client.listener.SetCorrelationKeyListener;
+import de.medizininformatik_initiative.feasibility_dsf_process.message.SendDicRequest;
 import de.medizininformatik_initiative.feasibility_dsf_process.message.SendDicResponse;
 import de.medizininformatik_initiative.feasibility_dsf_process.service.DownloadFeasibilityResources;
 import de.medizininformatik_initiative.feasibility_dsf_process.service.DownloadMeasureReport;
@@ -17,11 +20,11 @@
 import de.medizininformatik_initiative.feasibility_dsf_process.service.EvaluateRequestRate;
 import de.medizininformatik_initiative.feasibility_dsf_process.service.EvaluateStructuredQueryMeasure;
 import de.medizininformatik_initiative.feasibility_dsf_process.service.FeasibilityResourceCleaner;
+import de.medizininformatik_initiative.feasibility_dsf_process.service.LogReceiveTimeout;
 import de.medizininformatik_initiative.feasibility_dsf_process.service.ObfuscateEvaluationResult;
 import de.medizininformatik_initiative.feasibility_dsf_process.service.RateLimitExceededTaskRejecter;
 import de.medizininformatik_initiative.feasibility_dsf_process.service.SelectRequestTargets;
 import de.medizininformatik_initiative.feasibility_dsf_process.service.SelectResponseTarget;
-import de.medizininformatik_initiative.feasibility_dsf_process.service.SendDicRequests;
 import de.medizininformatik_initiative.feasibility_dsf_process.service.SetupEvaluationSettings;
 import de.medizininformatik_initiative.feasibility_dsf_process.service.StoreFeasibilityResources;
 import de.medizininformatik_initiative.feasibility_dsf_process.service.StoreLiveResult;
@@ -35,22 +38,23 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 
-import java.util.concurrent.ForkJoinPool;
-
 @Configuration
 public class FeasibilityConfig {
 
     private final IGenericClient storeClient;
 
+    @Autowired private final FhirContext fhirContext;
     @Autowired private ProcessPluginApi api;
 
     private final EvaluationSettingsProvider evaluationSettingsProvider;
     private final FlareWebserviceClient flareWebserviceClient;
 
     public FeasibilityConfig(@Qualifier("store-client") IGenericClient storeClient,
+                             FhirContext fhirContext,
                              EvaluationSettingsProvider evaluationSettingsProvider,
                              FlareWebserviceClient flareWebserviceClient) {
         this.storeClient = storeClient;
+        this.fhirContext = fhirContext;
         this.evaluationSettingsProvider = evaluationSettingsProvider;
         this.flareWebserviceClient = flareWebserviceClient;
     }
@@ -79,8 +83,8 @@ public SelectRequestTargets selectRequestTargets() {
 
     @Bean
     @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public SendDicRequests sendDicRequests(ForkJoinPool threadPool) {
-        return new SendDicRequests(api, threadPool);
+    public SendDicRequest sendDicRequests() {
+        return new SendDicRequest(api);
     }
 
     @Bean
@@ -95,6 +99,18 @@ public StoreLiveResult storeLiveResult() {
         return new StoreLiveResult(api);
     }
 
+    @Bean
+    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+    public LogReceiveTimeout logReceiveTimeout() {
+        return new LogReceiveTimeout(api);
+    }
+
+    @Bean
+    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+    public SetCorrelationKeyListener setCorrelationKeyListener() {
+        return new SetCorrelationKeyListener(api);
+    }
+
     //
     // process executeFeasibility implementations
     //
@@ -167,14 +183,9 @@ public SendDicResponse sendDicResponse() {
         return new SendDicResponse(api);
     }
 
-    @Bean
-    public ForkJoinPool ioThreadPool() {
-        return new ForkJoinPool(8);
-    }
-
     @Bean
     @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public FeasibilityProcessPluginDeploymentStateListener deploymentStateListener () {
+    public FeasibilityProcessPluginDeploymentStateListener deploymentStateListener() {
         return new FeasibilityProcessPluginDeploymentStateListener(
                 EvaluationStrategy
                         .fromStrategyRepresentation(evaluationSettingsProvider.evaluationStrategyRepresentation()),
diff --git a/feasibility-dsf-process/src/main/resources/bpe/feasibilityExecute.bpmn b/feasibility-dsf-process/src/main/resources/bpe/feasibilityExecute.bpmn
index 07897a9..96f46ac 100755
--- a/feasibility-dsf-process/src/main/resources/bpe/feasibilityExecute.bpmn
+++ b/feasibility-dsf-process/src/main/resources/bpe/feasibilityExecute.bpmn
@@ -9,24 +9,6 @@
       <bpmn:incoming>Flow_0h1fgqi</bpmn:incoming>
       <bpmn:outgoing>Flow_11cnoe1</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:endEvent id="EndEvent" name="send result to requester">
-      <bpmn:extensionElements />
-      <bpmn:incoming>SequenceFlow_0ascyjc</bpmn:incoming>
-      <bpmn:messageEventDefinition id="MessageEventDefinition_13swtie" messageRef="Message_1dr71re" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.message.SendDicResponse">
-        <bpmn:extensionElements>
-          <camunda:field name="profile">
-            <camunda:string>http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|#{version}</camunda:string>
-          </camunda:field>
-          <camunda:field name="instantiatesCanonical">
-            <camunda:string>http://medizininformatik-initiative.de/bpe/Process/feasibilityRequest|#{version}</camunda:string>
-          </camunda:field>
-          <camunda:field name="messageName">
-            <camunda:string>feasibilitySingleDicResultMessage</camunda:string>
-          </camunda:field>
-        </bpmn:extensionElements>
-      </bpmn:messageEventDefinition>
-    </bpmn:endEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_0ascyjc" sourceRef="selectResponseTarget" targetRef="EndEvent" />
     <bpmn:serviceTask id="selectResponseTarget" name="select response target" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.SelectResponseTarget">
       <bpmn:incoming>Flow_11lpcfm</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0ascyjc</bpmn:outgoing>
@@ -55,36 +37,36 @@
     <bpmn:sequenceFlow id="Flow_09g5hz4" name="CQL" sourceRef="Gateway_1kfqiko" targetRef="storeFeasibilityResources">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${execution.getVariable('evaluation-strategy')=='cql'}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_0gowl5w" name="Structured Query" sourceRef="Gateway_1kfqiko" targetRef="Activity_11pqdmi">
+    <bpmn:sequenceFlow id="Flow_0gowl5w" name="Structured Query" sourceRef="Gateway_1kfqiko" targetRef="evaluateStructuredQueryMeasure">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${execution.getVariable('evaluation-strategy')=='structured-query'}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:serviceTask id="Activity_11pqdmi" name="evaluate Structured Query measure" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.EvaluateStructuredQueryMeasure">
+    <bpmn:serviceTask id="evaluateStructuredQueryMeasure" name="evaluate Structured Query measure" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.EvaluateStructuredQueryMeasure">
       <bpmn:incoming>Flow_0gowl5w</bpmn:incoming>
       <bpmn:outgoing>Flow_1cs9290</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:serviceTask id="Activity_1h6wvlq" name="obfuscate evaluation result" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.ObfuscateEvaluationResult">
+    <bpmn:serviceTask id="obfuscateEvaluationResult" name="obfuscate evaluation result" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.ObfuscateEvaluationResult">
       <bpmn:incoming>Flow_0r37nze</bpmn:incoming>
       <bpmn:outgoing>Flow_10dmu4o</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:serviceTask id="Activity_0zvan0q" name="setup evaluation settings" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.SetupEvaluationSettings">
+    <bpmn:serviceTask id="setupEvaluationSettings" name="setup evaluation settings" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.SetupEvaluationSettings">
       <bpmn:incoming>Flow_1f6bge9</bpmn:incoming>
       <bpmn:outgoing>Flow_07fkz0p</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:exclusiveGateway id="Gateway_01hxgve" name="shall be obfuscated?">
+    <bpmn:exclusiveGateway id="gatewayObfuscate" name="shall be obfuscated?">
       <bpmn:incoming>Flow_1qdam0i</bpmn:incoming>
       <bpmn:incoming>Flow_1cs9290</bpmn:incoming>
       <bpmn:outgoing>Flow_0r37nze</bpmn:outgoing>
       <bpmn:outgoing>Flow_1lvwaa9</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="Flow_1qdam0i" sourceRef="evaluateMeasure" targetRef="Gateway_01hxgve" />
-    <bpmn:sequenceFlow id="Flow_1cs9290" sourceRef="Activity_11pqdmi" targetRef="Gateway_01hxgve" />
-    <bpmn:sequenceFlow id="Flow_0r37nze" name="yes" sourceRef="Gateway_01hxgve" targetRef="Activity_1h6wvlq">
+    <bpmn:sequenceFlow id="Flow_1qdam0i" sourceRef="evaluateMeasure" targetRef="gatewayObfuscate" />
+    <bpmn:sequenceFlow id="Flow_1cs9290" sourceRef="evaluateStructuredQueryMeasure" targetRef="gatewayObfuscate" />
+    <bpmn:sequenceFlow id="Flow_0r37nze" name="yes" sourceRef="gatewayObfuscate" targetRef="obfuscateEvaluationResult">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${execution.getVariable('evaluation-obfuscation')==true}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_1lvwaa9" name="no" sourceRef="Gateway_01hxgve" targetRef="storeMeasureReport">
+    <bpmn:sequenceFlow id="Flow_1lvwaa9" name="no" sourceRef="gatewayObfuscate" targetRef="storeMeasureReport">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${execution.getVariable('evaluation-obfuscation')==false}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_10dmu4o" sourceRef="Activity_1h6wvlq" targetRef="storeMeasureReport" />
+    <bpmn:sequenceFlow id="Flow_10dmu4o" sourceRef="obfuscateEvaluationResult" targetRef="storeMeasureReport" />
     <bpmn:serviceTask id="limitRequestRate" name="check current request rate" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.EvaluateRequestRate">
       <bpmn:incoming>Flow_07fkz0p</bpmn:incoming>
       <bpmn:outgoing>Flow_0js57at</bpmn:outgoing>
@@ -97,20 +79,40 @@
     <bpmn:sequenceFlow id="Flow_0h1fgqi" name="yes" sourceRef="Gateway_0vqojf6" targetRef="downloadFeasibilityResources">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${execution.getVariable('request-rate-below-limit')}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:serviceTask id="Activity_19ax4t8" name="reject task" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.RateLimitExceededTaskRejecter">
+    <bpmn:serviceTask id="rejectTask" name="reject task" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.RateLimitExceededTaskRejecter">
       <bpmn:incoming>Flow_0ug5qml</bpmn:incoming>
       <bpmn:outgoing>Flow_1gqxni9</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:sequenceFlow id="Flow_0ug5qml" name="no" sourceRef="Gateway_0vqojf6" targetRef="Activity_19ax4t8">
+    <bpmn:sequenceFlow id="Flow_0ug5qml" name="no" sourceRef="Gateway_0vqojf6" targetRef="rejectTask">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${execution.getVariable('request-rate-below-limit') == false}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_1gqxni9" sourceRef="Activity_19ax4t8" targetRef="NoResultEndEvent" />
-    <bpmn:sequenceFlow id="Flow_1f6bge9" sourceRef="StartEvent" targetRef="Activity_0zvan0q" />
+    <bpmn:sequenceFlow id="Flow_1gqxni9" sourceRef="rejectTask" targetRef="noResultEndEvent" />
+    <bpmn:sequenceFlow id="Flow_1f6bge9" sourceRef="StartEvent" targetRef="setupEvaluationSettings" />
     <bpmn:sequenceFlow id="Flow_0js57at" sourceRef="limitRequestRate" targetRef="Gateway_0vqojf6" />
-    <bpmn:sequenceFlow id="Flow_07fkz0p" sourceRef="Activity_0zvan0q" targetRef="limitRequestRate" />
-    <bpmn:endEvent id="NoResultEndEvent" name="end execution with no result">
+    <bpmn:sequenceFlow id="Flow_07fkz0p" sourceRef="setupEvaluationSettings" targetRef="limitRequestRate" />
+    <bpmn:endEvent id="noResultEndEvent" name="end execution with no result">
       <bpmn:incoming>Flow_1gqxni9</bpmn:incoming>
     </bpmn:endEvent>
+    <bpmn:endEvent id="sendDicResponse" name="send result to requester" camunda:asyncBefore="true">
+      <bpmn:extensionElements>
+        <camunda:failedJobRetryTimeCycle>R3/PT5S</camunda:failedJobRetryTimeCycle>
+      </bpmn:extensionElements>
+      <bpmn:incoming>SequenceFlow_0ascyjc</bpmn:incoming>
+      <bpmn:messageEventDefinition id="MessageEventDefinition_13swtie" messageRef="Message_1dr71re" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.message.SendDicResponse">
+        <bpmn:extensionElements>
+          <camunda:field name="profile">
+            <camunda:string>http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|#{version}</camunda:string>
+          </camunda:field>
+          <camunda:field name="instantiatesCanonical">
+            <camunda:string>http://medizininformatik-initiative.de/bpe/Process/feasibilityRequest|#{version}</camunda:string>
+          </camunda:field>
+          <camunda:field name="messageName">
+            <camunda:string>feasibilitySingleDicResultMessage</camunda:string>
+          </camunda:field>
+        </bpmn:extensionElements>
+      </bpmn:messageEventDefinition>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="SequenceFlow_0ascyjc" sourceRef="selectResponseTarget" targetRef="sendDicResponse" />
   </bpmn:process>
   <bpmn:message id="Message_1yz2a31" name="feasibilityExecuteMessage" />
   <bpmn:message id="Message_1dr71re" name="feasibilitySingleDicResultMessage" />
@@ -125,10 +127,10 @@
       <bpmndi:BPMNShape id="ServiceTask_0b8j3ka_di" bpmnElement="downloadFeasibilityResources">
         <dc:Bounds x="670" y="162" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_10xdh63_di" bpmnElement="EndEvent">
+      <bpmndi:BPMNShape id="EndEvent_10xdh63_di" bpmnElement="sendDicResponse">
         <dc:Bounds x="1562" y="272" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1549" y="315" width="66" height="27" />
+          <dc:Bounds x="1549" y="315" width="67" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_15aifhd_di" bpmnElement="selectResponseTarget">
@@ -149,16 +151,16 @@
           <dc:Bounds x="873" y="195" width="74" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1rmldcf_di" bpmnElement="Activity_11pqdmi">
+      <bpmndi:BPMNShape id="Activity_1rmldcf_di" bpmnElement="evaluateStructuredQueryMeasure">
         <dc:Bounds x="950" y="250" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_02bp35f_di" bpmnElement="Activity_1h6wvlq">
+      <bpmndi:BPMNShape id="Activity_02bp35f_di" bpmnElement="obfuscateEvaluationResult">
         <dc:Bounds x="1250" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0lqxwo5_di" bpmnElement="Activity_0zvan0q">
+      <bpmndi:BPMNShape id="Activity_0lqxwo5_di" bpmnElement="setupEvaluationSettings">
         <dc:Bounds x="230" y="162" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_01hxgve_di" bpmnElement="Gateway_01hxgve" isMarkerVisible="true">
+      <bpmndi:BPMNShape id="Gateway_01hxgve_di" bpmnElement="gatewayObfuscate" isMarkerVisible="true">
         <dc:Bounds x="1135" y="177" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1070" y="188" width="60" height="27" />
@@ -173,10 +175,10 @@
           <dc:Bounds x="528" y="130" width="85" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_19ax4t8_di" bpmnElement="Activity_19ax4t8">
+      <bpmndi:BPMNShape id="Activity_19ax4t8_di" bpmnElement="rejectTask">
         <dc:Bounds x="520" y="300" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1u9eo5t_di" bpmnElement="NoResultEndEvent">
+      <bpmndi:BPMNShape id="Event_1u9eo5t_di" bpmnElement="noResultEndEvent">
         <dc:Bounds x="552" y="442" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="538" y="485" width="69" height="27" />
diff --git a/feasibility-dsf-process/src/main/resources/bpe/feasibilityRequest.bpmn b/feasibility-dsf-process/src/main/resources/bpe/feasibilityRequest.bpmn
index 1ebe489..b8e27e1 100755
--- a/feasibility-dsf-process/src/main/resources/bpe/feasibilityRequest.bpmn
+++ b/feasibility-dsf-process/src/main/resources/bpe/feasibilityRequest.bpmn
@@ -7,88 +7,107 @@
     </bpmn:startEvent>
     <bpmn:serviceTask id="selectRequestTargets" name="select request targets" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.SelectRequestTargets">
       <bpmn:incoming>SequenceFlow_11k77gx</bpmn:incoming>
-      <bpmn:outgoing>Flow_14amax3</bpmn:outgoing>
+      <bpmn:outgoing>Flow_0j3kdv8</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:sequenceFlow id="SequenceFlow_11k77gx" sourceRef="StartEvent" targetRef="selectRequestTargets" />
     <bpmn:endEvent id="EndEvent" name="success">
-      <bpmn:incoming>Flow_00sw3oh</bpmn:incoming>
+      <bpmn:incoming>Flow_08iflnw</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:subProcess id="Activity_1h2vwsh">
-      <bpmn:incoming>Flow_1qn1bcu</bpmn:incoming>
-      <bpmn:outgoing>Flow_05o62hi</bpmn:outgoing>
-      <bpmn:multiInstanceLoopCharacteristics camunda:collection="${targets.entries}" camunda:elementVariable="target" />
-      <bpmn:sequenceFlow id="Flow_1oq6cy1" sourceRef="Activity_09o61p4" targetRef="Activity_103gahn" />
-      <bpmn:serviceTask id="Activity_103gahn" name="store live result" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.StoreLiveResult">
+    <bpmn:subProcess id="SubProcessSendReceive" name="Sub Process Send and Reveive">
+      <bpmn:incoming>Flow_0j3kdv8</bpmn:incoming>
+      <bpmn:outgoing>Flow_08iflnw</bpmn:outgoing>
+      <bpmn:multiInstanceLoopCharacteristics camunda:asyncBefore="true" camunda:exclusive="false" camunda:collection="${targets.entries}" camunda:elementVariable="target">
+        <bpmn:extensionElements>
+          <camunda:failedJobRetryTimeCycle>R0/PT5S</camunda:failedJobRetryTimeCycle>
+        </bpmn:extensionElements>
+      </bpmn:multiInstanceLoopCharacteristics>
+      <bpmn:sequenceFlow id="Flow_1oq6cy1" sourceRef="DownloadMeasureReport" targetRef="StoreLiveResult" />
+      <bpmn:serviceTask id="StoreLiveResult" name="store live result" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.StoreLiveResult">
         <bpmn:incoming>Flow_1oq6cy1</bpmn:incoming>
         <bpmn:outgoing>Flow_097xx9e</bpmn:outgoing>
       </bpmn:serviceTask>
-      <bpmn:serviceTask id="Activity_09o61p4" name="download MeasureReport" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.DownloadMeasureReport">
-        <bpmn:incoming>Flow_14foi4g</bpmn:incoming>
+      <bpmn:serviceTask id="DownloadMeasureReport" name="download MeasureReport" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.DownloadMeasureReport">
+        <bpmn:incoming>Flow_02h2l8y</bpmn:incoming>
         <bpmn:outgoing>Flow_1oq6cy1</bpmn:outgoing>
       </bpmn:serviceTask>
-      <bpmn:endEvent id="Event_1udk06x">
-        <bpmn:incoming>Flow_097xx9e</bpmn:incoming>
-      </bpmn:endEvent>
-      <bpmn:sequenceFlow id="Flow_097xx9e" sourceRef="Activity_103gahn" targetRef="Event_1udk06x" />
-      <bpmn:receiveTask id="receiveDICQueryResultMessage" name="receive query result from DIC" messageRef="Message_18ld88c">
+      <bpmn:endEvent id="EndSendAndReceive" name="End Send and Receive" camunda:asyncAfter="true">
         <bpmn:extensionElements>
-          <camunda:inputOutput>
-            <camunda:inputParameter name="correlationKey">${target.correlationKey}</camunda:inputParameter>
-          </camunda:inputOutput>
+          <camunda:failedJobRetryTimeCycle>R0/PT5S</camunda:failedJobRetryTimeCycle>
         </bpmn:extensionElements>
-        <bpmn:incoming>Flow_1d7lpns</bpmn:incoming>
-        <bpmn:outgoing>Flow_14foi4g</bpmn:outgoing>
-      </bpmn:receiveTask>
-      <bpmn:sequenceFlow id="Flow_14foi4g" sourceRef="receiveDICQueryResultMessage" targetRef="Activity_09o61p4" />
-      <bpmn:startEvent id="Event_0l7w6t6">
+        <bpmn:incoming>Flow_0qr31l0</bpmn:incoming>
+      </bpmn:endEvent>
+      <bpmn:sequenceFlow id="Flow_097xx9e" sourceRef="StoreLiveResult" targetRef="Gateway_10uadql" />
+      <bpmn:startEvent id="StartSendAndReceive" name="Start Send and Receive ">
         <bpmn:outgoing>Flow_1d7lpns</bpmn:outgoing>
       </bpmn:startEvent>
-      <bpmn:sequenceFlow id="Flow_1d7lpns" sourceRef="Event_0l7w6t6" targetRef="receiveDICQueryResultMessage" />
+      <bpmn:sequenceFlow id="Flow_1d7lpns" sourceRef="StartSendAndReceive" targetRef="SendDicRequest" />
+      <bpmn:sequenceFlow id="Flow_1whfhqu" sourceRef="SendDicRequest" targetRef="Gateway_1m3gnfc" />
+      <bpmn:intermediateThrowEvent id="SendDicRequest" name="Send DIC Request">
+        <bpmn:incoming>Flow_1d7lpns</bpmn:incoming>
+        <bpmn:outgoing>Flow_1whfhqu</bpmn:outgoing>
+        <bpmn:messageEventDefinition id="MessageEventDefinition_0ba27np" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.message.SendDicRequest">
+          <bpmn:extensionElements>
+            <camunda:field name="profile">
+              <camunda:string>http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-execute|#{version}</camunda:string>
+            </camunda:field>
+            <camunda:field name="messageName">
+              <camunda:string>feasibilityExecuteMessage</camunda:string>
+            </camunda:field>
+            <camunda:field name="instantiatesCanonical">
+              <camunda:string>http://medizininformatik-initiative.de/bpe/Process/feasibilityExecute|#{version}</camunda:string>
+            </camunda:field>
+          </bpmn:extensionElements>
+        </bpmn:messageEventDefinition>
+      </bpmn:intermediateThrowEvent>
+      <bpmn:sequenceFlow id="Flow_02h2l8y" sourceRef="CatchEventReceiveDICResult" targetRef="DownloadMeasureReport" />
+      <bpmn:intermediateCatchEvent id="CatchEventReceiveDICResult" name="Receive DIC Result">
+        <bpmn:extensionElements />
+        <bpmn:incoming>Flow_0uyhw70</bpmn:incoming>
+        <bpmn:outgoing>Flow_02h2l8y</bpmn:outgoing>
+        <bpmn:messageEventDefinition id="MessageEventDefinition_0ii3gf2" messageRef="Message_18ld88c" />
+      </bpmn:intermediateCatchEvent>
+      <bpmn:eventBasedGateway id="EventBasedGateway_ReceiveDICResult" name="Gateway Receive DIC Result">
+        <bpmn:extensionElements>
+          <camunda:executionListener class="de.medizininformatik_initiative.feasibility_dsf_process.client.listener.SetCorrelationKeyListener" event="start" />
+        </bpmn:extensionElements>
+        <bpmn:incoming>Flow_02yveoj</bpmn:incoming>
+        <bpmn:outgoing>Flow_0uyhw70</bpmn:outgoing>
+        <bpmn:outgoing>Flow_1epm5e3</bpmn:outgoing>
+      </bpmn:eventBasedGateway>
+      <bpmn:sequenceFlow id="Flow_0uyhw70" sourceRef="EventBasedGateway_ReceiveDICResult" targetRef="CatchEventReceiveDICResult" />
+      <bpmn:intermediateCatchEvent id="TimeoutReceiveSingleDICResult" name="Timeout Receive DIC Result">
+        <bpmn:incoming>Flow_1epm5e3</bpmn:incoming>
+        <bpmn:outgoing>Flow_0pq3j9e</bpmn:outgoing>
+        <bpmn:timerEventDefinition id="TimerEventDefinition_1vl1r5d">
+          <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT5M</bpmn:timeDuration>
+        </bpmn:timerEventDefinition>
+      </bpmn:intermediateCatchEvent>
+      <bpmn:sequenceFlow id="Flow_1epm5e3" sourceRef="EventBasedGateway_ReceiveDICResult" targetRef="TimeoutReceiveSingleDICResult" />
+      <bpmn:serviceTask id="LogDicResultReceiveTimeout" name="log receive timeout" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.LogReceiveTimeout">
+        <bpmn:incoming>Flow_0pq3j9e</bpmn:incoming>
+        <bpmn:outgoing>Flow_0gkh900</bpmn:outgoing>
+      </bpmn:serviceTask>
+      <bpmn:sequenceFlow id="Flow_0pq3j9e" sourceRef="TimeoutReceiveSingleDICResult" targetRef="LogDicResultReceiveTimeout" />
+      <bpmn:sequenceFlow id="Flow_0gkh900" sourceRef="LogDicResultReceiveTimeout" targetRef="Gateway_10uadql" />
+      <bpmn:exclusiveGateway id="Gateway_1m3gnfc" default="Flow_02yveoj">
+        <bpmn:incoming>Flow_1whfhqu</bpmn:incoming>
+        <bpmn:outgoing>Flow_02yveoj</bpmn:outgoing>
+        <bpmn:outgoing>HasSendError</bpmn:outgoing>
+      </bpmn:exclusiveGateway>
+      <bpmn:sequenceFlow id="Flow_02yveoj" sourceRef="Gateway_1m3gnfc" targetRef="EventBasedGateway_ReceiveDICResult" />
+      <bpmn:sequenceFlow id="HasSendError" name="has send error" sourceRef="Gateway_1m3gnfc" targetRef="Gateway_10uadql">
+        <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${execution.hasVariable("sendError")}</bpmn:conditionExpression>
+      </bpmn:sequenceFlow>
+      <bpmn:exclusiveGateway id="Gateway_10uadql">
+        <bpmn:incoming>Flow_097xx9e</bpmn:incoming>
+        <bpmn:incoming>Flow_0gkh900</bpmn:incoming>
+        <bpmn:incoming>HasSendError</bpmn:incoming>
+        <bpmn:outgoing>Flow_0qr31l0</bpmn:outgoing>
+      </bpmn:exclusiveGateway>
+      <bpmn:sequenceFlow id="Flow_0qr31l0" sourceRef="Gateway_10uadql" targetRef="EndSendAndReceive" />
     </bpmn:subProcess>
-    <bpmn:sequenceFlow id="Flow_14amax3" sourceRef="selectRequestTargets" targetRef="Gateway_1qrwyyt" />
-    <bpmn:sequenceFlow id="Flow_05o62hi" sourceRef="Activity_1h2vwsh" targetRef="Gateway_0t8xpqu" />
-    <bpmn:boundaryEvent id="Event_13wq5pb" attachedToRef="Activity_1h2vwsh">
-      <bpmn:outgoing>Flow_0sb70bv</bpmn:outgoing>
-      <bpmn:timerEventDefinition id="TimerEventDefinition_0bvcu02">
-        <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT45S</bpmn:timeDuration>
-      </bpmn:timerEventDefinition>
-    </bpmn:boundaryEvent>
-    <bpmn:sequenceFlow id="Flow_0sb70bv" sourceRef="Event_13wq5pb" targetRef="Gateway_0t8xpqu" />
-    <bpmn:serviceTask id="sendRequestToDics" name="send request to dics" camunda:asyncBefore="true" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.SendDicRequests">
-      <bpmn:extensionElements>
-        <camunda:field name="profile">
-          <camunda:string>http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-execute|#{version}</camunda:string>
-        </camunda:field>
-        <camunda:field name="messageName">
-          <camunda:string>feasibilityExecuteMessage</camunda:string>
-        </camunda:field>
-        <camunda:field name="instantiatesCanonical">
-          <camunda:string>http://medizininformatik-initiative.de/bpe/Process/feasibilityExecute|#{version}</camunda:string>
-        </camunda:field>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0faz7g4</bpmn:incoming>
-      <bpmn:outgoing>Flow_05069oz</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:sequenceFlow id="Flow_1qn1bcu" sourceRef="Gateway_1qrwyyt" targetRef="Activity_1h2vwsh" />
-    <bpmn:parallelGateway id="Gateway_1qrwyyt">
-      <bpmn:incoming>Flow_14amax3</bpmn:incoming>
-      <bpmn:outgoing>Flow_1qn1bcu</bpmn:outgoing>
-      <bpmn:outgoing>Flow_0faz7g4</bpmn:outgoing>
-    </bpmn:parallelGateway>
-    <bpmn:sequenceFlow id="Flow_0faz7g4" sourceRef="Gateway_1qrwyyt" targetRef="sendRequestToDics" />
-    <bpmn:parallelGateway id="Gateway_1vorhen">
-      <bpmn:incoming>Flow_0adxuc3</bpmn:incoming>
-      <bpmn:incoming>Flow_05069oz</bpmn:incoming>
-      <bpmn:outgoing>Flow_00sw3oh</bpmn:outgoing>
-    </bpmn:parallelGateway>
-    <bpmn:exclusiveGateway id="Gateway_0t8xpqu">
-      <bpmn:incoming>Flow_05o62hi</bpmn:incoming>
-      <bpmn:incoming>Flow_0sb70bv</bpmn:incoming>
-      <bpmn:outgoing>Flow_0adxuc3</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="Flow_0adxuc3" sourceRef="Gateway_0t8xpqu" targetRef="Gateway_1vorhen" />
-    <bpmn:sequenceFlow id="Flow_05069oz" sourceRef="sendRequestToDics" targetRef="Gateway_1vorhen" />
-    <bpmn:sequenceFlow id="Flow_00sw3oh" sourceRef="Gateway_1vorhen" targetRef="EndEvent" />
+    <bpmn:sequenceFlow id="Flow_0j3kdv8" sourceRef="selectRequestTargets" targetRef="SubProcessSendReceive" />
+    <bpmn:sequenceFlow id="Flow_08iflnw" sourceRef="SubProcessSendReceive" targetRef="EndEvent" />
   </bpmn:process>
   <bpmn:message id="Message_1pq9qxp" name="feasibilityRequestMessage" />
   <bpmn:message id="Message_07ayhv1" name="feasibilityResultMessage" />
@@ -108,110 +127,141 @@
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="medizininformatik-initiativede_feasibilityRequest">
       <bpmndi:BPMNShape id="StartEvent_1ozsjmr_di" bpmnElement="StartEvent">
-        <dc:Bounds x="182" y="222" width="36" height="36" />
+        <dc:Bounds x="182" y="182" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="190" y="265" width="22" height="14" />
+          <dc:Bounds x="190" y="225" width="22" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_0vfud44_di" bpmnElement="selectRequestTargets">
-        <dc:Bounds x="280" y="200" width="100" height="80" />
+        <dc:Bounds x="290" y="160" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_18syky8_di" bpmnElement="EndEvent">
-        <dc:Bounds x="1342" y="222" width="36" height="36" />
+        <dc:Bounds x="1432" y="182" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1339" y="198" width="41" height="14" />
+          <dc:Bounds x="1429" y="158" width="41" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1h2vwsh_di" bpmnElement="Activity_1h2vwsh" isExpanded="true">
-        <dc:Bounds x="530" y="290" width="560" height="150" />
+      <bpmndi:BPMNShape id="Activity_1h2vwsh_di" bpmnElement="SubProcessSendReceive" isExpanded="true">
+        <dc:Bounds x="435" y="80" width="940" height="380" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_103gahn_di" bpmnElement="Activity_103gahn">
-        <dc:Bounds x="900" y="320" width="100" height="80" />
+      <bpmndi:BPMNShape id="Event_0l7w6t6_di" bpmnElement="StartSendAndReceive">
+        <dc:Bounds x="477" y="162" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="459" y="205" width="74" height="27" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1l7gm0z_di" bpmnElement="Activity_09o61p4">
-        <dc:Bounds x="760" y="320" width="100" height="80" />
+      <bpmndi:BPMNShape id="Event_15qbklr_di" bpmnElement="SendDicRequest">
+        <dc:Bounds x="567" y="162" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="563" y="205" width="48" height="27" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1udk06x_di" bpmnElement="Event_1udk06x">
-        <dc:Bounds x="1032" y="342" width="36" height="36" />
+      <bpmndi:BPMNShape id="Gateway_0qkwf0x_di" bpmnElement="EventBasedGateway_ReceiveDICResult">
+        <dc:Bounds x="745" y="155" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="726" y="118" width="87" height="27" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1ekcuhk_di" bpmnElement="receiveDICQueryResultMessage">
-        <dc:Bounds x="620" y="320" width="100" height="80" />
-        <bpmndi:BPMNLabel />
+      <bpmndi:BPMNShape id="Gateway_1m3gnfc_di" bpmnElement="Gateway_1m3gnfc" isMarkerVisible="true">
+        <dc:Bounds x="645" y="155" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0l7w6t6_di" bpmnElement="Event_0l7w6t6">
-        <dc:Bounds x="552" y="342" width="36" height="36" />
+      <bpmndi:BPMNShape id="Event_00ax9y5_di" bpmnElement="TimeoutReceiveSingleDICResult">
+        <dc:Bounds x="828" y="272" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="808" y="315" width="83" height="27" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Flow_1oq6cy1_di" bpmnElement="Flow_1oq6cy1">
-        <di:waypoint x="860" y="360" />
-        <di:waypoint x="900" y="360" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_097xx9e_di" bpmnElement="Flow_097xx9e">
-        <di:waypoint x="1000" y="360" />
-        <di:waypoint x="1032" y="360" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_14foi4g_di" bpmnElement="Flow_14foi4g">
-        <di:waypoint x="720" y="360" />
-        <di:waypoint x="760" y="360" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1d7lpns_di" bpmnElement="Flow_1d7lpns">
-        <di:waypoint x="588" y="360" />
-        <di:waypoint x="620" y="360" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="Activity_1b6desu_di" bpmnElement="sendRequestToDics">
-        <dc:Bounds x="530" y="80" width="100" height="80" />
+      <bpmndi:BPMNShape id="Event_1vf18dt_di" bpmnElement="CatchEventReceiveDICResult">
+        <dc:Bounds x="828" y="162" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="818" y="205" width="62" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1l7gm0z_di" bpmnElement="DownloadMeasureReport">
+        <dc:Bounds x="914" y="140" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_1q9dzcr_di" bpmnElement="Gateway_1qrwyyt">
-        <dc:Bounds x="435" y="215" width="50" height="50" />
+      <bpmndi:BPMNShape id="Activity_0oir2wx_di" bpmnElement="LogDicResultReceiveTimeout">
+        <dc:Bounds x="914" y="250" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_1pvb11t_di" bpmnElement="Gateway_1vorhen">
-        <dc:Bounds x="1235" y="215" width="50" height="50" />
+      <bpmndi:BPMNShape id="Activity_103gahn_di" bpmnElement="StoreLiveResult">
+        <dc:Bounds x="1039" y="140" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_0t8xpqu_di" bpmnElement="Gateway_0t8xpqu" isMarkerVisible="true">
-        <dc:Bounds x="1175" y="335" width="50" height="50" />
+      <bpmndi:BPMNShape id="Event_1udk06x_di" bpmnElement="EndSendAndReceive">
+        <dc:Bounds x="1251" y="162" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1236" y="132" width="70" height="27" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_13wq5pb_di" bpmnElement="Event_13wq5pb">
-        <dc:Bounds x="1072" y="422" width="36" height="36" />
+      <bpmndi:BPMNShape id="Gateway_10uadql_di" bpmnElement="Gateway_10uadql" isMarkerVisible="true">
+        <dc:Bounds x="1174" y="155" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_11k77gx_di" bpmnElement="SequenceFlow_11k77gx">
-        <di:waypoint x="218" y="240" />
-        <di:waypoint x="280" y="240" />
+      <bpmndi:BPMNEdge id="Flow_1d7lpns_di" bpmnElement="Flow_1d7lpns">
+        <di:waypoint x="513" y="180" />
+        <di:waypoint x="567" y="180" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_14amax3_di" bpmnElement="Flow_14amax3">
-        <di:waypoint x="380" y="240" />
-        <di:waypoint x="435" y="240" />
+      <bpmndi:BPMNEdge id="Flow_1whfhqu_di" bpmnElement="Flow_1whfhqu">
+        <di:waypoint x="603" y="180" />
+        <di:waypoint x="645" y="180" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_05o62hi_di" bpmnElement="Flow_05o62hi">
-        <di:waypoint x="1090" y="360" />
-        <di:waypoint x="1175" y="360" />
+      <bpmndi:BPMNEdge id="Flow_02yveoj_di" bpmnElement="Flow_02yveoj">
+        <di:waypoint x="695" y="180" />
+        <di:waypoint x="745" y="180" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0sb70bv_di" bpmnElement="Flow_0sb70bv">
-        <di:waypoint x="1108" y="440" />
-        <di:waypoint x="1200" y="440" />
-        <di:waypoint x="1200" y="385" />
+      <bpmndi:BPMNEdge id="Flow_0uyhw70_di" bpmnElement="Flow_0uyhw70">
+        <di:waypoint x="795" y="180" />
+        <di:waypoint x="828" y="180" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1qn1bcu_di" bpmnElement="Flow_1qn1bcu">
-        <di:waypoint x="460" y="265" />
-        <di:waypoint x="460" y="360" />
-        <di:waypoint x="530" y="360" />
+      <bpmndi:BPMNEdge id="Flow_1epm5e3_di" bpmnElement="Flow_1epm5e3">
+        <di:waypoint x="770" y="205" />
+        <di:waypoint x="770" y="290" />
+        <di:waypoint x="828" y="290" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0faz7g4_di" bpmnElement="Flow_0faz7g4">
-        <di:waypoint x="460" y="215" />
-        <di:waypoint x="460" y="120" />
-        <di:waypoint x="530" y="120" />
+      <bpmndi:BPMNEdge id="Flow_0ns2ijx_di" bpmnElement="HasSendError">
+        <di:waypoint x="670" y="205" />
+        <di:waypoint x="670" y="390" />
+        <di:waypoint x="1199" y="390" />
+        <di:waypoint x="1199" y="205" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="679" y="373" width="72" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_097xx9e_di" bpmnElement="Flow_097xx9e">
+        <di:waypoint x="1139" y="180" />
+        <di:waypoint x="1174" y="180" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0gkh900_di" bpmnElement="Flow_0gkh900">
+        <di:waypoint x="1014" y="290" />
+        <di:waypoint x="1199" y="290" />
+        <di:waypoint x="1199" y="205" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0pq3j9e_di" bpmnElement="Flow_0pq3j9e">
+        <di:waypoint x="864" y="290" />
+        <di:waypoint x="914" y="290" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0adxuc3_di" bpmnElement="Flow_0adxuc3">
-        <di:waypoint x="1225" y="360" />
-        <di:waypoint x="1260" y="360" />
-        <di:waypoint x="1260" y="265" />
+      <bpmndi:BPMNEdge id="Flow_02h2l8y_di" bpmnElement="Flow_02h2l8y">
+        <di:waypoint x="864" y="180" />
+        <di:waypoint x="914" y="180" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1oq6cy1_di" bpmnElement="Flow_1oq6cy1">
+        <di:waypoint x="1014" y="180" />
+        <di:waypoint x="1039" y="180" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0qr31l0_di" bpmnElement="Flow_0qr31l0">
+        <di:waypoint x="1224" y="180" />
+        <di:waypoint x="1251" y="180" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_11k77gx_di" bpmnElement="SequenceFlow_11k77gx">
+        <di:waypoint x="218" y="200" />
+        <di:waypoint x="290" y="200" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_05069oz_di" bpmnElement="Flow_05069oz">
-        <di:waypoint x="630" y="120" />
-        <di:waypoint x="1260" y="120" />
-        <di:waypoint x="1260" y="215" />
+      <bpmndi:BPMNEdge id="Flow_0j3kdv8_di" bpmnElement="Flow_0j3kdv8">
+        <di:waypoint x="390" y="200" />
+        <di:waypoint x="435" y="200" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_00sw3oh_di" bpmnElement="Flow_00sw3oh">
-        <di:waypoint x="1285" y="240" />
-        <di:waypoint x="1342" y="240" />
+      <bpmndi:BPMNEdge id="Flow_08iflnw_di" bpmnElement="Flow_08iflnw">
+        <di:waypoint x="1375" y="200" />
+        <di:waypoint x="1432" y="200" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadMeasureReportTest.java b/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadMeasureReportTest.java
index 66eae5b..dd78618 100644
--- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadMeasureReportTest.java
+++ b/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadMeasureReportTest.java
@@ -111,6 +111,6 @@ public void testDoExecute() throws Exception {
 
         service.execute(execution);
 
-        verify(execution).setVariable(VARIABLE_MEASURE_REPORT, measureReport);
+        verify(execution).setVariableLocal(VARIABLE_MEASURE_REPORT, measureReport);
     }
 }
diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreLiveResultTest.java b/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreLiveResultTest.java
index 3a9ae1d..19d6530 100644
--- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreLiveResultTest.java
+++ b/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreLiveResultTest.java
@@ -77,8 +77,7 @@ public void testDoExecute_MeasureReportReferenceIsAddedToTask() throws Exception
         IdType measureReportId = new IdType("e26daf2d-2d55-4f23-a7c8-4b994e3a319e");
         report.setIdElement(measureReportId);
         TaskOutputComponent taskOutputComponent = new TaskOutputComponent();
-        when(variables.getResource(VARIABLE_MEASURE_REPORT))
-                .thenReturn(measureReport);
+        when(execution.getVariableLocal(VARIABLE_MEASURE_REPORT)).thenReturn(measureReport);
         when(client.create(any(MeasureReport.class))).thenReturn(report);
         when(taskHelper.createOutput(refCaptor.capture(), eq(CODESYSTEM_FEASIBILITY), eq(CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REFERENCE)))
                 .thenReturn(taskOutputComponent);
@@ -91,8 +90,7 @@ public void testDoExecute_MeasureReportReferenceIsAddedToTask() throws Exception
 
     @Test
     public void testDoExecute_MeasureReportIsStored() throws Exception {
-        when(variables.getResource(VARIABLE_MEASURE_REPORT))
-                .thenReturn(measureReport);
+        when(execution.getVariableLocal(VARIABLE_MEASURE_REPORT)).thenReturn(measureReport);
         when(taskHelper.createOutput(refCaptor.capture(), eq(CODESYSTEM_FEASIBILITY), eq(CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REFERENCE)))
                 .thenReturn(new TaskOutputComponent());
         when(client.create(measureReportCaptor.capture())).thenReturn(measureReport);