diff --git a/AlgebraicDataflowArchitectureModel/src/models/algebra/Constant.java b/AlgebraicDataflowArchitectureModel/src/models/algebra/Constant.java
index cc1ffee..5f533a7 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/algebra/Constant.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/algebra/Constant.java
@@ -36,7 +36,7 @@
 	
 	public String toImplementation(String[] sideEffects) {
 		if (symbol.isImplGenerative()) {
-			String exp = symbol.generate(getType(), new String[] {}, new String[] {}, sideEffects);
+			String exp = symbol.generate(getType(), new Type[] {}, new String[] {}, new String[] {}, sideEffects);
 			return exp;
 		}
 		return symbol.getImplName();
diff --git a/AlgebraicDataflowArchitectureModel/src/models/algebra/Symbol.java b/AlgebraicDataflowArchitectureModel/src/models/algebra/Symbol.java
index 2efb24a..dcdba9f 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/algebra/Symbol.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/algebra/Symbol.java
@@ -159,14 +159,15 @@
 	/**
 	 * Generate the implementation of this symbol
 	 * @param type the type of this symbol
+	 * @param childrenTypes 
 	 * @param childrenImpl the implementations of the children
 	 * @param childrenSideEffects (input) an array of the side effects of the children
 	 * @param sideEffect (output) an array of the side effect of this symbol
 	 * @return the implementation
 	 */
-	public String generate(models.algebra.Type type, String[] childrenImpl, String[] childrenSideEffects, String[] sideEffect) {
+	public String generate(models.algebra.Type type, models.algebra.Type[] childrenTypes, String[] childrenImpl, String[] childrenSideEffects, String[] sideEffect) {
 		if (generator != null) {
-			return generator.generate(type, childrenImpl, childrenSideEffects, sideEffect);
+			return generator.generate(type, childrenTypes, childrenImpl, childrenSideEffects, sideEffect);
 		}
 		return null;
 	}
@@ -223,11 +224,12 @@
 		/**
 		 * Generate the implementation
 		 * @param type the type of this expression
+		 * @param childrenTypes 
 		 * @param children the implementations of the children
 		 * @param childrenSideEffects (input) an array of the side effects of the children
 		 * @param sideEffect (output) an array of the side effect of this generator
 		 * @return the generated implementation
 		 */
-		public String generate(models.algebra.Type type, String children[], String[] childrenSideEffects, String[] sideEffect);
+		public String generate(models.algebra.Type type, models.algebra.Type[] childrenTypes, String children[], String[] childrenSideEffects, String[] sideEffect);
 	}
 }
