diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/JavaPrototypeGenerateAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/JavaPrototypeGenerateAction.java
index 4083dce..ddd22e4 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/actions/JavaPrototypeGenerateAction.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/actions/JavaPrototypeGenerateAction.java
@@ -59,8 +59,8 @@
 			} else {
 				JavaCodeGenerator.resetMainTypeName();			// use the default main type's name.
 			}
-			editor.setCodes(JavaMethodBodyGenerator.doGenerate(graph, model, JavaCodeGenerator.doGenerate(graph, model)));
-//			editor.setCodes(new CodeGeneratorFromDataFlowGraph().generateCode(model, graph, new JavaSpecific()));
+//			editor.setCodes(JavaMethodBodyGenerator.doGenerate(graph, model, JavaCodeGenerator.doGenerate(graph, model)));
+			editor.setCodes(new CodeGeneratorFromDataFlowGraph().generateCode(model, graph, new JavaSpecific()));
 			ModelExtension.recoverModel(model);
 			for (CompilationUnit file : editor.getCodes()) {
 				System.out.println(file);
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index 1e37236..00b9406 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -742,6 +742,9 @@
 										String[] sideEffects2 = new String[] {""};
 										String newList = selector.toImplementation(sideEffects2);
 										updateStatement = sideEffects[0] + sideEffects2[0];
+									} else {
+										String resourceName = JavaCodeGenerator.toVariableName(JavaCodeGenerator.getComponentName(resource));
+										updateStatement = sideEffects[0] + langSpec.getFieldAccessor(resourceName) + langSpec.getAssignment() + newState + langSpec.getStatementDelimiter();
 									}
 									if (updateStatement != null) {
 										input.addFirstStatement(updateStatement);
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
index 607c330..87791a0 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
@@ -414,6 +414,8 @@
 										String[] sideEffects2 = new String[] {""};
 										String newList = selector.toImplementation(sideEffects2);
 										updateStatement = sideEffects[0] + sideEffects2[0];
+									} else {
+										updateStatement = sideEffects[0] + "this." + JavaCodeGenerator.toVariableName(JavaCodeGenerator.getComponentName(resource)) + " = " + newState + ";";
 									}
 									if (updateStatement != null && (input.getBody() == null || !input.getBody().getStatements().contains(updateStatement))) {
 										input.addFirstStatement(updateStatement);
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
index 4920156..9a01dd3 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
@@ -207,7 +207,7 @@
 									if (((StoreAttribute) dst.getAttribute()).isStored()) {
 										// returns the state stored in a field.
 										if (dstComponent == null) {
-											String dstParentResourceName = JavaCodeGenerator.getComponentName(dst.getResourceHierarchy().getParent());
+											String dstParentResourceName = JerseyCodeGenerator.getComponentName(dst.getResourceHierarchy().getParent());
 											dstComponent = componentMap.get(dstParentResourceName);
 										}
 										MethodDeclaration getter = null;
@@ -330,7 +330,7 @@
 								} else if ((pushPull.getOptions().get(0) != PushPullValue.PUSH && !outsideOutputResource) || outsideInputResource) {
 									// for pull (or push/pull) data transfer
 									if (dstComponent == null) {
-										String dstParentResourceName = JavaCodeGenerator.getComponentName(dst.getResourceHierarchy().getParent());
+										String dstParentResourceName = JerseyCodeGenerator.getComponentName(dst.getResourceHierarchy().getParent());
 										dstComponent = componentMap.get(dstParentResourceName);
 									}
 									MethodDeclaration getter = null;
@@ -474,14 +474,14 @@
 					Set<ChannelMember> outs = entry.getValue();
 					for (ChannelMember out: outs) {
 						MethodDeclaration input = null;
-						if (JavaCodeGenerator.generatesComponent(resource)) {
+						if (JerseyCodeGenerator.generatesComponent(resource)) {
 							// A component is generated for this resource.
 							input = getInputMethod(component, out);
 						} else {
 							// No component is generated for this resource.
 							ResourceHierarchy parent = resource.getParent();
 							if (parent != null) {
-								TypeDeclaration parentType = componentMap.get(JavaCodeGenerator.getComponentName(parent));
+								TypeDeclaration parentType = componentMap.get(JerseyCodeGenerator.getComponentName(parent));
 								input = getInputMethod(parentType, out);
 							}
 						}
@@ -490,7 +490,7 @@
 							Expression updateExp = entry.getKey().deriveUpdateExpressionOf(out, JerseyCodeGenerator.pushAccessor);
 							String[] sideEffects = new String[] {""};
 							String newState = updateExp.toImplementation(sideEffects);
-							if (JavaCodeGenerator.generatesComponent(resource)) {
+							if (JerseyCodeGenerator.generatesComponent(resource)) {
 								String updateStatement;
 								if (updateExp instanceof Term && ((Term) updateExp).getSymbol().isImplWithSideEffect()) {
 									updateStatement = sideEffects[0];								
@@ -522,6 +522,8 @@
 										String[] sideEffects2 = new String[] {""};
 										String newList = selector.toImplementation(sideEffects2);
 										updateStatement = sideEffects[0] + sideEffects2[0];
+									} else {
+										updateStatement = sideEffects[0] + "this." + JerseyCodeGenerator.toVariableName(JerseyCodeGenerator.getComponentName(resource)) + " = " + newState + ";";
 									}
 									if (updateStatement != null && (input.getBody() == null || !input.getBody().getStatements().contains(updateStatement))) {
 										input.addFirstStatement(updateStatement);
diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java
index e591e07..da49317 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java
@@ -139,4 +139,14 @@
 		}
 		return super.toImplementation(sideEffects);
 	}
+	
+	@Override
+	public Object clone() {
+		JsonAccessor newTerm = new JsonAccessor(symbol);
+		for (Expression e: children) {
+			newTerm.addChild((Expression) e.clone());
+		}
+		newTerm.type = type;
+		return newTerm;
+	}
 }