diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index 5245a3f..b5f9bd4 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -406,7 +406,7 @@
 		} else {
 			updateStatement = sideEffects[0] + langSpec.getFieldAccessor(fieldOfResourceState) + langSpec.getAssignment() + newState + langSpec.getStatementDelimiter();
 		}
-		method.addFirstStatement(updateStatement);
+		method.addStatement(updateStatement);
 	}
 
 	private MethodDeclaration declareConstructor(ResourceNode resourceNode, TypeDeclaration component, Map<ResourceHierarchy, Set<ResourceHierarchy>> dependedRootComponentGraph, 
@@ -1481,83 +1481,6 @@
 							parentComponent.addMethod(update);
 						}
 					}
-					// For a post/put REST API.
-					if (hasRestAPI) {
-						if (!isRestAPI) {
-							// If not a root resource.
-							// Declare an update accessor method in the type of root resource. 
-							declareUpdateAccessorInTheRootResource(resourceNode, update.getName(), ch, out, srcResPath, dstResPath,
-									rootComponent, inDegree, platformSpec, langSpec);
-						}
-						// to convert a json param to a tuple, pair or map object.
-						for (VariableDeclaration jsonParam: update.getParameters()) {
-							Type paramType = jsonParam.getType();
-							String paramName = jsonParam.getName();
-							String paramTypeName = paramType.getInterfaceTypeName();
-							String strTypeName = DataConstraintModel.typeString.getInterfaceTypeName();
-							String paramConverter = "";
-							if (DataConstraintModel.typeList.isAncestorOf(paramType) && paramType != DataConstraintModel.typeList) {
-								Type compType = TypeInference.getListComponentType(paramType);
-								if (DataConstraintModel.typeTuple.isAncestorOf(compType)) {
-									jsonParam.setType(DataConstraintModel.typeListStr);
-									jsonParam.setName(paramName + "_json");
-									paramConverter += langSpec.getVariableDeclaration(paramTypeName, paramName) + langSpec.getAssignment() + langSpec.getConstructorInvocation(paramType.getImplementationTypeName(), null) + langSpec.getStatementDelimiter() + "\n";
-									paramConverter += langSpec.getForStatementForCollection("str", strTypeName, jsonParam.getName()) + "\n";
-									String mapTypeName = convertFromEntryToMapType(compType, langSpec);
-									paramConverter += "\t" + ((RestApiSpecific) platformSpec).getConversionFromJsonString("str", "i", mapTypeName) + langSpec.getStatementDelimiter() + "\n";
-									paramConverter += "\t" + langSpec.getMethodInvocation(paramName, DataConstraintModel.append.getImplName(), List.of(getCodeForConversionFromMapToTuple(compType, "i", langSpec))) + langSpec.getStatementDelimiter() + "\n";
-									paramConverter += langSpec.getEndForStatement("str");
-									((RestApiSpecific) platformSpec).addJsonException(update);
-								} else if (DataConstraintModel.typePair.isAncestorOf(compType)) {
-									jsonParam.setType(DataConstraintModel.typeListStr);
-									jsonParam.setName(paramName + "_json");
-									paramConverter += langSpec.getVariableDeclaration(paramTypeName, paramName) + langSpec.getAssignment() + langSpec.getConstructorInvocation(paramType.getImplementationTypeName(), null) + langSpec.getStatementDelimiter() + "\n";
-									paramConverter += langSpec.getForStatementForCollection("str", strTypeName, jsonParam.getName()) + "\n";
-									String mapTypeName = convertFromEntryToMapType(compType, langSpec);
-									paramConverter += "\t" + ((RestApiSpecific) platformSpec).getConversionFromJsonString("str", "i", mapTypeName) + langSpec.getStatementDelimiter() + "\n";
-									paramConverter += "\t" + langSpec.getMethodInvocation(paramName, DataConstraintModel.append.getImplName(), List.of(getCodeForConversionFromMapToPair(compType, "i", langSpec))) + langSpec.getStatementDelimiter() + "\n";
-									paramConverter += langSpec.getEndForStatement("str");
-									((RestApiSpecific) platformSpec).addJsonException(update);
-								} else if (DataConstraintModel.typeMap.isAncestorOf(compType)) {
-									jsonParam.setType(DataConstraintModel.typeListStr);
-									// To do.
-								}
-							} else if (DataConstraintModel.typeTuple.isAncestorOf(paramType)) {
-								jsonParam.setType(DataConstraintModel.typeString);
-								jsonParam.setName(paramName + "_json");
-								paramConverter += langSpec.getVariableDeclaration(paramTypeName, paramName) + langSpec.getStatementDelimiter() + "\n";
-								paramConverter += langSpec.getOpeningScoreDelimiter() + "\n";
-								String mapTypeName = convertFromEntryToMapType(paramType, langSpec);
-								paramConverter += "\t" + ((RestApiSpecific) platformSpec).getConversionFromJsonString(paramName + "_json", "i", mapTypeName) + langSpec.getStatementDelimiter() + "\n";
-								paramConverter += "\t" + paramName + langSpec.getAssignment() + getCodeForConversionFromMapToTuple(paramType, "i", langSpec) + langSpec.getStatementDelimiter() + "\n";
-								paramConverter += langSpec.getClosingScoreDelimiter();
-								((RestApiSpecific) platformSpec).addJsonException(update);
-							} else if (DataConstraintModel.typePair.isAncestorOf(paramType)) {
-								jsonParam.setType(DataConstraintModel.typeString);
-								jsonParam.setName(paramName + "_json");
-								paramConverter += langSpec.getVariableDeclaration(paramTypeName, paramName) + langSpec.getStatementDelimiter() + "\n";
-								paramConverter += langSpec.getOpeningScoreDelimiter() + "\n";
-								String mapTypeName = convertFromEntryToMapType(paramType, langSpec);
-								paramConverter += "\t" + ((RestApiSpecific) platformSpec).getConversionFromJsonString(paramName + "_json", "i", mapTypeName) + langSpec.getStatementDelimiter() + "\n";
-								paramConverter += "\t" + paramName + langSpec.getAssignment() + getCodeForConversionFromMapToPair(paramType, "i", langSpec) + langSpec.getStatementDelimiter() + "\n";
-								paramConverter += langSpec.getClosingScoreDelimiter();
-								((RestApiSpecific) platformSpec).addJsonException(update);
-							} else if (DataConstraintModel.typeMap.isAncestorOf(paramType)) {
-								jsonParam.setType(DataConstraintModel.typeString);
-								jsonParam.setName(paramName + "_json");
-								paramConverter += langSpec.getVariableDeclaration(paramTypeName, paramName) + langSpec.getAssignment() + langSpec.getConstructorInvocation(paramType.getImplementationTypeName(), null) + langSpec.getStatementDelimiter() + "\n";
-								paramConverter += langSpec.getOpeningScoreDelimiter() + "\n";
-								String mapTypeName = convertFromEntryToMapType(paramType, langSpec);
-								paramConverter += "\t" + ((RestApiSpecific) platformSpec).getConversionFromJsonString(paramName + "_json", "i", mapTypeName) + langSpec.getStatementDelimiter() + "\n";
-								paramConverter += "\t" + getCodeForConversionFromMapToMap(paramType, "i", paramName, langSpec) + "\n";
-								paramConverter += langSpec.getClosingScoreDelimiter();
-								((RestApiSpecific) platformSpec).addJsonException(update);
-							}
-							if (paramConverter.length() > 0 && (update.getBody() == null || !update.getBody().getStatements().contains(paramConverter))) {
-								update.addFirstStatement(paramConverter);
-							}
-						}
-					}
 					
 					// Add a statement to update the state field
 					if (((StoreAttribute) resourceNode.getAttribute()).isStored()) {
@@ -1725,6 +1648,84 @@
 						}
 					}
 					
