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.
 									}
 								}