diff --git a/AlgebraicDataflowArchitectureModel/models/RestTest.model b/AlgebraicDataflowArchitectureModel/models/RestTest.model
index d37ca5c..2eb1271 100644
--- a/AlgebraicDataflowArchitectureModel/models/RestTest.model
+++ b/AlgebraicDataflowArchitectureModel/models/RestTest.model
@@ -24,7 +24,7 @@
 }
 
 channel setUrl(num: Int) {
-	out restClients.{num}.url(curUrl: Str, setUrl(newUrl: Str)) = newUrl
+	out restClients.{num}.url(curUrl: Str, setUrl(newUrl)) = newUrl
 }
 
 channel addBody(num: Int) {
diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlPresenter.java b/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlPresenter.java
index d892e7d..9e09d9d 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlPresenter.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlPresenter.java
@@ -136,8 +136,8 @@
 		Resource widgetsResource = screenResource.getChildrenMap().get("widgets");
 		for(String newWid: newWidSet) {
 			Expression value = ((MapTerm) newWidgets).get(newWid);
-			if(value instanceof MapTerm) {
-				MapTerm widget = (MapTerm) value;
+			if(value instanceof JsonTerm) {
+				JsonTerm widget = (JsonTerm) value;
 				Resource widgetResource = widgetsResource.getChildrenMap().get(newWid);
 				Expression type = widget.get("type");
 
@@ -164,8 +164,8 @@
 		Resource widgetsResource = screenResource.getChildrenMap().get("widgets");
 		for(String newWid: newWidSet) {
 			Expression value = ((MapTerm) newWidgets).get(newWid);
-			if(value instanceof MapTerm) {
-				MapTerm widget = (MapTerm) value;
+			if(value instanceof JsonTerm) {
+				JsonTerm widget = (JsonTerm) value;
 				Resource widgetResource = widgetsResource.getChildrenMap().get(newWid);
 				Expression type = widget.get("\"type\"");
 
@@ -185,7 +185,7 @@
 
 	}
 
-	private void addButton(MapTerm widget, String wid, ListTerm addElements, Resource widgetResource) {
+	private void addButton(JsonTerm widget, String wid, ListTerm addElements, Resource widgetResource) {
 		String text = widget.get("text").toString();
 		HtmlElement button = new HtmlElement("button", wid, text);
 		
@@ -232,7 +232,7 @@
 		addElements.append(button.toMap());
 	}
 	
-	private void addLabel(MapTerm widget, String wid, ListTerm addElements, Resource widgetResource) {
+	private void addLabel(JsonTerm widget, String wid, ListTerm addElements, Resource widgetResource) {
 		String text = widget.get("text").toString();
 		HtmlElement label = new HtmlElement("label", wid, text);
 		
@@ -275,7 +275,7 @@
 		addElements.append(label.toMap());
 	}
 	
-	private void addTextInput(MapTerm widget, String wid, ListTerm addElements, Resource widgetResource) {
+	private void addTextInput(JsonTerm widget, String wid, ListTerm addElements, Resource widgetResource) {
 		String text = widget.get("text").toString();
 		HtmlElement textInput = new HtmlElement("textInput", wid, text);