+					// For a post/put REST API.
+					if (hasRestAPI) {
+						if (!isRestAPI) {
+							// If not a root resource.
+							// Declare an update accessor method in the type of root resource. 
+							declareUpdateAccessorInTheRootResource(resourceNode, update.getName(), ch, out, srcResPath, dstResPath,
+									rootComponent, inDegree, platformSpec, langSpec);
+						}
+						// to convert a json param to a tuple, pair or map object.
+						for (VariableDeclaration jsonParam: update.getParameters()) {
+							Type paramType = jsonParam.getType();
+							String paramName = jsonParam.getName();
+							String paramTypeName = paramType.getInterfaceTypeName();
+							String strTypeName = DataConstraintModel.typeString.getInterfaceTypeName();
+							String paramConverter = "";
+							if (DataConstraintModel.typeList.isAncestorOf(paramType) && paramType != DataConstraintModel.typeList) {
+								Type compType = TypeInference.getListComponentType(paramType);
+								if (DataConstraintModel.typeTuple.isAncestorOf(compType)) {
+									jsonParam.setType(DataConstraintModel.typeListStr);
+									jsonParam.setName(paramName + "_json");
+									paramConverter += langSpec.getVariableDeclaration(paramTypeName, paramName) + langSpec.getAssignment() + langSpec.getConstructorInvocation(paramType.getImplementationTypeName(), null) + langSpec.getStatementDelimiter() + "\n";
+									paramConverter += langSpec.getForStatementForCollection("str", strTypeName, jsonParam.getName()) + "\n";
+									String mapTypeName = convertFromEntryToMapType(compType, langSpec);
+									paramConverter += "\t" + ((RestApiSpecific) platformSpec).getConversionFromJsonString("str", "i", mapTypeName) + langSpec.getStatementDelimiter() + "\n";
+									paramConverter += "\t" + langSpec.getMethodInvocation(paramName, DataConstraintModel.append.getImplName(), List.of(getCodeForConversionFromMapToTuple(compType, "i", langSpec))) + langSpec.getStatementDelimiter() + "\n";
+									paramConverter += langSpec.getEndForStatement("str");
+									((RestApiSpecific) platformSpec).addJsonException(update);
+								} else if (DataConstraintModel.typePair.isAncestorOf(compType)) {
+									jsonParam.setType(DataConstraintModel.typeListStr);
+									jsonParam.setName(paramName + "_json");
+									paramConverter += langSpec.getVariableDeclaration(paramTypeName, paramName) + langSpec.getAssignment() + langSpec.getConstructorInvocation(paramType.getImplementationTypeName(), null) + langSpec.getStatementDelimiter() + "\n";
+									paramConverter += langSpec.getForStatementForCollection("str", strTypeName, jsonParam.getName()) + "\n";
+									String mapTypeName = convertFromEntryToMapType(compType, langSpec);
+									paramConverter += "\t" + ((RestApiSpecific) platformSpec).getConversionFromJsonString("str", "i", mapTypeName) + langSpec.getStatementDelimiter() + "\n";
+									paramConverter += "\t" + langSpec.getMethodInvocation(paramName, DataConstraintModel.append.getImplName(), List.of(getCodeForConversionFromMapToPair(compType, "i", langSpec))) + langSpec.getStatementDelimiter() + "\n";
+									paramConverter += langSpec.getEndForStatement("str");
+									((RestApiSpecific) platformSpec).addJsonException(update);
+								} else if (DataConstraintModel.typeMap.isAncestorOf(compType)) {
+									jsonParam.setType(DataConstraintModel.typeListStr);
+									// To do.
+								}
+							} else if (DataConstraintModel.typeTuple.isAncestorOf(paramType)) {
+								jsonParam.setType(DataConstraintModel.typeString);
+								jsonParam.setName(paramName + "_json");
+								paramConverter += langSpec.getVariableDeclaration(paramTypeName, paramName) + langSpec.getStatementDelimiter() + "\n";
+								paramConverter += langSpec.getOpeningScoreDelimiter() + "\n";
+								String mapTypeName = convertFromEntryToMapType(paramType, langSpec);
+								paramConverter += "\t" + ((RestApiSpecific) platformSpec).getConversionFromJsonString(paramName + "_json", "i", mapTypeName) + langSpec.getStatementDelimiter() + "\n";
+								paramConverter += "\t" + paramName + langSpec.getAssignment() + getCodeForConversionFromMapToTuple(paramType, "i", langSpec) + langSpec.getStatementDelimiter() + "\n";
+								paramConverter += langSpec.getClosingScoreDelimiter();
+								((RestApiSpecific) platformSpec).addJsonException(update);
+							} else if (DataConstraintModel.typePair.isAncestorOf(paramType)) {
+								jsonParam.setType(DataConstraintModel.typeString);
+								jsonParam.setName(paramName + "_json");
+								paramConverter += langSpec.getVariableDeclaration(paramTypeName, paramName) + langSpec.getStatementDelimiter() + "\n";
+								paramConverter += langSpec.getOpeningScoreDelimiter() + "\n";
+								String mapTypeName = convertFromEntryToMapType(paramType, langSpec);
+								paramConverter += "\t" + ((RestApiSpecific) platformSpec).getConversionFromJsonString(paramName + "_json", "i", mapTypeName) + langSpec.getStatementDelimiter() + "\n";
+								paramConverter += "\t" + paramName + langSpec.getAssignment() + getCodeForConversionFromMapToPair(paramType, "i", langSpec) + langSpec.getStatementDelimiter() + "\n";
+								paramConverter += langSpec.getClosingScoreDelimiter();
+								((RestApiSpecific) platformSpec).addJsonException(update);
+							} else if (DataConstraintModel.typeMap.isAncestorOf(paramType)) {
+								jsonParam.setType(DataConstraintModel.typeString);
+								jsonParam.setName(paramName + "_json");
+								paramConverter += langSpec.getVariableDeclaration(paramTypeName, paramName) + langSpec.getAssignment() + langSpec.getConstructorInvocation(paramType.getImplementationTypeName(), null) + langSpec.getStatementDelimiter() + "\n";
+								paramConverter += langSpec.getOpeningScoreDelimiter() + "\n";
+								String mapTypeName = convertFromEntryToMapType(paramType, langSpec);
+								paramConverter += "\t" + ((RestApiSpecific) platformSpec).getConversionFromJsonString(paramName + "_json", "i", mapTypeName) + langSpec.getStatementDelimiter() + "\n";
+								paramConverter += "\t" + getCodeForConversionFromMapToMap(paramType, "i", paramName, langSpec) + "\n";
+								paramConverter += langSpec.getClosingScoreDelimiter();
+								((RestApiSpecific) platformSpec).addJsonException(update);
+							}
+							if (paramConverter.length() > 0 && (update.getBody() == null || !update.getBody().getStatements().contains(paramConverter))) {
+								update.addFirstStatement(paramConverter);
+							}
+						}
+					}
+					
 					// Declare the field to cache the state of the source resource in the type of the destination resource.
 					if (inDegree > 1
 							|| (ch.getInputChannelMembers().size() == 1 && ch.getInputChannelMembers().iterator().next().getStateTransition().isRightPartial())) {