diff --git a/AlgebraicDataflowArchitectureModel/src/algorithms/JerseyMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/algorithms/JerseyMethodBodyGenerator.java
index 86ee9d9..8eddeb8 100644
--- a/AlgebraicDataflowArchitectureModel/src/algorithms/JerseyMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/algorithms/JerseyMethodBodyGenerator.java
@@ -98,9 +98,7 @@
 										param.setName(paramName + "_json");
 										paramConverter += paramType.getInterfaceTypeName() + " " + paramName + " = new " + paramType.getImplementationTypeName() + "();\n";
 										paramConverter += "for (String str: " + param.getName() + ") {\n";
-										String mapTypeName = compType.getInterfaceTypeName();
-										mapTypeName = mapTypeName.replace("Map.Entry", "Map");
-										mapTypeName = "Map<String" + mapTypeName.substring(mapTypeName.indexOf(","));			// The first element is always string.
+										String mapTypeName = convertFromEntryToMapType(compType);
 										paramConverter += "\t" + mapTypeName + " i = new ObjectMapper().readValue(str, HashMap.class);\n";
 										paramConverter += "\t" + paramName + ".add(" + getCodeForConversionFromMapToTuple(compType, "i") + ");\n";
 										paramConverter += "}";
@@ -110,9 +108,7 @@
 									param.setType(DataConstraintModel.typeString);
 									param.setName(paramName + "_json");
 									paramConverter += "{\n";
-									String mapTypeName = paramType.getInterfaceTypeName();
-									mapTypeName = mapTypeName.replace("Map.Entry", "Map");
-									mapTypeName = "Map<String" + mapTypeName.substring(mapTypeName.indexOf(","));			// The first element is always string.
+									String mapTypeName = convertFromEntryToMapType(paramType);
 									paramConverter += "\t" + mapTypeName + " i = new ObjectMapper().readValue(" + paramName + "_json" + ", HashMap.class);\n";
 									paramConverter += "\t" + paramName + " = " + getCodeForConversionFromMapToTuple(paramType, "i") + ";\n";
 									paramConverter += "}";
@@ -182,9 +178,7 @@
 								Type compType = TypeInference.getListComponentType(srcResourceType);
 								if (DataConstraintModel.typeTuple.isAncestorOf(compType)) {
 									varName += "_json";
-									String mapTypeName = compType.getInterfaceTypeName();
-									mapTypeName = mapTypeName.replace("Map.Entry", "Map");
-									mapTypeName = "Map<String" + mapTypeName.substring(mapTypeName.indexOf(","));			// The first element is always string.
+									String mapTypeName = convertFromEntryToMapType(compType);
 									respTypeName = "List<" + mapTypeName + ">";
 									respConverter += srcResourceType.getInterfaceTypeName() + " " + srcResourceName + " = new " + srcResourceType.getImplementationTypeName() + "();\n";
 									respConverter += "for (" + mapTypeName + " i: " + varName + ") {\n";
@@ -194,13 +188,8 @@
 								}
 							} else if (DataConstraintModel.typeTuple.isAncestorOf(srcResourceType)) {
 								varName += "_json";
-								respConverter += "{\n";
-								String mapTypeName = srcResourceType.getInterfaceTypeName();
-								mapTypeName = mapTypeName.replace("Map.Entry", "Map");
-								mapTypeName = "Map<String" + mapTypeName.substring(mapTypeName.indexOf(","));			// The first element is always string.
-								respTypeName = mapTypeName;
-								respConverter += "\t" + srcResourceName + " = " + getCodeForConversionFromMapToTuple(srcResourceType, varName) + ";\n";
-								respConverter += "}";
+								respTypeName = convertFromEntryToMapType(srcResourceType);
+								respConverter += srcResourceName + " = " + getCodeForConversionFromMapToTuple(srcResourceType, varName) + ";";
 								getter.addThrow("JsonProcessingException");
 							}
 							if (respConverter.length() > 0) {
@@ -252,29 +241,39 @@
 		return codes;
 	}
 
