diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index ccea9b1..fc6b3f4 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -730,12 +730,13 @@
 					children.add(child.getResourceHierarchy());
 					List<VariableDeclaration> params = new ArrayList<>();
 					int v = 1;
-					for (Selector param: child.getSelectors()) {
-						if (param.getExpression() instanceof Variable) {
-							Variable var = (Variable) param.getExpression();
+					Expression param = child.getPrimaryResourcePath().getLastParam();
+					if (param != null) {
+						if (param instanceof Variable) {
+							Variable var = (Variable) param;
 							params.add(langSpec.newVariableDeclaration(var.getType(), var.getName()));
-						} else if (param.getExpression() instanceof Term) {
-							Term var = (Term) param.getExpression();
+						} else if (param instanceof Term) {
+							Term var = (Term) param;
 							params.add(langSpec.newVariableDeclaration(var.getType(), "v" + v));
 						}
 						v++;
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
index 5c02010..8f17c1a 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
@@ -288,12 +288,13 @@
 								children.add(child.getResourceHierarchy());
 								List<VariableDeclaration> params = new ArrayList<>();
 								int v = 1;
-								for (Selector param: child.getSelectors()) {
-									if (param.getExpression() instanceof Variable) {
-										Variable var = (Variable) param.getExpression();
+								Expression param = child.getPrimaryResourcePath().getLastParam();
+								if (param != null) {
+									if (param instanceof Variable) {
+										Variable var = (Variable) param;
 										params.add(new VariableDeclaration(var.getType(), var.getName()));
-									} else if (param.getExpression() instanceof Term) {
-										Term var = (Term) param.getExpression();
+									} else if (param instanceof Term) {
+										Term var = (Term) param;
 										params.add(new VariableDeclaration(var.getType(), "v" + v));
 									}
 									v++;
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
index 3f23e85..5ced72d 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
@@ -234,7 +234,8 @@
 								children.add(child.getResourceHierarchy());
 								List<VariableDeclaration> pathParams = new ArrayList<>();
 								int v = 1;
-								for (Expression pathParam: child.getPrimaryResourcePath().getPathParams()) {
+								Expression pathParam = child.getPrimaryResourcePath().getLastParam();
+								if (pathParam != null) {
 									if (pathParam instanceof Variable) {
 										Variable var = (Variable) pathParam;
 										pathParams.add(new VariableDeclaration(var.getType(), var.getName()));
diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
index c38fa6d..a76879f 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
@@ -178,7 +178,19 @@
 			return new Constant(Integer.toString(-Integer.parseInt(sArg)));
 		}
 	});
-	public static final Symbol eq = new Symbol(Parser.EQ, 2, Symbol.Type.INFIX, "==", Symbol.Type.INFIX, new Symbol.ICalculator() {
+	public static final Symbol eq = new Symbol(Parser.EQ, 2, Symbol.Type.INFIX, new Symbol.IImplGenerator() {
+		@Override
+		public String generate(Type type, Type[] childrenTypes, String[] children, String[] childrenSideEffects, String[] sideEffect) {
+			for (String s: childrenSideEffects) {
+				sideEffect[0] += s;
+			}
+			if (childrenTypes[0].equals(typeString) && childrenTypes[1].equals(typeString)) {
+				return children[0] + ".equals(" + children[1] + ")";
+			}
+			return "(" + children[0] + "==" + children[1] + ")";
+		}
+		
+	}, new Symbol.ICalculator() {
 		@Override
 		public Expression calculate(List<Expression> args) {
 			if (!(args.get(0) instanceof Constant)) {
@@ -201,7 +213,7 @@
 			} else if (arg0.getType().equals(typeInt) || arg1.getType().equals(typeInt)) {
 				result = (Integer.parseInt(sArg0) == Integer.parseInt(sArg1));
 			} else if (arg0.getType().equals(typeString) || arg1.getType().equals(typeString)) {
-				result = (sArg0.toString().equals(sArg1.toString()));
+				result = sArg0.toString().equals(sArg1.toString());
 			}
 			if (result) {
 				return new Constant(true_);
@@ -210,7 +222,19 @@
 			}
 		}
 	});
-	public static final Symbol neq = new Symbol(Parser.NEQ, 2, Symbol.Type.INFIX, "!=", Symbol.Type.INFIX, new Symbol.ICalculator() {
+	public static final Symbol neq = new Symbol(Parser.NEQ, 2, Symbol.Type.INFIX, new Symbol.IImplGenerator() {
+		@Override
+		public String generate(Type type, Type[] childrenTypes, String[] children, String[] childrenSideEffects, String[] sideEffect) {
+			for (String s: childrenSideEffects) {
+				sideEffect[0] += s;
+			}
+			if (childrenTypes[0].equals(typeString) && childrenTypes[1].equals(typeString)) {
+				return "!" + children[0] + ".equals(" + children[1] + ")";
+			}
+			return "(" + children[0] + "!=" + children[1] + ")";
+		}
+		
+	}, new Symbol.ICalculator() {
 		@Override
 		public Expression calculate(List<Expression> args) {
 			if (!(args.get(0) instanceof Constant)) {
@@ -232,6 +256,8 @@
 				result = (Long.parseLong(sArg0) != Long.parseLong(sArg1));
 			} else if (arg0.getType().equals(typeInt) || arg1.getType().equals(typeInt)) {
 				result = (Integer.parseInt(sArg0) != Integer.parseInt(sArg1));
+			} else if (arg0.getType().equals(typeString) || arg1.getType().equals(typeString)) {
+				result = !(sArg0.toString().equals(sArg1.toString()));
 			}
 			if (result) {
 				return new Constant(true_);