diff --git a/AlgebraicDataflowArchitectureModel/models/Citrus.model b/AlgebraicDataflowArchitectureModel/models/Citrus.model
new file mode 100644
index 0000000..3730a7d
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/models/Citrus.model
@@ -0,0 +1,58 @@
+channel Signup {
+    out accounts(accDB:Map, signup(aid:Str)) = insert(accDB, aid, {"favorites": nil, "books": nil})
+}
+
+channel CreateBook(aid:Str) {
+    out accounts.{aid}.books(bookList:List, createBook(title:Str)) = append(bookList, {"title": title, "todos":nil, "favorited": nil})
+}
+
+channel DeleteAccount {
+	out accounts(accDB:Map, deleteAccount(aid:Str)) = if(contains(accDB, aid), delete(accDB, aid), accDB)
+}
+
+channel ChangeAccountName {
+    out accounts(accDB:Map, changeAccountId(aid:Str, newAid:Str)) = insert(delete(accDB, aid), newAid, lookup(accDB, aid))
+}
+
+channel ChangeBookName(aid:Str, bid:Int) {
+    out accounts.{aid}.books.{bid}.title(title:Str, changeBookName(newTitle)) = newTitle
+}
+
+channel DeleteBook(aid:Str) {
+	out accounts.{aid}.books(bookList:List, deleteBook(bid:int)) = if(bid < length(bookList), remove(bookList, bid), bookList)
+}
+
+channel CreateToDo(aid:Str, bid:Int) {
+    out accounts.{aid}.books.{bid}.todos(toDoDB:Map, createtodo(title:Str, year:Str, month:Str, day:Str)) = insert(toDoDB, year, 
+                                                                                                        	insert(lookup(toDoDB, year), month, 
+                                                                                                        	insert(lookup(lookup(toDoDB, year), month), day, 
+                                                                                                        	append(lookup(lookup(lookup(toDoDB, year), month), day), {"title": title, "check": false}))))
+}
+
+channel ChangeToDoName(aid:Str, bid:Int, year:Str, month:Str, day:Str, tid:Int) {
+    out accounts.{aid}.books.{bid}.todos.{year}.{month}.{day}.{tid}.title(title:Str, changeToDoName(newTitle)) = newTitle
+}
+
+channel ChangeCheck(aid:Str, bid:Int, year:Str, month:Str, day:Str, tid:Int) {
+	out accounts.{aid}.books.{bid}.todos.{year}.{month}.{day}.{tid}.check(check:Bool, changeCheck(newCheck)) = newCheck
+}
+
+channel DeleteToDo(aid:Str, bid:Int, year:Str, month:Str, day:Str, tid:Int) {
+    out accounts.{aid}.books.{bid}.todos.{year}.{month}.{day}(todoList:List, deleteToDo(tid:int)) = if(tid < length(todoList), remove(todoList, tid), todoList)
+}
+
+channel AddFavorited(aid:Str, bid:Int) {
+    out accounts.{aid}.books.{bid}.favorited(faList:List, addFavorited(o_aid:Str)) = if(aid==o_aid, 
+    																					faList, 
+    																					if(contains(faList, o_aid), 
+    																						remove(faList, indexOf(faList, o_aid)), 
+    																						append(faList, o_aid)))
+    out accounts.{o_aid}.favorites(aDB:Map, addFavorited(o_aid:Str)) 
+                                        = if(aid==o_aid,
+                                              aDB,
+                                              if(contains(aDB, aid),
+                                                  if(contains(lookup(aDB, aid), bid), 
+                                                      insert(aDB, aid, remove(lookup(aDB, aid), indexOf(lookup(aDB, aid), bid))),
+                                                      insert(aDB, aid, append(lookup(aDB, aid), bid))), 
+                                                  insert(aDB, aid, append(nil, bid))))
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index fc6b3f4..368aa36 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -244,7 +244,7 @@
 				for (VariableDeclaration var: childConstructor.getParameters()) {
 					JsonAccessor jsonMember = new JsonAccessor(DataConstraintModel.dot);
 					jsonMember.addChild(jsonTerm);
-					jsonMember.addChild(new Constant("\"" + var.getName() + "\""));
+					jsonMember.addChild(new Constant(var.getName(), DataConstraintModel.typeString));
 					Expression param = jsonMember.reduce();
 					if (param != null) {
 						if (param instanceof Term) {
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
index 8c2337a..fa8e030 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
@@ -839,7 +839,7 @@
 				for (VariableDeclaration var: childConstructor.getParameters()) {
 					JsonAccessor jsonMember = new JsonAccessor(DataConstraintModel.dot);
 					jsonMember.addChild(jsonTerm);
-					jsonMember.addChild(new Constant("\"" + var.getName() + "\""));
+					jsonMember.addChild(new Constant(var.getName(), DataConstraintModel.typeString));
 					Expression param = jsonMember.reduce();
 					if (param != null) {
 						if (param instanceof Term) {
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
index b50a570..9eebb7f 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
@@ -959,7 +959,7 @@
 				for (VariableDeclaration var: childConstructor.getParameters()) {
 					JsonAccessor jsonMember = new JsonAccessor(DataConstraintModel.dot);
 					jsonMember.addChild(jsonTerm);
-					jsonMember.addChild(new Constant("\"" + var.getName() + "\""));
+					jsonMember.addChild(new Constant(var.getName(), DataConstraintModel.typeString));
 					Expression param = jsonMember.reduce();
 					if (param != null) {
 						if (param instanceof Term) {