+	private static String convertFromEntryToMapType(Type type) {
+		String mapTypeName = type.getInterfaceTypeName();
+		mapTypeName = mapTypeName.replace("Map.Entry", "Map");
+		for (int idx = mapTypeName.indexOf("<", 0); idx >= 0; idx = mapTypeName.indexOf("<", idx + 1)) {
+			int to = mapTypeName.indexOf(",", idx);
+			if (to > idx) {
+				mapTypeName = mapTypeName.substring(0, idx + 1) + "String" + mapTypeName.substring(to);		// All elements except for the last one have the string type.
+			}
+		}
+		return mapTypeName;
+	}
+
 	private static String getCodeForConversionFromMapToTuple(Type tupleType, String mapVar) {
 		String decoded = "$x";
 		List<Type> elementsTypes = TypeInference.getTupleComponentTypes(tupleType);
 		String elementBase = mapVar + ".entrySet().iterator().next()";
-		if (elementsTypes.get(0) == DataConstraintModel.typeBoolean) {
-			decoded = decoded.replace("$x", "new AbstractMap.SimpleEntry<>(Boolean.parseBoolean(" + elementBase + ".getKey()), $x)");
-		} else if (elementsTypes.get(0) == DataConstraintModel.typeInt) {
-			decoded = decoded.replace("$x", "new AbstractMap.SimpleEntry<>(Integer.parseInt(" + elementBase + ".getKey()), $x)");
-		} else if (elementsTypes.get(0) == DataConstraintModel.typeLong) {
-			decoded = decoded.replace("$x", "new AbstractMap.SimpleEntry<>(Long.parseLong(" + elementBase + ".getKey()), $x)");
-		} else if (elementsTypes.get(0) == DataConstraintModel.typeFloat) {
-			decoded = decoded.replace("$x", "new AbstractMap.SimpleEntry<>(Float.parseFloat(" + elementBase + ".getKey()), $x)");
-		} else if (elementsTypes.get(0) == DataConstraintModel.typeDouble) {
-			decoded = decoded.replace("$x", "new AbstractMap.SimpleEntry<>(Double.parseDouble(" + elementBase + ".getKey()), $x)");
-		} else if (elementsTypes.get(0) == DataConstraintModel.typeString) {
-			decoded = decoded.replace("$x", "new AbstractMap.SimpleEntry<>(" + elementBase + ", $x)");
-		} else {
-			// Future work.
-		}
-		elementBase += ".getValue()";
-		for (Type elmType: elementsTypes.subList(1, elementsTypes.size() - 1)) {
-			decoded = decoded.replace("$x", "new AbstractMap.SimpleEntry<>(" + elementBase + ".getKey(), $x)");
-			elementBase += ".getValue()";
+		for (Type elmType: elementsTypes.subList(0, elementsTypes.size() - 1)) {
+			if (elmType == DataConstraintModel.typeBoolean) {
+				decoded = decoded.replace("$x", "new AbstractMap.SimpleEntry<>(Boolean.parseBoolean(" + elementBase + ".getKey()), $x)");
+			} else if (elmType == DataConstraintModel.typeInt) {
+				decoded = decoded.replace("$x", "new AbstractMap.SimpleEntry<>(Integer.parseInt(" + elementBase + ".getKey()), $x)");
+			} else if (elmType == DataConstraintModel.typeLong) {
+				decoded = decoded.replace("$x", "new AbstractMap.SimpleEntry<>(Long.parseLong(" + elementBase + ".getKey()), $x)");
+			} else if (elmType == DataConstraintModel.typeFloat) {
+				decoded = decoded.replace("$x", "new AbstractMap.SimpleEntry<>(Float.parseFloat(" + elementBase + ".getKey()), $x)");
+			} else if (elmType == DataConstraintModel.typeDouble) {
+				decoded = decoded.replace("$x", "new AbstractMap.SimpleEntry<>(Double.parseDouble(" + elementBase + ".getKey()), $x)");
+			} else if (elmType == DataConstraintModel.typeString) {
+				decoded = decoded.replace("$x", "new AbstractMap.SimpleEntry<>(" + elementBase + ".getKey(), $x)");
+			} else {
+				// To do.
+			}
+			elementBase += ".getValue().entrySet().iterator().next()";
 		}
 		decoded = decoded.replace("$x", elementBase);
 		return decoded;