diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index 63a705e..17edb0c 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -864,25 +864,26 @@
 						ArrayList<VariableDeclaration> resInputParams = new ArrayList<>();
 						ArrayList<VariableDeclaration> mainInputParams = new ArrayList<>();
 						int v = 1;
-						for (Selector selector: resourceNode.getSelectors()) {
-							if (selector.getExpression() instanceof Variable) {
-								Variable var = (Variable) selector.getExpression();
+						if (out.getResource().getLastParam() != null) {
+							Expression param = out.getResource().getLastParam();
+							if (param instanceof Variable) {
+								Variable var = (Variable) param;
 								resInputParams.add(langSpec.newVariableDeclaration(var.getType(), var.getName()));								
 								mainInputParams.add(langSpec.newVariableDeclaration(var.getType(), var.getName()));								
-							} else if (selector.getExpression() instanceof Term) {
-								Term var = (Term) selector.getExpression();
+							} else if (param instanceof Term) {
+								Term var = (Term) param;
 								resInputParams.add(langSpec.newVariableDeclaration(var.getType(), "v" + v));								
 								mainInputParams.add(langSpec.newVariableDeclaration(var.getType(), "v" + v));								
 							}
 							v++;
 						}
-						if (resourceNode.getParent() != null) {
-							for (Selector selector: resourceNode.getParent().getAllSelectors()) {
-								if (selector.getExpression() instanceof Variable) {
-									Variable var = (Variable) selector.getExpression();
+						if (out.getResource().getParent() != null) {
+							for (Expression param: out.getResource().getParent().getPathParams()) {
+								if (param instanceof Variable) {
+									Variable var = (Variable) param;
 									mainInputParams.add(langSpec.newVariableDeclaration(var.getType(), var.getName()));								
-								} else if (selector.getExpression() instanceof Term) {
-									Term var = (Term) selector.getExpression();
+								} else if (param instanceof Term) {
+									Term var = (Term) param;
 									mainInputParams.add(langSpec.newVariableDeclaration(var.getType(), "v" + v));								
 								}
 								v++;
@@ -926,25 +927,26 @@
 						ArrayList<VariableDeclaration> resInputParams = new ArrayList<>();
 						ArrayList<VariableDeclaration> mainInputParams = new ArrayList<>();
 						int v = 1;
-						for (Selector selector: resourceNode.getSelectors()) {
-							if (selector.getExpression() instanceof Variable) {
-								Variable var = (Variable) selector.getExpression();
+						if (out.getResource().getLastParam() != null) {
+							Expression param = out.getResource().getLastParam();
+							if (param instanceof Variable) {
+								Variable var = (Variable) param;
 								resInputParams.add(langSpec.newVariableDeclaration(var.getType(), var.getName()));								
 								mainInputParams.add(langSpec.newVariableDeclaration(var.getType(), var.getName()));								
-							} else if (selector.getExpression() instanceof Term) {
-								Term var = (Term) selector.getExpression();
+							} else if (param instanceof Term) {
+								Term var = (Term) param;
 								resInputParams.add(langSpec.newVariableDeclaration(var.getType(), "v" + v));								
 								mainInputParams.add(langSpec.newVariableDeclaration(var.getType(), "v" + v));								
 							}
 							v++;
 						}
-						if (resourceNode.getResourceHierarchy().getParent() != null) {
-							for (Selector selector: resourceNode.getParent().getSelectors()) {
-								if (selector.getExpression() instanceof Variable) {
-									Variable var = (Variable) selector.getExpression();
+						if (out.getResource().getParent() != null) {
+							for (Expression param: out.getResource().getParent().getPathParams()) {
+								if (param instanceof Variable) {
+									Variable var = (Variable) param;
 									mainInputParams.add(langSpec.newVariableDeclaration(var.getType(), var.getName()));								
-								} else if (selector.getExpression() instanceof Term) {
-									Term var = (Term) selector.getExpression();
+								} else if (param instanceof Term) {
+									Term var = (Term) param;
 									mainInputParams.add(langSpec.newVariableDeclaration(var.getType(), "v" + v));								
 								}
 								v++;