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;
 				}
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
index abf2cd3..7cd71bf 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
@@ -360,7 +360,7 @@
 						DataTransferChannel c = (DataTransferChannel) ch;
 						if (c.getInputResources().contains(rn.getOutSideResource())) {
 							for (ResourcePath res: c.getReferenceResources()) {
-								if (!refs.contains(res) && !depends.contains(res)) {
+								if (!refs.contains(res) && !depends.contains(res.getResourceHierarchy())) {
 									refs.add(res);
 									String refResName = getComponentName(res.getResourceHierarchy());
 									component.addField(new FieldDeclaration(new Type(refResName, refResName), res.getResourceName()));
@@ -464,8 +464,10 @@
 								// Reference to root resource.
 								ResourcePath dstRootRes = dstRes.getRoot();
 								String dstRootResName = getComponentName(dstRootRes.getResourceHierarchy());
-								FieldDeclaration refRootFieldForPush = new FieldDeclaration(new Type(dstRootResName, dstRootResName), toVariableName(dstRootResName));
+								Type dstRootResType = new Type(dstRootResName, dstRootResName);
+								FieldDeclaration refRootFieldForPush = new FieldDeclaration(dstRootResType, toVariableName(dstRootResName));
 								fields.add(new AbstractMap.SimpleEntry<>(rn.getParent().getResourceHierarchy(), refRootFieldForPush));
+								constructorParams.add(new AbstractMap.SimpleEntry<>(rn.getParent().getResourceHierarchy(), new VariableDeclaration(dstRootResType, toVariableName(dstRootResName))));
 							}
 						}
 					}
@@ -494,8 +496,10 @@
 								// Reference to root resource.
 								ResourcePath srcRootRes = srcRes.getRoot();
 								String srcRootResName = getComponentName(srcRootRes.getResourceHierarchy());
-								FieldDeclaration refRootFieldForPull = new FieldDeclaration(new Type(srcRootResName, srcRootResName), toVariableName(srcRootResName));
+								Type srcRootResType = new Type(srcRootResName, srcRootResName);
+								FieldDeclaration refRootFieldForPull = new FieldDeclaration(srcRootResType, toVariableName(srcRootResName));
 								fields.add(new AbstractMap.SimpleEntry<>(rn.getParent().getResourceHierarchy(), refRootFieldForPull));
+								constructorParams.add(new AbstractMap.SimpleEntry<>(rn.getParent().getResourceHierarchy(), new VariableDeclaration(srcRootResType, toVariableName(srcRootResName))));
 							}
 							noPullTransfer = false;
 						}
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
index 8218d30..f4df963 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
@@ -1,6 +1,5 @@
 package generators;
 
-import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -14,7 +13,6 @@
 import code.ast.TypeDeclaration;
 import code.ast.VariableDeclaration;
 import models.Edge;
-import models.Node;
 import models.algebra.Constant;
 import models.algebra.Expression;
 import models.algebra.Field;
@@ -33,7 +31,6 @@
 import models.dataConstraintModel.JsonAccessor;
 import models.dataConstraintModel.ResourceHierarchy;
 import models.dataConstraintModel.ResourcePath;
-import models.dataConstraintModel.Selector;
 import models.dataFlowModel.DataTransferModel;
 import models.dataFlowModel.DataTransferChannel;
 import models.dataFlowModel.DataTransferChannel.IResourceStateAccessor;
@@ -602,7 +599,12 @@
 					JsonAccessor jsonMember = new JsonAccessor(DataConstraintModel.dot);
 					jsonMember.addChild(jsonTerm);
 					jsonMember.addChild(new Constant("\"" + var.getName() + "\""));
-					constructorInvocation = constructorInvocation + jsonMember.reduce().toImplementation(new String[] {""}) + delimiter;
+					Expression param = jsonMember.reduce();
+					if (param != null) {
+						constructorInvocation = constructorInvocation + delimiter + param.toImplementation(new String[] {""});
+					} else {
+						constructorInvocation = constructorInvocation + delimiter + var.getName();
+					}
 					delimiter = ", ";
 				}
 				constructorInvocation += ")";
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
index 7d15ffb..0513bd4 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
@@ -16,7 +16,6 @@
 import code.ast.TypeDeclaration;
 import code.ast.VariableDeclaration;
 import models.Edge;
-import models.Node;
 import models.algebra.Constant;
 import models.algebra.Expression;
 import models.algebra.Field;