diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index a4b6fa6..80eabeb 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -1912,21 +1912,23 @@
 										if (!referredSet.contains(ref)) {
 											referredSet.add(ref);
 											String[] sideEffects = new String[] {""};
-											if (!platformSpec.isMonolithic() && rc.isOutside()) {
+											ResourcePath srcRes = in.getResource();
+											if (!generatesComponent(srcRes.getResourceHierarchy())) {
+												srcRes = srcRes.getParent();
+											}
+											if (!platformSpec.isMonolithic() 
+													&& (rc.isOutside() || (ref.getCommonPrefix(srcRes) == null && platformSpec.isDifferentTreesAsDifferentServices()))) {
 												List<String> pathParams = new ArrayList<>();
 												for (Expression pathExp: ref.getPathParams()) {
 													pathParams.add("\" + " + pathExp.toImplementation(sideEffects) + " + \"");
 												}
 												generatePullDataTransfer(update, refVarName, ref.getResourceHierarchy().toResourcePath(pathParams), refResourceType, false, platformSpec, langSpec);
 											} else {
-												ResourcePath srcRes = in.getResource();
-												if (!generatesComponent(srcRes.getResourceHierarchy())) {
-													srcRes = srcRes.getParent();
-												}
 												Expression refGetter = getPullAccessor(platformSpec).getDirectStateAccessorFor(ref, srcRes);
 												String refExp = refGetter.toImplementation(sideEffects);
 												String refTypeName = ref.getResourceStateType().getInterfaceTypeName();
-												update.addStatement(sideEffects[0] + langSpec.getVariableDeclaration(refTypeName, refVarName) + langSpec.getAssignment() + refExp + langSpec.getStatementDelimiter());
+												update.addStatement(sideEffects[0] + langSpec.getVariableDeclaration(refTypeName, refVarName) 
+																		+ langSpec.getAssignment() + refExp + langSpec.getStatementDelimiter());
 											}
 										}
 										refParams.add(new AbstractMap.SimpleEntry<>(ref.getResourceStateType(),
@@ -2520,36 +2522,6 @@
 					if (input != null) {
 						// Add a statement to update the state field to the input method.
 						try {
-							if (!platformSpec.hasMain()) {
-								// For an application with no main component, the reference resource is accessed from each resource.
-								for (ChannelMember rc: ((DataTransferChannel) ch).getReferenceChannelMembers()) {
-									// For each reference channel member, get the current state of the reference side resource by pull data transfer.
-									ResourcePath ref = rc.getResource();
-									if (!out.getResource().equals(ref)) {
-										String refResourceName = ref.getLeafResourceName();
-										Type refResourceType = ref.getResourceStateType();
-										String[] sideEffects = new String[] {""};
-										if (!platformSpec.isMonolithic() && rc.isOutside()) {
-											List<String> pathParams = new ArrayList<>();
-											for (Expression pathExp: ref.getPathParams()) {
-												pathParams.add("\" + " + pathExp.toImplementation(sideEffects) + " + \"");
-											}
-											generatePullDataTransfer(input, refResourceName, ref.getResourceHierarchy().toResourcePath(pathParams), refResourceType, true, platformSpec, langSpec);
-										} else {
-											ResourcePath dstRes = out.getResource();
-											if (!generatesComponent(dstRes.getResourceHierarchy())) {
-												dstRes = dstRes.getParent();
-											}
-											Expression refGetter = getPullAccessor(platformSpec).getDirectStateAccessorFor(ref, dstRes);
-											String refExp = refGetter.toImplementation(sideEffects);
-											String refTypeName = refResourceType.getInterfaceTypeName();
-											input.addFirstStatement(sideEffects[0] + langSpec.getVariableDeclaration(refTypeName, refResourceName)
-																		+ langSpec.getAssignment() + refExp + langSpec.getStatementDelimiter());
-										}
-									}
-								}
-							}
-							
 							Expression updateExp = ((DataTransferChannel) ch).deriveUpdateExpressionOf(out, getRefAccessor(platformSpec)).getKey();
 							// Replace Json constructor with a constructor of a descendant resource.
 							ResourceHierarchy outRes = out.getResource().getResourceHierarchy();
@@ -2617,6 +2589,37 @@
 									}
 								}
 							}
+							if (!platformSpec.hasMain()) {
+								// For an application with no main component, the reference resource is accessed from each resource.
+								for (ChannelMember rc: ((DataTransferChannel) ch).getReferenceChannelMembers()) {
+									// For each reference channel member, get the current state of the reference side resource by pull data transfer.
+									ResourcePath ref = rc.getResource();
+									if (!out.getResource().equals(ref)) {
+										String refResourceName = ref.getLeafResourceName();
+										Type refResourceType = ref.getResourceStateType();
+										String[] sideEffects = new String[] {""};
+										ResourcePath dstRes = out.getResource();
+										if (!generatesComponent(dstRes.getResourceHierarchy())) {
+											dstRes = dstRes.getParent();
+										}
+										if (!platformSpec.isMonolithic() 
+												&& (rc.isOutside() || (ref.getCommonPrefix(dstRes) == null && platformSpec.isDifferentTreesAsDifferentServices()))) {
+											List<String> pathParams = new ArrayList<>();
+											for (Expression pathExp: ref.getPathParams()) {
+												pathParams.add("\" + " + pathExp.toImplementation(sideEffects) + " + \"");
+											}
+											generatePullDataTransfer(input, refResourceName, ref.getResourceHierarchy().toResourcePath(pathParams), refResourceType, true, platformSpec, langSpec);
+										} else {
+											Expression refGetter = getPullAccessor(platformSpec).getDirectStateAccessorFor(ref, dstRes);
+											String refExp = refGetter.toImplementation(sideEffects);
+											String refTypeName = refResourceType.getInterfaceTypeName();
+											input.addFirstStatement(sideEffects[0] + langSpec.getVariableDeclaration(refTypeName, refResourceName)
+																		+ langSpec.getAssignment() + refExp + langSpec.getStatementDelimiter());
+										}
+									}
+								}
+							}
+							
 							if (rootInputAccessor != null) {
 								// In the root resource
 								// The expression of the receiver (resource) of the input method.
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
index 42c2067..fdfd502 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
@@ -496,17 +496,17 @@
 														if (!referredSet.contains(ref)) {
 															referredSet.add(ref);
 															String[] sideEffects = new String[] {""};
-															if (rc.isOutside()) {
+															ResourcePath srcRes = in.getResource();
+															if (!JerseyCodeGenerator.generatesComponent(srcRes.getResourceHierarchy())) {
+																srcRes = srcRes.getParent();
+															}
+															if (rc.isOutside() || (ref.getCommonPrefix(srcRes) == null && JerseyCodeGenerator.differentTreesAsDifferentServices)) {
 																List<String> pathParams = new ArrayList<>();
 																for (Expression pathExp: ref.getPathParams()) {
 																	pathParams.add("\" + " + pathExp.toImplementation(sideEffects) + " + \"");
 																}															
 																generatePullDataTransfer(srcUpdate, refResourceName, ref.getResourceHierarchy().toResourcePath(pathParams), refResourceType);
 															} else {
-																ResourcePath srcRes = in.getResource();
-																if (!JerseyCodeGenerator.generatesComponent(srcRes.getResourceHierarchy())) {
-																	srcRes = srcRes.getParent();
-																}
 																Expression refGetter = JerseyCodeGenerator.pullAccessor.getDirectStateAccessorFor(ref, srcRes);
 																String refExp = refGetter.toImplementation(sideEffects);
 																String refTypeName = ref.getResourceStateType().getInterfaceTypeName();
@@ -680,17 +680,17 @@
 												if (!referredSet.contains(ref)) {
 													referredSet.add(ref);
 													String[] sideEffects = new String[] {""};
-													if (rc.isOutside()) {
+													ResourcePath srcRes = in.getResource();
+													if (!JerseyCodeGenerator.generatesComponent(srcRes.getResourceHierarchy())) {
+														srcRes = srcRes.getParent();
+													}
+													if (rc.isOutside() || (ref.getCommonPrefix(srcRes) == null && JerseyCodeGenerator.differentTreesAsDifferentServices)) {
 														List<String> pathParams = new ArrayList<>();
 														for (Expression pathExp: ref.getPathParams()) {
 															pathParams.add("\" + " + pathExp.toImplementation(sideEffects) + " + \"");
 														}															
 														generatePullDataTransfer(srcInput, refResourceName, ref.getResourceHierarchy().toResourcePath(pathParams), refResourceType);
 													} else {
-														ResourcePath srcRes = in.getResource();
-														if (!JerseyCodeGenerator.generatesComponent(srcRes.getResourceHierarchy())) {
-															srcRes = srcRes.getParent();
-														}
 														Expression refGetter = JerseyCodeGenerator.pullAccessor.getDirectStateAccessorFor(ref, srcRes);
 														String refExp = refGetter.toImplementation(sideEffects);
 														String refTypeName = ref.getResourceStateType().getInterfaceTypeName();
@@ -850,7 +850,11 @@
 											ResourcePath refRes = rc.getResource();
 											String refResourceName = JerseyCodeGenerator.toVariableName(JerseyCodeGenerator.getComponentName(refRes.getResourceHierarchy()));
 											Type refResourceType = refRes.getResourceStateType();
-											if (rc.isOutside()) {
+											ResourcePath dstRes = out.getResource();
+											if (!JerseyCodeGenerator.generatesComponent(dstRes.getResourceHierarchy())) {
+												dstRes = dstRes.getParent();
+											}
+											if (rc.isOutside() || (refRes.getCommonPrefix(dstRes) == null && JerseyCodeGenerator.differentTreesAsDifferentServices)) {
 												List<String> pathParams = new ArrayList<>();
 												for (Expression pathExp: refRes.getPathParams()) {
 													sideEffects = new String[] {""};
@@ -858,10 +862,6 @@
 												}
 												generatePullDataTransfer(getter, refResourceName, refRes.getResourceHierarchy().toResourcePath(pathParams), refResourceType);
 											} else {
-												ResourcePath dstRes = out.getResource();
-												if (!JerseyCodeGenerator.generatesComponent(dstRes.getResourceHierarchy())) {
-													dstRes = dstRes.getParent();
-												}
 												Expression refGetter = JerseyCodeGenerator.pullAccessor.getDirectStateAccessorFor(refRes, dstRes);
 												sideEffects = new String[] {""};
 												String refExp = refGetter.toImplementation(sideEffects);
@@ -1217,17 +1217,17 @@
 									if (!referredSet.contains(ref)) {
 										referredSet.add(ref);
 										String[] sideEffects = new String[] {""};
-										if (rc.isOutside()) {
+										ResourcePath dstRes = out.getResource();
+										if (!JerseyCodeGenerator.generatesComponent(dstRes.getResourceHierarchy())) {
+											dstRes = dstRes.getParent();
+										}
+										if (rc.isOutside() || (ref.getCommonPrefix(dstRes) == null && JerseyCodeGenerator.differentTreesAsDifferentServices)) {
 											List<String> pathParams = new ArrayList<>();
 											for (Expression pathExp: ref.getPathParams()) {
 												pathParams.add("\" + " + pathExp.toImplementation(sideEffects) + " + \"");
 											}
 											generatePullDataTransfer(input, refResourceName, ref.getResourceHierarchy().toResourcePath(pathParams), refResourceType);											
 										} else {
-											ResourcePath dstRes = out.getResource();
-											if (!JerseyCodeGenerator.generatesComponent(dstRes.getResourceHierarchy())) {
-												dstRes = dstRes.getParent();
-											}
 											Expression refGetter = JerseyCodeGenerator.pullAccessor.getDirectStateAccessorFor(ref, dstRes);
 											String refExp = refGetter.toImplementation(sideEffects);
 											String refTypeName = refResourceType.getInterfaceTypeName();