diff --git a/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java b/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java
index 3c15d21..52d000e 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java
@@ -290,15 +290,22 @@
 			return exp;
 		}
 		if (symbol.isImplGenerative()) {
+			Type childrenTypes[] = new Type[children.size()];
 			String childrenImpl[] = new String[children.size()];
 			String childrenSideEffects[] = new String[children.size()];
 			if (implParamOrder == null) {
 				for (int i = 0; i < children.size(); i++) {
+					Expression child = children.get(i);
+					if (child instanceof Variable) {
+						childrenTypes[i] = ((Variable) child).getType();
+					} else if (child instanceof Term) {
+						childrenTypes[i] = ((Term) child).getType();
+					}
 					String childSideEffect[] = new String[] {""};
-					childrenImpl[i] = children.get(i).toImplementation(childSideEffect);
+					childrenImpl[i] = child.toImplementation(childSideEffect);
 					childrenSideEffects[i] = childSideEffect[0];
 				}
-				String exp = symbol.generate(getType(), childrenImpl, childrenSideEffects, sideEffects);
+				String exp = symbol.generate(getType(), childrenTypes, childrenImpl, childrenSideEffects, sideEffects);
 				if (symbol.isImplWithSideEffect()) {
 					sideEffects[0] = sideEffects[0] + exp;
 					exp = children.get(0).toImplementation(new String[] {""});	// the value of this term
@@ -306,11 +313,17 @@
 				return exp;
 			} else {
 				for (int i = 0; i < children.size(); i++) {
+					Expression child = children.get(implParamOrder[i]);
+					if (child instanceof Variable) {
+						childrenTypes[i] = ((Variable) child).getType();
+					} else if (child instanceof Term) {
+						childrenTypes[i] = ((Term) child).getType();
+					}
 					String childSideEffect[] = new String[] {""};
-					childrenImpl[i] = children.get(implParamOrder[i]).toImplementation(childSideEffect);
+					childrenImpl[i] = child.toImplementation(childSideEffect);
 					childrenSideEffects[i] = childSideEffect[0];
 				}
-				String exp = symbol.generate(getType(), childrenImpl, childrenSideEffects, sideEffects);
+				String exp = symbol.generate(getType(), childrenTypes, childrenImpl, childrenSideEffects, sideEffects);
 				if (symbol.isImplWithSideEffect()) {
 					sideEffects[0] = sideEffects[0] + exp;
 					exp = children.get(implParamOrder[0]).toImplementation(new String[] {""});	// the value of this term
diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
index e1e4e98..f72c44a 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
@@ -49,10 +49,21 @@
 	public static final Symbol length = new Symbol("length", 1, Symbol.Type.PREFIX, "($x)->$x.size()", Symbol.Type.LAMBDA);
 	public static final Symbol get = new Symbol("get", 2, Symbol.Type.PREFIX, "get", Symbol.Type.METHOD);
 	public static final Symbol set = new Symbol("set", 3, Symbol.Type.PREFIX, "set", Symbol.Type.METHOD_WITH_SIDE_EFFECT);
-	public static final Symbol contains = new Symbol("contains", 2, Symbol.Type.PREFIX, "contains", Symbol.Type.METHOD);
+	public static final Symbol contains = new Symbol("contains", 2, Symbol.Type.PREFIX, new Symbol.IImplGenerator() {
+		@Override
+		public String generate(Type type, Type[] childrenTypes, String[] childrenImpl, String[] childrenSideEffects, String[] sideEffect) {
+			for (String s: childrenSideEffects) {
+				sideEffect[0] += s;
+			}
+			if (childrenTypes[0] != null && (typeMap.isAncestorOf(childrenTypes[0]) || typeJson.isAncestorOf(childrenTypes[0]))) {
+				return childrenImpl[0] + "." + "containsKey(" + childrenImpl[1] + ")";
+			}
+			return childrenImpl[0] + "." + "contains(" + childrenImpl[1] + ")";
+		}
+	});
 	public static final Symbol nil = new Symbol("nil", 0, Symbol.Type.PREFIX, new Symbol.IImplGenerator() {
 		@Override
-		public String generate(Type type, String[] children, String[] childrenSideEffects, String[] sideEffect) {
+		public String generate(Type type, Type[] childrenTypes, String[] children, String[] childrenSideEffects, String[] sideEffect) {
 			String compType = "";
 			if (type != null) {
 				String interfaceType = type.getInterfaceTypeName();
@@ -78,18 +89,18 @@
 	public static final Symbol cond = new Symbol("if", 3, Symbol.Type.PREFIX, new Symbol.IImplGenerator() {
 		final int count[] = {0};
 		@Override
-		public String generate(Type type, String[] children, String[] childrenSideEffects, String[] sideEffect) {
+		public String generate(Type type, Type[] childrenTypes, String[] childrenImpl, String[] childrenSideEffects, String[] sideEffect) {
 			String temp = "temp_if" + count[0];
 			String impl = ""; 
 			
 			impl += type.getInterfaceTypeName() + " " + temp + ";\n";
 			if (childrenSideEffects[0] != null && childrenSideEffects[0].length() > 0) impl += childrenSideEffects[0];
-			impl += "if (" + children[0] + ") {\n";
+			impl += "if (" + childrenImpl[0] + ") {\n";
 			if (childrenSideEffects[1] != null && childrenSideEffects[1].length() > 0) impl += "\t" + childrenSideEffects[1];
-			impl += "\t" + temp + " = " + children[1] + ";\n";
+			impl += "\t" + temp + " = " + childrenImpl[1] + ";\n";
 			impl += "} else {\n";
 			if (childrenSideEffects[2] != null && childrenSideEffects[2].length() > 0) impl += "\t" + childrenSideEffects[2];
-			impl += "\t" + temp + " = " + children[2] + ";\n";
+			impl += "\t" + temp + " = " + childrenImpl[2] + ";\n";
 			impl += "}\n";
 			
 			sideEffect[0] += impl;
@@ -114,7 +125,7 @@
 	public static final Symbol false_ = new Symbol("false", 0, Symbol.Type.PREFIX, "false", Symbol.Type.PREFIX);
 	public static final Symbol pair = new Symbol("pair", -1, Symbol.Type.PREFIX, new Symbol.IImplGenerator() {
 		@Override
-		public String generate(Type type, String[] childrenImpl, String[] childrenSideEffects, String[] sideEffect) {
+		public String generate(Type type, Type[] childrenTypes, String[] childrenImpl, String[] childrenSideEffects, String[] sideEffect) {
 			for (String s: childrenSideEffects) {
 				sideEffect[0] += s;
 			}
@@ -124,7 +135,7 @@
 	});
 	public static final Symbol tuple = new Symbol("tuple", -1, Symbol.Type.PREFIX, new Symbol.IImplGenerator() {
 		@Override
-		public String generate(Type type, String[] childrenImpl, String[] childrenSideEffects, String[] sideEffect) {
+		public String generate(Type type, Type[] childrenTypes, String[] childrenImpl, String[] childrenSideEffects, String[] sideEffect) {
 			for (String s: childrenSideEffects) {
 				sideEffect[0] += s;
 			}
@@ -190,7 +201,7 @@
 		remove.setSignature(new Type[] {typeList, typeList, typeInt});
 		head.setSignature(new Type[] {null, typeList});
 		tail.setSignature(new Type[] {typeList, typeList});
-		contains.setSignature(new Type[] {typeBoolean, typeList, null});
+		contains.setSignature(new Type[] {typeBoolean, null, null});
 		length.setSignature(new Type[] {typeInt, null});
 		get.setSignature(new Type[] {null, typeList, typeInt});
 		set.setSignature(new Type[] {typeList, typeList, typeInt, null});
diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/ModelExtension.java b/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/ModelExtension.java
index 7d4ce1b..bff95f8 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/ModelExtension.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/ModelExtension.java
@@ -26,7 +26,7 @@
 			final int[] count = new int[] {0};
 			sum.setGenerator(new Symbol.IImplGenerator() {
 				@Override
-				public String generate(Type type, String[] children, String[] childrenSideEffects, String[] sideEffect) {
+				public String generate(Type type, Type[] childrenTypes, String[] children, String[] childrenSideEffects, String[] sideEffect) {
 					String compType = "Integer";
 					if (type != null) {
 						String interfaceType = type.getInterfaceTypeName();
@@ -56,7 +56,7 @@
 			final int[] count = new int[] {0};
 			merge.setGenerator(new Symbol.IImplGenerator() {
 				@Override
-				public String generate(Type type, String[] childrenImpl, String[] childrenSideEffects, String[] sideEffect) {
+				public String generate(Type type, Type[] childrenTypes, String[] childrenImpl, String[] childrenSideEffects, String[] sideEffect) {
 					String implType = "ArrayList<>";
 					String interfaceType = "List<Integer>";
 					String compType = "Integer";
@@ -109,7 +109,7 @@
 			extractFaceDown.setArity(1);
 			extractFaceDown.setGenerator(new Symbol.IImplGenerator() {
 				@Override
-				public String generate(Type type, String[] children, String[] childrenSideEffects, String[] sideEffect) {			
+				public String generate(Type type, Type[] childrenTypes, String[] children, String[] childrenSideEffects, String[] sideEffect) {			
 					return children[0]+".stream().filter(item -> item.getValue()==false).collect(Collectors.toList())";
 				}
 			});
@@ -124,7 +124,7 @@
 			sortByKey.setArity(1);
 			sortByKey.setGenerator(new Symbol.IImplGenerator() {
 				@Override
-				public String generate(Type type, String[] children, String[] childrenSideEffects, String[] sideEffect) {			
+				public String generate(Type type, Type[] childrenTypes, String[] children, String[] childrenSideEffects, String[] sideEffect) {			
 					String compType = "";
 					String temp_sort="temp_sort";
 					if (type != null) {