diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
index b91cf6e..825564e 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
@@ -367,4 +367,28 @@
 			}
 		};
 	}
+	
+	protected IResourceStateAccessor getRefAccessor() {
+		return new IResourceStateAccessor() {
+			@Override
+			public Expression getCurrentStateAccessorFor(ResourcePath target, ResourcePath from) {
+				if (target.equals(from)) {
+					return new Field(fieldOfResourceState,
+							target.getResourceStateType() != null ? target.getResourceStateType()
+									: DataConstraintModel.typeInt);
+				}
+				// for reference channel member
+				return new Parameter(target.getResourceName(),
+						target.getResourceStateType() != null ? target.getResourceStateType()
+								: DataConstraintModel.typeInt);
+			}
+
+			@Override
+			public Expression getNextStateAccessorFor(ResourcePath target, ResourcePath from) {
+				return new Parameter(target.getResourceName(),
+						target.getResourceStateType() != null ? target.getResourceStateType()
+								: DataConstraintModel.typeInt);
+			}
+		};
+	}
 }
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromControlFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromControlFlowGraph.java
index ecf958d..2455f04 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromControlFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromControlFlowGraph.java
@@ -608,7 +608,21 @@
 							if (passedResPaths.contains(in.getResource())) {
 								for (ChannelMember out: re.getChannel().getOutputChannelMembers()) {
 									if (out.getResource().equals(resourceNode.getResource())) {
-										Expression updateExp = re.getChannel().deriveUpdateExpressionOf(out, getPushAccessor());
+										Expression updateExp = null;
+										if (re.getChannel().getReferenceChannelMembers().size() == 0) {
+											updateExp = re.getChannel().deriveUpdateExpressionOf(out, getPushAccessor());
+										} else {
+											// if there exists one or more reference channel member.
+											HashMap<ResourcePath, IResourceStateAccessor> inputResourceToStateAccessor = new HashMap<>();
+											for (Edge eIn: resourceNode.getInEdges()) {
+												DataFlowEdge dIn = (DataFlowEdge) eIn;
+												inputResourceToStateAccessor.put(((ResourceNode) dIn.getSource()).getResource(), getPushAccessor());
+											}
+											for (ChannelMember c: re.getChannel().getReferenceChannelMembers()) {
+												inputResourceToStateAccessor.put(c.getResource(), getRefAccessor());
+											}
+											updateExp = re.getChannel().deriveUpdateExpressionOf(out, getPushAccessor(), inputResourceToStateAccessor);
+										}
 										String[] sideEffects = new String[] {""};
 										String curState = updateExp.toImplementation(sideEffects);
 										String updateStatement;
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index 187e2e2..285af81 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -201,9 +201,23 @@
 				// Add a statement to update the state field
 				if (((StoreAttribute) resourceNode.getAttribute()).isStored()) {
 					try {
-						for (ChannelMember out: re.getChannel().getOutputChannelMembers()) {
+						for (ChannelMember out: ch.getOutputChannelMembers()) {
 							if (out.getResource().equals(resourceNode.getResource())) {
-								Expression updateExp = re.getChannel().deriveUpdateExpressionOf(out, getPushAccessor());
+								Expression updateExp = null;
+								if (ch.getReferenceChannelMembers().size() == 0) {
+									updateExp = ch.deriveUpdateExpressionOf(out, getPushAccessor());
+								} else {
+									// if there exists one or more reference channel member.
+									HashMap<ResourcePath, IResourceStateAccessor> inputResourceToStateAccessor = new HashMap<>();
+									for (Edge eIn: resourceNode.getInEdges()) {
+										DataFlowEdge dIn = (DataFlowEdge) eIn;
+										inputResourceToStateAccessor.put(((ResourceNode) dIn.getSource()).getResource(), getPushAccessor());
+									}
+									for (ChannelMember c: ch.getReferenceChannelMembers()) {
+										inputResourceToStateAccessor.put(c.getResource(), getRefAccessor());
+									}
+									updateExp = ch.deriveUpdateExpressionOf(out, getPushAccessor(), inputResourceToStateAccessor);
+								}
 								String[] sideEffects = new String[] {""};
 								String curState = updateExp.toImplementation(sideEffects);
 								String updateStatement;
@@ -253,7 +267,7 @@
 						List<String> params = new ArrayList<>();
 						params.add(langSpec.getFieldAccessor(fieldOfResourceState));
 						Set<ResourcePath> referredSet = referredResources.get(update);
-						for (ChannelMember rc: re.getChannel().getReferenceChannelMembers()) {
+						for (ChannelMember rc: dOut.getChannel().getReferenceChannelMembers()) {
 							// to get the value of reference member.
 							ResourcePath ref = rc.getResource();
 							if (referredSet == null) {
@@ -268,7 +282,7 @@
 									String[] sideEffects = new String[] {""};
 									String refExp = refGetter.toImplementation(sideEffects);
 									String refTypeName = ref.getResourceStateType().getInterfaceTypeName();
-									update.addFirstStatement(sideEffects[0] + langSpec.getVariableDeclaration(refTypeName, refVarName) + langSpec.getAssignment() + refExp + langSpec.getStatementDelimiter());
+									update.addStatement(sideEffects[0] + langSpec.getVariableDeclaration(refTypeName, refVarName) + langSpec.getAssignment() + refExp + langSpec.getStatementDelimiter());
 								}
 								params.add(refVarName);
 							}
@@ -379,7 +393,7 @@
 								List<String> params = new ArrayList<>();
 								params.add(langSpec.getFieldAccessor(fieldOfResourceState));
 								Set<ResourcePath> referredSet = referredResources.get(input);
-								for (ChannelMember rc: ((DataTransferChannel) ch).getReferenceChannelMembers()) {
+								for (ChannelMember rc: dOut.getChannel().getReferenceChannelMembers()) {
 									// to get the value of reference member.
 									ResourcePath ref = rc.getResource();
 									if (referredSet == null) {
@@ -394,7 +408,7 @@
 											String[] sideEffects = new String[] {""};
 											String refExp = refGetter.toImplementation(sideEffects);
 											String refTypeName = ref.getResourceStateType().getInterfaceTypeName();
-											input.addFirstStatement(sideEffects[0] + langSpec.getVariableDeclaration(refTypeName, refVarName) + langSpec.getAssignment() + refExp + langSpec.getStatementDelimiter());
+											input.addStatement(sideEffects[0] + langSpec.getVariableDeclaration(refTypeName, refVarName) + langSpec.getAssignment() + refExp + langSpec.getStatementDelimiter());
 										}
 										params.add(refVarName);
 									}
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
index 6e63cee..e940b89 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
@@ -473,4 +473,25 @@
 			return getter;
 		}
 	};
+	static public IResourceStateAccessor refAccessor = new IResourceStateAccessor() {
+		@Override
+		public Expression getCurrentStateAccessorFor(ResourcePath target, ResourcePath from) {
+			if (target.equals(from)) {
+				return new Field("value",
+						target.getResourceStateType() != null ? target.getResourceStateType()
+								: DataConstraintModel.typeInt);
+			}
+			// for reference channel member
+			return new Parameter(target.getResourceName(),
+					target.getResourceStateType() != null ? target.getResourceStateType()
+							: DataConstraintModel.typeInt);
+		}
+
+		@Override
+		public Expression getNextStateAccessorFor(ResourcePath target, ResourcePath from) {
+			return new Parameter(target.getResourceName(),
+					target.getResourceStateType() != null ? target.getResourceStateType()
+							: DataConstraintModel.typeInt);
+		}
+	};
 }
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
index 3f8696c..63e7516 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
@@ -65,14 +65,28 @@
 							MethodDeclaration update = getUpdateMethod(dstType, srcType);
 							if (((StoreAttribute) dst.getAttribute()).isStored()) {
 								// update stored state of dst side resource (when every incoming edge is in push style)
-								Expression updateExp = d.getChannel().deriveUpdateExpressionOf(out, JavaCodeGenerator.pushAccessor);									
+								Expression updateExp = null;
+								if (d.getChannel().getReferenceChannelMembers().size() == 0) {
+									updateExp = d.getChannel().deriveUpdateExpressionOf(out, JavaCodeGenerator.pushAccessor);									
+								} else {
+									// if there exists one or more reference channel member.
+									HashMap<ResourcePath, IResourceStateAccessor> inputResourceToStateAccessor = new HashMap<>();
+									for (Edge eIn: dst.getInEdges()) {
+										DataFlowEdge dIn = (DataFlowEdge) eIn;
+										inputResourceToStateAccessor.put(((ResourceNode) dIn.getSource()).getResource(), JavaCodeGenerator.pushAccessor);
+									}
+									for (ChannelMember c: d.getChannel().getReferenceChannelMembers()) {
+										inputResourceToStateAccessor.put(c.getResource(), JavaCodeGenerator.refAccessor);
+									}
+									updateExp = d.getChannel().deriveUpdateExpressionOf(out, JavaCodeGenerator.pushAccessor, inputResourceToStateAccessor);
+								}
 								String[] sideEffects = new String[] {""};
 								String curState = updateExp.toImplementation(sideEffects);
 								String updateStatement;
 								if (updateExp instanceof Term && ((Term) updateExp).getSymbol().isImplWithSideEffect()) {
 									updateStatement = sideEffects[0];
 								} else {
-									updateStatement = sideEffects[0] + "value = " + curState + ";";
+									updateStatement = sideEffects[0] + "this.value = " + curState + ";";
 								}
 								if (update.getBody() == null || !update.getBody().getStatements().contains(updateStatement)) {
 									update.addFirstStatement(updateStatement);
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
index 98bf8eb..2405c20 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
@@ -165,7 +165,7 @@
 								params.add(param);
 							}
 							MethodDeclaration input = new MethodDeclaration(
-									((Term) cm.getStateTransition().getMessageExpression()).getSymbol().getImplName(),
+									((Term) message).getSymbol().getImplName(),
 									false, typeVoid, params);
 							if (cm.getStateTransition().isRightUnary()) {
 								input.addAnnotation(new Annotation("PUT"));
@@ -175,7 +175,7 @@
 							type.addMethod(input);
 						} else if (message instanceof Variable) {
 							MethodDeclaration input = new MethodDeclaration(
-									((Variable) cm.getStateTransition().getMessageExpression()).getName(),
+									((Variable) message).getName(),
 									false, typeVoid, null);
 							if (cm.getStateTransition().isRightUnary()) {
 								input.addAnnotation(new Annotation("PUT"));
@@ -359,4 +359,25 @@
 							: DataConstraintModel.typeInt);
 		}
 	};
+	static public IResourceStateAccessor refAccessor = new IResourceStateAccessor() {
+		@Override
+		public Expression getCurrentStateAccessorFor(ResourcePath target, ResourcePath from) {
+			if (target.equals(from)) {
+				return new Field("value",
+						target.getResourceStateType() != null ? target.getResourceStateType()
+								: DataConstraintModel.typeInt);
+			}
+			// for reference channel member
+			return new Parameter(target.getResourceName(),
+					target.getResourceStateType() != null ? target.getResourceStateType()
+							: DataConstraintModel.typeInt);
+		}
+
+		@Override
+		public Expression getNextStateAccessorFor(ResourcePath target, ResourcePath from) {
+			return new Parameter(target.getResourceName(),
+					target.getResourceStateType() != null ? target.getResourceStateType()
+							: DataConstraintModel.typeInt);
+		}
+	};
 }
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
index d4bdbf2..1a4b1c6 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
@@ -82,7 +82,7 @@
 										inputResourceToStateAccessor.put(((ResourceNode) dIn.getSource()).getResource(), JerseyCodeGenerator.pushAccessor);
 									}
 									for (ChannelMember c: d.getChannel().getReferenceChannelMembers()) {
-										inputResourceToStateAccessor.put(c.getResource(), JerseyCodeGenerator.pullAccessor);
+										inputResourceToStateAccessor.put(c.getResource(), JerseyCodeGenerator.refAccessor);
 									}
 									updateExp = d.getChannel().deriveUpdateExpressionOf(out, JerseyCodeGenerator.pushAccessor, inputResourceToStateAccessor);
 								}