diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index b5f9bd4..1378f07 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -1394,10 +1394,6 @@
 							&& (outsideOutputResource || (resourceNode.getInSideResource(ch).getCommonPrefix(srcResPath) == null && platformSpec.isDifferentTreesAsDifferentServices()))) {
 						// Inter-service
 						hasRestAPI = true;
-						if (component != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(component)) {
-							// Declare a client field to connect to the destination resource of push transfer.
-							((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(component);
-						}
 						if (resourceNode.getParent() == null) {
 							// A root resource
 							isRestAPI = true;
@@ -1943,6 +1939,9 @@
 													if (component != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(component)) {
 														// Declare a client field to connect to the destination resource of push transfer.
 														((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(component);
+													} else if (parentComponent != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(parentComponent)) {
+														// Declare a client field to connect to the destination resource of push transfer.
+														((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(parentComponent);
 													}
 												}
 											}
@@ -1981,6 +1980,9 @@
 												if (component != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(component)) {
 													// Declare a client field to connect to the destination resource of push transfer.
 													((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(component);
+												} else if (parentComponent != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(parentComponent)) {
+													// Declare a client field to connect to the destination resource of push transfer.
+													((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(parentComponent);
 												}
 											} else {
 												Expression refGetter = getPullAccessor(platformSpec).getDirectStateAccessorFor(ref, srcRes);
@@ -2137,11 +2139,31 @@
 											update.addStatement(restApiSpec.getHttpMethodParamsConstructionStatement(srcRes2.getResourceName(), params, true));
 											update.addStatement(langSpec.getVariableDeclaration(DataConstraintModel.typeString.getInterfaceTypeName(), "result")
 																		+ langSpec.getAssignment() + restApiSpec.getHttpMethodCallStatement(restApiSpec.getBaseURL(), dstPath, resName, httpMethod));
+											if (component != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(component)) {
+												// Declare a client field to connect to the destination resource of push transfer.
+												((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(component);
+											} else if (parentComponent != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(parentComponent)) {
+												// Declare a client field to connect to the destination resource of push transfer.
+												((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(parentComponent);
+											}
+											if (!((RestApiSpecific) platformSpec).hasJsonException(update)) {
+												((RestApiSpecific) platformSpec).addJsonException(update);
+											}
 											hasUpdateMethodinvoked = true;
 										} else {
 											// After the second time of call to update methods in this method
 											update.addStatement(restApiSpec.getHttpMethodParamsConstructionStatement(srcRes2.getResourceName(), params, false));
 											update.addStatement("result" + langSpec.getAssignment() + restApiSpec.getHttpMethodCallStatement(restApiSpec.getBaseURL(), dstPath, resName, httpMethod));
+											if (component != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(component)) {
+												// Declare a client field to connect to the destination resource of push transfer.
+												((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(component);
+											} else if (parentComponent != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(parentComponent)) {
+												// Declare a client field to connect to the destination resource of push transfer.
+												((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(parentComponent);
+											}
+											if (!((RestApiSpecific) platformSpec).hasJsonException(update)) {
+												((RestApiSpecific) platformSpec).addJsonException(update);
+											}
 										}
 									} else {
 										// Use the reference field to refer to outside destination resource.									
@@ -2678,6 +2700,9 @@
 											if (component != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(component)) {
 												// Declare a client field to connect to the destination resource of push transfer.
 												((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(component);
+											} else if (parentComponent != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(parentComponent)) {
+												// Declare a client field to connect to the destination resource of push transfer.
+												((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(parentComponent);
 											}
 										} else {
 											Expression refGetter = getPullAccessor(platformSpec).getDirectStateAccessorFor(ref, dstRes);
@@ -2885,6 +2910,9 @@
 														if (component != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(component)) {
 															// Declare a client field to connect to the destination resource of push transfer.
 															((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(component);
+														} else if (parentComponent != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(parentComponent)) {
+															// Declare a client field to connect to the destination resource of push transfer.
+															((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(parentComponent);
 														}
 													}
 												}
@@ -3064,15 +3092,31 @@
 												input.addStatement(restApiSpec.getHttpMethodParamsConstructionStatement(srcRes.getResourceName(), params, true));
 												input.addStatement(langSpec.getVariableDeclaration(DataConstraintModel.typeString.getInterfaceTypeName(), "result")
 																			+ langSpec.getAssignment() + restApiSpec.getHttpMethodCallStatement(restApiSpec.getBaseURL(), dstPath, resName2, httpMethod));
-												hasUpdateMethodinvoked = true;
 												if (component != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(component)) {
 													// Declare a client field to connect to the destination resource of push transfer.
 													((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(component);
+												} else if (parentComponent != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(parentComponent)) {
+													// Declare a client field to connect to the destination resource of push transfer.
+													((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(parentComponent);
 												}
+												if (!((RestApiSpecific) platformSpec).hasJsonException(input)) {
+													((RestApiSpecific) platformSpec).addJsonException(input);
+												}
+												hasUpdateMethodinvoked = true;
 											} else {
 												// After the second time of call to update methods in this method
 												input.addStatement(restApiSpec.getHttpMethodParamsConstructionStatement(srcRes.getResourceName(), params, false));
 												input.addStatement("result" + langSpec.getAssignment() + restApiSpec.getHttpMethodCallStatement(restApiSpec.getBaseURL(), dstPath, resName2, httpMethod));
+												if (component != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(component)) {
+													// Declare a client field to connect to the destination resource of push transfer.
+													((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(component);
+												} else if (parentComponent != null && !((RestApiSpecific) platformSpec).hasHttpClientFieldDeclaration(parentComponent)) {
+													// Declare a client field to connect to the destination resource of push transfer.
+													((RestApiSpecific) platformSpec).addHttpClientFieldDeclaration(parentComponent);
+												}
+												if (!((RestApiSpecific) platformSpec).hasJsonException(input)) {
+													((RestApiSpecific) platformSpec).addJsonException(input);
+												}
 											}
 										} else {
 											// Use the reference field to refer to outside destination resource.