diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/DataTransferChannel.java b/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/DataTransferChannel.java
index d21cc49..61ab485 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/DataTransferChannel.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/DataTransferChannel.java
@@ -414,32 +414,13 @@
 		
 		// Calculate message constraints from input state transitions
 		for (ChannelMember inputMember: getInputChannelMembers()) {
-			Expression curInputStateAccessor = null;
-			Expression nextInputStateAccessor = null;
-			if (inputResourceToStateAccessor == null) {
-				curInputStateAccessor = stateAccessor.getCurrentStateAccessorFor(inputMember, targetMember);
-				nextInputStateAccessor = stateAccessor.getNextStateAccessorFor(inputMember, targetMember);
-			} else {
-				curInputStateAccessor = inputResourceToStateAccessor.get(inputMember).getCurrentStateAccessorFor(inputMember, targetMember);
-				nextInputStateAccessor = inputResourceToStateAccessor.get(inputMember).getNextStateAccessorFor(inputMember, targetMember);
-			}
-			Set<Position> substitutedPositionsInMessage = new HashSet<>();
-			Expression messageConstraintByInput = inputMember.getStateTransition().deriveMessageConstraintFor(curInputStateAccessor, nextInputStateAccessor, substitutedPositionsInMessage);
-			if (substitutedPositionsInMessage.size() > 0) substitutedPositionsInMessageFromChannels.put(inputMember, substitutedPositionsInMessage);
+			Expression messageConstraintByInput = calcMessageConstraintForInputMember(inputMember, targetMember, stateAccessor, inputResourceToStateAccessor, substitutedPositionsInMessageFromChannels);
 			messageConstraints.add((Term) messageConstraintByInput);
 		}
 
 		// Calculate message constraints from reference state transitions
 		for (ChannelMember referenceMember: getReferenceChannelMembers()) {
-			Expression curInputStateAccessor = null;
-			if (inputResourceToStateAccessor == null) {
-				curInputStateAccessor = stateAccessor.getCurrentStateAccessorFor(referenceMember, targetMember);
-			} else {
-				curInputStateAccessor = inputResourceToStateAccessor.get(referenceMember).getCurrentStateAccessorFor(referenceMember, targetMember);
-			}
-			Set<Position> substitutedPositions = new HashSet<>();
-			Expression messageConstraintByReference = referenceMember.getStateTransition().deriveMessageConstraintFor(curInputStateAccessor, substitutedPositions);
-			if (substitutedPositions.size() > 0) substitutedPositionsInMessageFromChannels.put(referenceMember, substitutedPositions);
+			Expression messageConstraintByReference = calcMessageConstraintForReferenceMember(referenceMember, targetMember, stateAccessor, inputResourceToStateAccessor, substitutedPositionsInMessageFromChannels);
 			messageConstraints.add((Term) messageConstraintByReference);
 		}
 
@@ -457,6 +438,39 @@
 		}
 		return unifiedMessage;
 	}
