diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index 6644f1b..5c7a65b 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -279,7 +279,7 @@
 			// Check if the input resource is outside of the channel scope.
 			boolean outsideInputResource = false;
 			for (ChannelMember cm: ch.getInputChannelMembers()) {
-				if (cm.getResource().getResourceHierarchy().equals(resourceNode.getResourceHierarchy()) && cm.isOutside()) {
+				if (cm.getResource().equals(resourceNode.getOutSideResource()) && cm.isOutside()) {
 					outsideInputResource = true;	// Regarded as pull transfer.
 					break;
 				}
@@ -290,7 +290,7 @@
 					// Check if the output resource is outside of the channel scope.
 					boolean outsideOutputResource = false;
 					for (ChannelMember cm: ch.getOutputChannelMembers()) {
-						if (cm.getResource().getResourceHierarchy().equals(dstRes) && cm.isOutside()) {
+						if (((ResourceNode) chToRes.getDestination()).getInSideResources().contains(cm.getResource()) && cm.isOutside()) {
 							outsideOutputResource = true;	// Regarded as push transfer.
 							break;
 						}
@@ -319,7 +319,7 @@
 				// Check if the input resource is outside of the channel scope.
 				boolean outsideInputResource = false;
 				for (ChannelMember cm: ch.getInputChannelMembers()) {
-					if (cm.getResource().getResourceHierarchy().equals(srcRes) && cm.isOutside()) {
+					if (cm.getResource().equals(((ResourceNode) resToCh.getSource()).getOutSideResource()) && cm.isOutside()) {
 						outsideInputResource = true;	// Regarded as pull transfer.
 						break;
 					}
@@ -327,7 +327,7 @@
 				// Check if the output resource is outside of the channel scope.
 				boolean outsideOutputResource = false;
 				for (ChannelMember cm: ch.getOutputChannelMembers()) {
-					if (cm.getResource().getResourceHierarchy().equals(resourceNode.getOutSideResource().getResourceHierarchy()) && cm.isOutside()) {
+					if (resourceNode.getInSideResources().contains(cm.getResource()) && cm.isOutside()) {
 						outsideOutputResource = true;	// Regarded as push transfer.
 						break;
 					}
@@ -402,7 +402,7 @@
 			// Check if the source resource is outside of the channel scope.
 			boolean outsideInputResource = false;
 			for (ChannelMember cm: ch.getInputChannelMembers()) {
-				if (cm.getResource().getResourceHierarchy().equals(resourceNode.getResourceHierarchy()) && cm.isOutside()) {
+				if (cm.getResource().equals(resourceNode.getOutSideResource()) && cm.isOutside()) {
 					outsideInputResource = true;	// Regarded as pull transfer.
 					break;
 				}
@@ -413,7 +413,7 @@
 					// Check if the destination resource is outside of the channel scope.
 					boolean outsideOutputResource = false;
 					for (ChannelMember cm: ch.getOutputChannelMembers()) {
-						if (cm.getResource().getResourceHierarchy().equals(dstRes.getResourceHierarchy()) && cm.isOutside()) {
+						if (((ResourceNode) chToRes.getDestination()).getInSideResources().contains(cm.getResource()) && cm.isOutside()) {
 							outsideOutputResource = true;	// Regarded as push transfer.
 							break;
 						}
@@ -494,7 +494,7 @@
 				// Check if the source resource is outside of the channel scope.
 				boolean outsideInputResource = false;
 				for (ChannelMember cm: ch.getInputChannelMembers()) {
-					if (cm.getResource().getResourceHierarchy().equals(srcRes.getResourceHierarchy()) && cm.isOutside()) {
+					if (cm.getResource().equals(srcRes) && cm.isOutside()) {
 						outsideInputResource = true;	// Regarded as pull transfer.
 						break;
 					}
@@ -502,7 +502,7 @@
 				// Check if the output resource is outside of the channel scope.
 				boolean outsideOutputResource = false;
 				for (ChannelMember cm: ch.getOutputChannelMembers()) {
-					if (cm.getResource().getResourceHierarchy().equals(resourceNode.getOutSideResource().getResourceHierarchy()) && cm.isOutside()) {
+					if (resourceNode.getInSideResources().contains(cm.getResource()) && cm.isOutside()) {
 						outsideOutputResource = true;	// Regarded as push transfer.
 						break;
 					}
@@ -756,12 +756,20 @@
 				// Check if the input resource is outside of the channel scope.
 				boolean outsideInputResource = false;
 				for (ChannelMember cm: ch.getInputChannelMembers()) {
-					if (cm.getResource().getResourceHierarchy().equals(srcRes.getResourceHierarchy()) && cm.isOutside()) {
+					if (cm.getResource().equals(srcRes) && cm.isOutside()) {
 						outsideInputResource = true;	// Regarded as pull transfer.
 						break;
 					}
 				}
-				if (((PushPullAttribute) re.getAttribute()).getOptions().get(0) == PushPullValue.PUSH && !outsideInputResource) {
+				// Check if the output resource is outside of the channel scope.
+				boolean outsideOutputResource = false;
+				for (ChannelMember cm: ch.getOutputChannelMembers()) {
+					if (resourceNode.getInSideResources().contains(cm.getResource()) && cm.isOutside()) {
+						outsideOutputResource = true;	// Regarded as push transfer.
+						break;
+					}
+				}
+				if ((((PushPullAttribute) re.getAttribute()).getOptions().get(0) == PushPullValue.PUSH && !outsideInputResource) || outsideOutputResource) {
 					// for push data transfer
 					
 					// Declare an update method in the type of the destination resource.
@@ -969,7 +977,7 @@
 						for (ChannelMember cm: ch2.getInputChannelMembers()) {
 							if (cm.isOutside()) {
 								outsideInputMembers2.add(cm);
-								if (cm.getResource().getResourceHierarchy().equals(resourceNode.getResourceHierarchy())) {
+								if (cm.getResource().equals(resourceNode.getOutSideResource())) {
 									outsideInputResource2 = true;	// Regarded as pull transfer.
 								}
 							}
@@ -1416,7 +1424,7 @@
 							for (ChannelMember cm: ch2.getInputChannelMembers()) {
 								if (cm.isOutside()) {
 									outsideInputMembers2.add(cm);
-									if (cm.getResource().getResourceHierarchy().equals(resourceNode.getResourceHierarchy())) {
+									if (cm.getResource().equals(resourceNode.getOutSideResource())) {
 										outsideInputResource2 = true;	// Regarded as pull transfer.
 									}
 								}
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
index 7204b95..502b883 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
@@ -352,7 +352,7 @@
 						// Check if the input resource is outside of the channel scope.
 						boolean outsideInputResource = false;
 						for (ChannelMember cm: ch.getInputChannelMembers()) {
-							if (cm.getResource().getResourceHierarchy().equals(srcRes.getResourceHierarchy()) && cm.isOutside()) {
+							if (cm.getResource().equals(srcRes) && cm.isOutside()) {
 								outsideInputResource = true;	// Regarded as pull transfer.
 								break;
 							}
@@ -360,7 +360,7 @@
 						// Check if the output resource is outside of the channel scope.
 						boolean outsideOutputResource = false;
 						for (ChannelMember cm: ch.getOutputChannelMembers()) {
-							if (cm.getResource().getResourceHierarchy().equals(resourceNode.getResourceHierarchy()) && cm.isOutside()) {
+							if (resourceNode.getInSideResources().contains(cm.getResource()) && cm.isOutside()) {
 								outsideOutputResource = true;	// Regarded as push transfer.
 								break;
 							}
@@ -442,7 +442,7 @@
 				// Check if the input resource is outside of the channel scope.
 				boolean outsideInputResource = false;
 				for (ChannelMember cm: ch.getInputChannelMembers()) {
-					if (cm.getResource().getResourceHierarchy().equals(resourceNode.getResourceHierarchy()) && cm.isOutside()) {
+					if (cm.getResource().equals(resourceNode.getOutSideResource()) && cm.isOutside()) {
 						outsideInputResource = true;	// Regarded as pull transfer.
 						break;
 					}
@@ -452,7 +452,7 @@
 					// Check if the output resource is outside of the channel scope.
 					boolean outsideOutputResource = false;
 					for (ChannelMember cm: ch.getOutputChannelMembers()) {
-						if (cm.getResource().getResourceHierarchy().equals(dstRes.getResourceHierarchy()) && cm.isOutside()) {
+						if (((ResourceNode) chToRes.getDestination()).getInSideResources().contains(cm.getResource()) && cm.isOutside()) {
 							outsideOutputResource = true;	// Regarded as push transfer.
 							break;
 						}
@@ -514,7 +514,7 @@
 					// Check if the input resource is outside of the channel scope.
 					boolean outsideInputResource = false;
 					for (ChannelMember cm: ch.getInputChannelMembers()) {
-						if (cm.getResource().getResourceHierarchy().equals(srcRes.getResourceHierarchy()) && cm.isOutside()) {
+						if (cm.getResource().equals(srcRes) && cm.isOutside()) {
 							outsideInputResource = true;	// Regarded as pull transfer.
 							break;
 						}
@@ -522,7 +522,7 @@
 					// Check if the output resource is outside of the channel scope.
 					boolean outsideOutputResource = false;
 					for (ChannelMember cm: ch.getOutputChannelMembers()) {
-						if (cm.getResource().getResourceHierarchy().equals(resourceNode.getOutSideResource().getResourceHierarchy()) && cm.isOutside()) {
+						if (resourceNode.getInSideResources().contains(cm.getResource()) && cm.isOutside()) {
 							outsideOutputResource = true;	// Regarded as push transfer.
 							break;
 						}
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
index dd01240..88e747f 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
@@ -281,21 +281,20 @@
 					DataTransferChannel ch = ((ChannelNode) re.getDestination()).getChannel();
 					for (Edge chToRes: re.getDestination().getOutEdges()) {
 						ResourcePath dstRes = ((ResourceNode) chToRes.getDestination()).getOutSideResource();
+						// Check if the output resource is outside of the channel scope.
 						boolean outsideOutputResource = false;
 						for (ChannelMember cm: ch.getOutputChannelMembers()) {
-							if (cm.getResource().getResourceHierarchy().equals(dstRes.getResourceHierarchy()) && cm.isOutside()) {
+							if (((ResourceNode) chToRes.getDestination()).getInSideResources().contains(cm.getResource()) && cm.isOutside()) {
 								outsideOutputResource = true;	// Regarded as push transfer.
 								break;
 							}
 						}
 						if (outsideOutputResource) {
 							// Declare a field in the parent component to refer to the destination resource of push transfer.
-							String dstResName = null;
-							if (generatesComponent(dstRes.getResourceHierarchy())) {
-								dstResName = getComponentName(dstRes.getResourceHierarchy());
-							} else {
-								dstResName = getComponentName(dstRes.getResourceHierarchy().getParent());
+							if (!generatesComponent(dstRes.getResourceHierarchy())) {
+								dstRes = dstRes.getParent();
 							}
+							String dstResName = getComponentName(dstRes.getResourceHierarchy());
 							if (resourceNode.getOutSideResource().getCommonPrefix(dstRes) == null && differentTreesAsDifferentServices) {
 								// Inter-service
 								if (!bDeclareClientField) {
@@ -307,8 +306,10 @@
 							} else {
 								// Inner-service
 								// Declare a field to directly refer to the destination resource of push transfer.
-								FieldDeclaration refFieldForPush = new FieldDeclaration(new Type(dstResName, dstResName), toVariableName(dstResName));
-								fields.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), refFieldForPush));
+								if (resourceNode.getParent().getResourceHierarchy() != dstRes.getResourceHierarchy()) {
+									FieldDeclaration refFieldForPush = new FieldDeclaration(new Type(dstResName, dstResName), toVariableName(dstResName));
+									fields.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), refFieldForPush));
+								}
 							}
 						}
 					}
@@ -318,21 +319,20 @@
 						DataFlowEdge re = (DataFlowEdge) resToCh;
 						ResourcePath srcRes = ((ResourceNode) re.getSource()).getOutSideResource();
 						DataTransferChannel ch = ((ChannelNode) re.getDestination()).getChannel();
+						// Check if the input resource is outside of the channel scope.
 						boolean outsideInputResource = false;
 						for (ChannelMember cm: ch.getInputChannelMembers()) {
-							if (cm.getResource().getResourceHierarchy().equals(srcRes.getResourceHierarchy()) && cm.isOutside()) {
+							if (cm.getResource().equals(srcRes) && cm.isOutside()) {
 								outsideInputResource = true;	// Regarded as pull transfer.
 								break;
 							}
 						}
 						if (outsideInputResource) {
 							// Declare a field in the parent component to refer to the source resource of pull transfer.
-							String srcResName = null;
-							if (generatesComponent(srcRes.getResourceHierarchy())) {
-								srcResName = getComponentName(srcRes.getResourceHierarchy());
-							} else {
-								srcResName = getComponentName(srcRes.getResourceHierarchy().getParent());
+							if (!generatesComponent(srcRes.getResourceHierarchy())) {
+								srcRes = srcRes.getParent();
 							}
+							String srcResName = getComponentName(srcRes.getResourceHierarchy());
 							if (resourceNode.getOutSideResource().getCommonPrefix(srcRes) == null && differentTreesAsDifferentServices) {
 								// Inter-service
 								if (!bDeclareClientField) {
@@ -344,10 +344,12 @@
 							} else {
 								// Inner-service								
 								// Declare a field to directly refer to the source resource of pull transfer.
-								FieldDeclaration refFieldForPull = new FieldDeclaration(new Type(srcResName, srcResName), toVariableName(srcResName));
-								fields.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), refFieldForPull));
-								noPullTransfer = false;
+								if (resourceNode.getParent().getResourceHierarchy() != srcRes.getResourceHierarchy()) {
+									FieldDeclaration refFieldForPull = new FieldDeclaration(new Type(srcResName, srcResName), toVariableName(srcResName));
+									fields.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), refFieldForPull));
+								}
 							}
+							noPullTransfer = false;
 						}
 					}
 				}
@@ -445,20 +447,20 @@
 				// Check if the input resource is outside of the channel scope.
 				boolean outsideInputResource = false;
 				for (ChannelMember cm: ch.getInputChannelMembers()) {
-					if (cm.getResource().getResourceHierarchy().equals(resourceNode.getResourceHierarchy()) && cm.isOutside()) {
+					if (cm.getResource().equals(resourceNode.getOutSideResource()) && cm.isOutside()) {
 						outsideInputResource = true;	// Regarded as pull transfer.
 						break;
 					}
 				}
-				if (!bDeclareClientField && ((PushPullAttribute) re.getAttribute()).getOptions().get(0) == PushPullValue.PUSH && !outsideInputResource) {
-					for (ChannelMember cm: ch.getOutputChannelMembers()) {
-						ResourcePath dstRes = cm.getResource();
-						String dstResName = null;
-						if (generatesComponent(dstRes.getResourceHierarchy())) {
-							dstResName = getComponentName(dstRes.getResourceHierarchy());
-						} else {
-							dstResName = getComponentName(dstRes.getResourceHierarchy().getParent());
+				for (ChannelMember cm: ch.getOutputChannelMembers()) {
+					ResourcePath dstRes = cm.getResource();
+					// Check if the output resource is outside of the channel scope.
+					boolean outsideOutputResource = cm.isOutside();
+					if (!bDeclareClientField && ((((PushPullAttribute) re.getAttribute()).getOptions().get(0) == PushPullValue.PUSH && !outsideInputResource) || outsideOutputResource)) {
+						if (!generatesComponent(dstRes.getResourceHierarchy())) {
+							dstRes = dstRes.getParent();
 						}
+						String dstResName = getComponentName(dstRes.getResourceHierarchy());
 						if (resourceNode.getOutSideResource().getCommonPrefix(dstRes) == null && differentTreesAsDifferentServices) {
 							// Inter-service
 							if (!bDeclareClientField) {
@@ -479,10 +481,14 @@
 							FieldDeclaration dstRefField = new FieldDeclaration(new Type(dstResName, dstResName), toVariableName(dstResName));
 							if (component != null) {
 								// A component is created for this resource.
-								component.addField(dstRefField);
+								if (resourceNode.getResourceHierarchy() != dstRes.getResourceHierarchy()) {
+									component.addField(dstRefField);
+								}
 							} else {
 								// No component is created for this resource.
-								fields.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), dstRefField));
+								if (resourceNode.getParent().getResourceHierarchy() != dstRes.getResourceHierarchy()) {
+									fields.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), dstRefField));
+								}
 							}
 						}
 					}
@@ -493,22 +499,26 @@
 					DataFlowEdge re = (DataFlowEdge) resToCh;
 					ResourcePath srcRes = ((ResourceNode) re.getSource()).getOutSideResource();
 					DataTransferChannel ch = ((ChannelNode) re.getDestination()).getChannel();
-					// Check if the input and output resources are outside of the channel scope.
+					// Check if the input resource is outside of the channel scope.
 					boolean outsideInputResource = false;
 					for (ChannelMember cm: ch.getInputChannelMembers()) {
-						if (cm.getResource().getResourceHierarchy().equals(srcRes.getResourceHierarchy()) && cm.isOutside()) {
+						if (cm.getResource().equals(srcRes) && cm.isOutside()) {
 							outsideInputResource = true;	// Regarded as pull transfer.
 							break;
 						}
 					}
+					// Check if the output resource is outside of the channel scope.
 					boolean outsideOutputResource = false;
 					for (ChannelMember cm: ch.getOutputChannelMembers()) {
-						if (cm.getResource().getResourceHierarchy().equals(resourceNode.getOutSideResource().getResourceHierarchy()) && cm.isOutside()) {
+						if (resourceNode.getInSideResources().contains(cm.getResource()) && cm.isOutside()) {
 							outsideOutputResource = true;	// Regarded as push transfer.
 							break;
 						}
 					}
 					String srcResName = getComponentName(srcRes.getResourceHierarchy());
+					if (!generatesComponent(srcRes.getResourceHierarchy())) {
+						srcRes = srcRes.getParent();
+					}
 					if ((((PushPullAttribute) re.getAttribute()).getOptions().get(0) != PushPullValue.PUSH && !outsideOutputResource) || outsideInputResource) {
 						if (resourceNode.getOutSideResource().getCommonPrefix(srcRes) == null && differentTreesAsDifferentServices) {
 							// Inter-service
@@ -530,10 +540,14 @@
 							FieldDeclaration srcRefField = new FieldDeclaration(new Type(srcResName, srcResName), toVariableName(srcResName));
 							if (component != null) {
 								// A component is created for this resource.
-								component.addField(srcRefField);
+								if (resourceNode.getResourceHierarchy() != srcRes.getResourceHierarchy()) {
+									component.addField(srcRefField);
+								}
 							} else {
 								// No component is created for this resource.
-								fields.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), srcRefField));
+								if (resourceNode.getParent().getResourceHierarchy() != srcRes.getResourceHierarchy()) {
+									fields.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), srcRefField));
+								}
 							}
 						}
 					} else {