diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
index 159febc..e5b70de 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
@@ -33,7 +33,6 @@
 	public static final Symbol mul = new Symbol(Parser.MUL, 2, Symbol.Type.INFIX);;
 	public static final Symbol sub = new Symbol(Parser.SUB, 2, Symbol.Type.INFIX);
 	public static final Symbol div = new Symbol(Parser.DIV, 2, Symbol.Type.INFIX);
-	public static final Symbol mod = new Symbol(Parser.MOD, 2, Symbol.Type.INFIX);
 	public static final Symbol minus = new Symbol(Parser.MINUS, 1);
 	public static final Symbol cons = new Symbol("cons", 2, Symbol.Type.PREFIX, "($x,$y)->$x.add(0, $y)", Symbol.Type.LAMBDA_WITH_SIDE_EFFECT, new int[] {1, 0});
 	public static final Symbol head = new Symbol("head", 1, Symbol.Type.PREFIX, "($x)->$x.get(0)", Symbol.Type.LAMBDA);
@@ -75,6 +74,7 @@
 			return temp;
 		}
 	});
+	public static final Symbol mod = new Symbol("mod", 2, Symbol.Type.PREFIX, "%", Symbol.Type.INFIX);
 	public static final Symbol eq = new Symbol("eq", 2, Symbol.Type.PREFIX, "==", Symbol.Type.INFIX);
 	public static final Symbol neq = new Symbol("neq", 2, Symbol.Type.PREFIX, "!=", Symbol.Type.INFIX);
 	public static final Symbol gt = new Symbol("gt", 2, Symbol.Type.PREFIX, ">", Symbol.Type.INFIX);
@@ -120,6 +120,7 @@
 		contains.setSignature(new Type[] {typeBoolean, typeList, null});
 		get.setSignature(new Type[] {null, typeList, typeInt});
 		set.setSignature(new Type[] {typeList, typeList, typeInt, null});
+		mod.setSignature(new Type[] {null, null, typeInt});
 		eq.setSignature(new Type[] {null, null, typeBoolean});
 		neq.setSignature(new Type[] {null, null, typeBoolean});
 		gt.setSignature(new Type[] {null, null, typeBoolean});
@@ -160,7 +161,6 @@
 		addSymbol(mul);
 		addSymbol(sub);
 		addSymbol(div);
-		addSymbol(mod);
 		addSymbol(minus);
 		addSymbol(cons);
 		addSymbol(head);
@@ -170,6 +170,7 @@
 		addSymbol(set);
 		addSymbol(nil);
 		addSymbol(cond);
+		addSymbol(mod);
 		addSymbol(eq);
 		addSymbol(neq);
 		addSymbol(gt);
diff --git a/AlgebraicDataflowArchitectureModel/src/parser/Parser.java b/AlgebraicDataflowArchitectureModel/src/parser/Parser.java
index 4372911..c41a255 100644
--- a/AlgebraicDataflowArchitectureModel/src/parser/Parser.java
+++ b/AlgebraicDataflowArchitectureModel/src/parser/Parser.java
@@ -34,13 +34,11 @@
 	public static final String MUL = "*";
 	public static final String SUB = "-";
 	public static final String DIV = "/";
-	public static final String MOD = "%";
 	public static final String MINUS = "-";
 	public static final String ADD_REGX = "\\+";
 	public static final String MUL_REGX = "\\*";
 	public static final String SUB_REGX = "\\-";
 	public static final String DIV_REGX = "/";
-	public static final String MOD_REGX = "\\%";
 	public static final String IN = "in";
 	public static final String OUT = "out";
 	public static final String REF = "ref";
@@ -294,8 +292,6 @@
 				operators.add(DataFlowModel.sub);	// not minus
 			} else if (operator.equals(DIV)) {
 				operators.add(DataFlowModel.div);
-			} else if (operator.equals(MOD)) {
-				operators.add(DataFlowModel.mod);
 			} else {
 				break;
 			}
@@ -360,20 +356,17 @@
 																	splitBy(
 																			splitBy(
 																					splitBy(
-																						splitBy(
-																								splitBy(
-																										splitBy(
-																												Arrays.asList(line.split("[ \t]")), 
-																												ADD,
-																												ADD_REGX),
-																										MUL,
-																										MUL_REGX),
-																								SUB,
-																								SUB_REGX),
-																						DIV,
-																						DIV_REGX),
-																					MOD,
-																					MOD_REGX),
+																							splitBy(
+																									splitBy(
+																											Arrays.asList(line.split("[ \t]")), 
+																											ADD,
+																											ADD_REGX),
+																									MUL,
+																									MUL_REGX),
+																							SUB,
+																							SUB_REGX),
+																					DIV,
+																					DIV_REGX),
 																			COMMA, 
 																			COMMA),
 																	COLON,