+
+	public Expression calcMessageConstraintForInputMember(ChannelMember inputMember, ChannelMember targetMember, IResourceStateAccessor stateAccessor, 
+			Map<ChannelMember, IResourceStateAccessor> inputResourceToStateAccessor, Map<ChannelMember, Set<Position>> substitutedPositionsInMessageFromChannels)
+			throws InvalidMessage, ResolvingMultipleDefinitionIsFutureWork {
+		Expression curInputStateAccessor = null;
+		Expression nextInputStateAccessor = null;
+		if (inputResourceToStateAccessor == null) {
+			curInputStateAccessor = stateAccessor.getCurrentStateAccessorFor(inputMember, targetMember);
+			nextInputStateAccessor = stateAccessor.getNextStateAccessorFor(inputMember, targetMember);
+		} else {
+			curInputStateAccessor = inputResourceToStateAccessor.get(inputMember).getCurrentStateAccessorFor(inputMember, targetMember);
+			nextInputStateAccessor = inputResourceToStateAccessor.get(inputMember).getNextStateAccessorFor(inputMember, targetMember);
+		}
+		Set<Position> substitutedPositionsInMessage = new HashSet<>();
+		Expression messageConstraintByInput = inputMember.getStateTransition().deriveMessageConstraintFor(curInputStateAccessor, nextInputStateAccessor, substitutedPositionsInMessage);
+		if (substitutedPositionsInMessage.size() > 0) substitutedPositionsInMessageFromChannels.put(inputMember, substitutedPositionsInMessage);
+		return messageConstraintByInput;
+	}
+
+	public Expression calcMessageConstraintForReferenceMember(ChannelMember referenceMember, ChannelMember targetMember, IResourceStateAccessor stateAccessor,
+			Map<ChannelMember, IResourceStateAccessor> inputResourceToStateAccessor, Map<ChannelMember, Set<Position>> substitutedPositionsInMessageFromChannels)
+			throws InvalidMessage, ResolvingMultipleDefinitionIsFutureWork {
+		Expression curInputStateAccessor = null;
+		if (inputResourceToStateAccessor == null) {
+			curInputStateAccessor = stateAccessor.getCurrentStateAccessorFor(referenceMember, targetMember);
+		} else {
+			curInputStateAccessor = inputResourceToStateAccessor.get(referenceMember).getCurrentStateAccessorFor(referenceMember, targetMember);
+		}
+		Set<Position> substitutedPositions = new HashSet<>();
+		Expression messageConstraintByReference = referenceMember.getStateTransition().deriveMessageConstraintFor(curInputStateAccessor, substitutedPositions);
+		if (substitutedPositions.size() > 0) substitutedPositionsInMessageFromChannels.put(referenceMember, substitutedPositions);
+		return messageConstraintByReference;
+	}
 	
 	/**
 	 * Get depended channel members and their positions in the message.
@@ -469,14 +483,18 @@
 		for (ChannelMember inputMember: getInputChannelMembers()) {
 			Set<Position> substitutedPositionsInMessage = new HashSet<>();
 			Expression messageTerm = inputMember.getStateTransition().getMessageExpression();
+			Expression curStateTerm = inputMember.getStateTransition().getCurStateExpression();
+			Expression nextStateTerm = inputMember.getStateTransition().getNextStateExpression();
 			HashMap<Position, Variable> messageVars = messageTerm.getVariables();
 			for (Entry<Position, Variable> varEnt: messageVars.entrySet()) {
 				Variable var = varEnt.getValue();
-				if (messageTerm instanceof Term) {
-					substitutedPositionsInMessage.add(varEnt.getKey());
-				} else if (messageTerm instanceof Variable) {
-					if (messageTerm.equals(var)) {
-						substitutedPositionsInMessage.add(new Position());
+				if (curStateTerm.getVariables().values().contains(var) || nextStateTerm.getVariables().values().contains(var)) {
+					if (messageTerm instanceof Term) {
+						substitutedPositionsInMessage.add(varEnt.getKey());
+					} else if (messageTerm instanceof Variable) {
+						if (messageTerm.equals(var)) {
+							substitutedPositionsInMessage.add(new Position());
+						}
 					}
 				}
 			}
@@ -487,14 +505,18 @@
 		for (ChannelMember referenceMember: getReferenceChannelMembers()) {
 			Set<Position> substitutedPositionsInMessage = new HashSet<>();
 			Expression messageTerm = referenceMember.getStateTransition().getMessageExpression();
+			Expression curStateTerm = referenceMember.getStateTransition().getCurStateExpression();
+			Expression nextStateTerm = referenceMember.getStateTransition().getNextStateExpression();
 			HashMap<Position, Variable> messageVars = messageTerm.getVariables();
 			for (Entry<Position, Variable> varEnt: messageVars.entrySet()) {
 				Variable var = varEnt.getValue();
-				if (messageTerm instanceof Term) {
-					substitutedPositionsInMessage.add(varEnt.getKey());
-				} else if (messageTerm instanceof Variable) {
-					if (messageTerm.equals(var)) {
-						substitutedPositionsInMessage.add(new Position());
+				if (curStateTerm.getVariables().values().contains(var) || nextStateTerm.getVariables().values().contains(var)) {
+					if (messageTerm instanceof Term) {
+						substitutedPositionsInMessage.add(varEnt.getKey());
+					} else if (messageTerm instanceof Variable) {
+						if (messageTerm.equals(var)) {
+							substitutedPositionsInMessage.add(new Position());
+						}
 					}
 				}
 			}
@@ -503,7 +525,7 @@
 		return channelMembersMessageDependsOn;
 	}
 
-	private ResourcePath fillOutsideResourcePath(ResourcePath resource, Term unifiedMessage, Expression messageTerm, Set<Position> dependingVarPosInMessage) 
+	public ResourcePath fillOutsideResourcePath(ResourcePath resource, Term unifiedMessage, Expression messageTerm, Set<Position> dependingVarPosInMessage) 
 			throws ResolvingMultipleDefinitionIsFutureWork {
 		ResourcePath filledResourcePath = new ResourcePath(resource);