diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index 17edb0c..cf3f036 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -198,8 +199,19 @@
 			}
 			if (constructor != null) {
 				for (VariableDeclaration param: params) {
-					constructor.addParameter(param);
-					constructor.getBody().addStatement(langSpec.getFieldAccessor(langSpec.toVariableName(param.getName())) + langSpec.getAssignment() + langSpec.toVariableName(param.getName()) + langSpec.getStatementDelimiter());
+					boolean existsParam = false;
+					if (constructor.getParameters() != null) {
+						for (VariableDeclaration constParam: constructor.getParameters()) {
+							if (constParam.getName().equals(param.getName())) {
+								existsParam = true;
+								break;
+							}
+						}
+					}
+					if (!existsParam) {
+						constructor.addParameter(param);
+						constructor.getBody().addStatement(langSpec.getFieldAccessor(langSpec.toVariableName(param.getName())) + langSpec.getAssignment() + langSpec.toVariableName(param.getName()) + langSpec.getStatementDelimiter());
+					}
 				}
 			}
 		}
@@ -211,7 +223,9 @@
 		Type replacedJsonType = childRes.getResourceStateType();
 		String replacingClassName = getComponentName(childRes, langSpec);
 		Map<Position, Term> subTerms = ((Term) exp).getSubTerms(Term.class);
-		for (Entry<Position, Term> termEnt: subTerms.entrySet()) {
+		Iterator<Entry<Position, Term>> termEntItr = subTerms.entrySet().iterator();
+		while (termEntItr.hasNext()) {
+			Entry<Position, Term> termEnt = termEntItr.next();
 			Term jsonTerm = termEnt.getValue();
 			if (jsonTerm.getType().equals(replacedJsonType)) {
 				MethodDeclaration childConstructor = getConstructor(childComponent);
@@ -228,6 +242,8 @@
 					}
 				}
 				((Term) exp).replaceSubTerm(termEnt.getKey(), new Constant(langSpec.getConstructorInvocation(replacingClassName, params)));
+				subTerms = ((Term) exp).getSubTerms(Term.class);
+				termEntItr = subTerms.entrySet().iterator();
 			}
 		}
 		String[] sideEffects = new String[] {""};
@@ -392,7 +408,16 @@
 						Type dstRootResType = new Type(dstRootResName, dstRootResName);
 						dstRootResName = langSpec.toVariableName(dstRootResName);
 						FieldDeclaration refRootFieldForPush = langSpec.newFieldDeclaration(dstRootResType, dstRootResName);
-						parentComponent.addField(refRootFieldForPush);
+						boolean existsField = false;
+						for (FieldDeclaration field: parentComponent.getFields()) {
+							if (dstRootResName.equals(field.getName())) {
+								existsField = true;
+								break;
+							}
+						}
+						if (!existsField) {
+							parentComponent.addField(refRootFieldForPush);
+						}
 						constructorParams.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), langSpec.newVariableDeclaration(dstRootResType, dstRootResName)));
 					}
 				}
@@ -426,7 +451,16 @@
 						Type srcRootResType = new Type(srcRootResName, srcRootResName);
 						srcRootResName = langSpec.toVariableName(srcRootResName);
 						FieldDeclaration refRootFieldForPull = langSpec.newFieldDeclaration(srcRootResType, srcRootResName);
-						parentComponent.addField(refRootFieldForPull);
+						boolean existsField = false;
+						for (FieldDeclaration field: parentComponent.getFields()) {
+							if (srcRootResName.equals(field.getName())) {
+								existsField = true;
+								break;
+							}
+						}
+						if (!existsField) {
+							parentComponent.addField(refRootFieldForPull);
+						}
 						constructorParams.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), langSpec.newVariableDeclaration(srcRootResType, srcRootResName)));
 					}
 					noPullTransfer = false;