diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index c1534f8..63a705e 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -220,7 +220,12 @@
 					JsonAccessor jsonMember = new JsonAccessor(DataConstraintModel.dot);
 					jsonMember.addChild(jsonTerm);
 					jsonMember.addChild(new Constant("\"" + var.getName() + "\""));
-					params.add(jsonMember.reduce().toImplementation(new String[] {""}));
+					Expression param = jsonMember.reduce();
+					if (param != null) {
+						params.add(param.toImplementation(new String[] {""}));
+					} else {
+						params.add(var.getName());
+					}
 				}
 				((Term) exp).replaceSubTerm(termEnt.getKey(), new Constant(langSpec.getConstructorInvocation(replacingClassName, params)));
 			}
@@ -384,8 +389,11 @@
 					if (dstRes.getParent() != null) {
 						// Reference to root resource.
 						String dstRootResName = getComponentName(dstRes.getRoot().getResourceHierarchy(), langSpec);
-						FieldDeclaration refRootFieldForPush = langSpec.newFieldDeclaration(new Type(dstRootResName, dstRootResName), langSpec.toVariableName(dstRootResName));
+						Type dstRootResType = new Type(dstRootResName, dstRootResName);
+						dstRootResName = langSpec.toVariableName(dstRootResName);
+						FieldDeclaration refRootFieldForPush = langSpec.newFieldDeclaration(dstRootResType, dstRootResName);
 						parentComponent.addField(refRootFieldForPush);
+						constructorParams.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), langSpec.newVariableDeclaration(dstRootResType, dstRootResName)));
 					}
 				}
 			}
@@ -415,8 +423,11 @@
 					if (srcRes.getParent() != null) {
 						// Reference to root resource.
 						String srcRootResName = getComponentName(srcRes.getRoot().getResourceHierarchy(), langSpec);
-						FieldDeclaration refRootFieldForPull = langSpec.newFieldDeclaration(new Type(srcRootResName, srcRootResName), langSpec.toVariableName(srcRootResName));
+						Type srcRootResType = new Type(srcRootResName, srcRootResName);
+						srcRootResName = langSpec.toVariableName(srcRootResName);
+						FieldDeclaration refRootFieldForPull = langSpec.newFieldDeclaration(srcRootResType, srcRootResName);
 						parentComponent.addField(refRootFieldForPull);
+						constructorParams.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), langSpec.newVariableDeclaration(srcRootResType, srcRootResName)));
 					}
 					noPullTransfer = false;
 				}