diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/DataTransferChannel.java b/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/DataTransferChannel.java
index 11a9a09..97e50ce 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/DataTransferChannel.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/DataTransferChannel.java
@@ -21,7 +21,6 @@
 import models.dataConstraintModel.Channel;
 import models.dataConstraintModel.ChannelMember;
 import models.dataConstraintModel.ResourcePath;
-import simulator.Event;
 
 public class DataTransferChannel extends Channel {
 	protected Set<ChannelMember> inputChannelMembers = null;
@@ -246,13 +245,13 @@
 	 * @throws UnificationFailed
 	 * @throws ValueUndefined
 	 */
-	public Expression deriveUpdateExpressionOf(ChannelMember targetMember, Term message, IResourceStateAccessor stateAccessor, Event event) 
+	public Expression deriveUpdateExpressionOf(ChannelMember targetMember, Term message, IResourceStateAccessor stateAccessor, Map<Variable, Expression> selectorVariables) 
 			throws ParameterizedIdentifierIsFutureWork, ResolvingMultipleDefinitionIsFutureWork, InvalidMessage, UnificationFailed, ValueUndefined {
 		if (!getOutputChannelMembers().contains(targetMember)) return null;
 		
 		// Calculate the next state of target resource from the unified message and the current resource state
 		Expression curOutputStateAccessor = stateAccessor.getCurrentStateAccessorFor(targetMember, targetMember);
-		return targetMember.getStateTransition().deriveNextStateExpressionFor(curOutputStateAccessor, message, event.getSelectorVariables());
+		return targetMember.getStateTransition().deriveNextStateExpressionFor(curOutputStateAccessor, message, selectorVariables);
 	}
 	
 	/**
diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java b/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
index 1549bf7..657cc81 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
@@ -176,7 +176,7 @@
 				if (!event.isInput()) {
 					nextResState = channel.deriveUpdateExpressionOf(out, resouceStateAccessor).getKey();
 				} else {
-					nextResState = channel.deriveUpdateExpressionOf(out, (Term) event.getMessage(), resouceStateAccessor, event);
+					nextResState = channel.deriveUpdateExpressionOf(out, (Term) event.getMessage(), resouceStateAccessor, event.getSelectorVariables());
 				}
 				ResourceIdentifier outResId = event.getOutputResourceIdentifier(out.getResource());
 				if (nextResState instanceof Term) {