diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index 19e3083..9a59356 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -15,7 +15,9 @@
 import code.ast.VariableDeclaration;
 import models.Edge;
 import models.Node;
+import models.algebra.Constant;
 import models.algebra.Expression;
+import models.algebra.Field;
 import models.algebra.InvalidMessage;
 import models.algebra.ParameterizedIdentifierIsFutureWork;
 import models.algebra.Term;
@@ -25,6 +27,7 @@
 import models.algebra.Variable;
 import models.dataConstraintModel.Channel;
 import models.dataConstraintModel.ChannelMember;
+import models.dataConstraintModel.DataConstraintModel;
 import models.dataConstraintModel.ResourcePath;
 import models.dataConstraintModel.Selector;
 import models.dataFlowModel.DataFlowEdge;
@@ -436,12 +439,12 @@
 					
 					if (input != null) {
 						// Add a statement to update the state field to the input method.
-						if (resourceNode.getNumberOfParameters() == 0) {
-							try {
-								String[] sideEffects = new String[] {""};
-								Expression updateExp;
-								updateExp = ((DataTransferChannel) ch).deriveUpdateExpressionOf(out, getPullAccessor());
-								String newState = updateExp.toImplementation(sideEffects);
+						try {
+							String[] sideEffects = new String[] {""};
+							Expression updateExp;
+							updateExp = ((DataTransferChannel) ch).deriveUpdateExpressionOf(out, getPullAccessor());
+							String newState = updateExp.toImplementation(sideEffects);
+							if (resourceNode.getResourceHierarchy().getNumParameters() == 0) {
 								String updateStatement;
 								if (updateExp instanceof Term && ((Term) updateExp).getSymbol().isImplWithSideEffect()) {
 									updateStatement = sideEffects[0];	
@@ -449,10 +452,37 @@
 									updateStatement = sideEffects[0] + langSpec.getFieldAccessor(fieldOfResourceState) + langSpec.getAssignment() + newState + langSpec.getStatementDelimiter();
 								}
 								input.addFirstStatement(updateStatement);
-							} catch (ParameterizedIdentifierIsFutureWork | ResolvingMultipleDefinitionIsFutureWork
-									| InvalidMessage | UnificationFailed | ValueUndefined e) {
-								e.printStackTrace();
+							} else {
+								String updateStatement = null;
+								if (updateExp instanceof Term && ((Term) updateExp).getSymbol().isImplWithSideEffect()) {
+									// ToDo.
+									updateStatement = sideEffects[0];	
+								} else {
+									if (DataConstraintModel.typeList.isAncestorOf(resourceNode.getParent().getResourceStateType())) {
+										Term selector = new Term(DataConstraintModel.set);
+										selector.addChild(new Constant(langSpec.getFieldAccessor(fieldOfResourceState)));
+										selector.addChild(new Variable(input.getParameters().get(input.getParameters().size() - 2).getName()));
+										selector.addChild(new Constant(newState));
+										String[] sideEffects2 = new String[] {""};
+										String newList = selector.toImplementation(sideEffects2);
+										updateStatement = sideEffects[0] + sideEffects2[0];
+									} else if (DataConstraintModel.typeMap.isAncestorOf(resourceNode.getParent().getResourceStateType())) {
+										Term selector = new Term(DataConstraintModel.set);
+										selector.addChild(new Constant(langSpec.getFieldAccessor(fieldOfResourceState)));
+										selector.addChild(new Variable(input.getParameters().get(input.getParameters().size() - 2).getName()));
+										selector.addChild(new Constant(newState));
+										String[] sideEffects2 = new String[] {""};
+										String newList = selector.toImplementation(sideEffects2);
+										updateStatement = sideEffects[0] + sideEffects2[0];
+									}
+									if (updateStatement != null) {
+										input.addFirstStatement(updateStatement);
+									}
+								}
 							}
+						} catch (ParameterizedIdentifierIsFutureWork | ResolvingMultipleDefinitionIsFutureWork
+								| InvalidMessage | UnificationFailed | ValueUndefined e) {
+							e.printStackTrace();
 						}
 												
 						// Add an invocation to an update method (for a chain of update method invocations).
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
index 78a440e..9087e2e 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
@@ -14,6 +14,7 @@
 import code.ast.VariableDeclaration;
 import models.Edge;
 import models.Node;
+import models.algebra.Constant;
 import models.algebra.Expression;
 import models.algebra.Field;
 import models.algebra.InvalidMessage;
@@ -72,7 +73,7 @@
 									MethodDeclaration update = getUpdateMethod(dstType, srcType);
 									if (((StoreAttribute) dst.getAttribute()).isStored()) {
 										// update stored state of dst side resource (when every incoming edge is in push style)
-										Expression updateExp = ((ChannelNode) resToCh.getDestination()).getChannel().deriveUpdateExpressionOf(out, JavaCodeGenerator.pushAccessor);									
+										Expression updateExp = ((ChannelNode) resToCh.getDestination()).getChannel().deriveUpdateExpressionOf(out, JavaCodeGenerator.pushAccessor);
 										String[] sideEffects = new String[] {""};
 										String curState = updateExp.toImplementation(sideEffects);
 										String updateStatement;
@@ -253,16 +254,18 @@
 						}
 					} else {
 						MethodDeclaration getter = getGetterMethod(type, resource.getNumParameters());
-						if (DataConstraintModel.typeList.isAncestorOf(resource.getParent().getResourceStateType())) {
-							Term selector = new Term(DataConstraintModel.get);
-							selector.addChild(new Field("value"));
-							selector.addChild(new Variable(getter.getParameters().get(getter.getParameters().size() - 1).getName()));
-							getter.addStatement("return " + selector.toImplementation(new String[] {}) + ";");
-						} else if (DataConstraintModel.typeMap.isAncestorOf(resource.getParent().getResourceStateType())) {
-							Term selector = new Term(DataConstraintModel.lookup);
-							selector.addChild(new Field("value"));
-							selector.addChild(new Variable(getter.getParameters().get(getter.getParameters().size() - 1).getName()));
-							getter.addStatement("return " + selector.toImplementation(new String[] {}) + ";");
+						if (getter.getBody() == null || getter.getBody().getStatements().size() == 0) {
+							if (DataConstraintModel.typeList.isAncestorOf(resource.getParent().getResourceStateType())) {
+								Term selector = new Term(DataConstraintModel.get);
+								selector.addChild(new Field("value"));
+								selector.addChild(new Variable(getter.getParameters().get(getter.getParameters().size() - 1).getName()));
+								getter.addStatement("return " + selector.toImplementation(new String[] {}) + ";");
+							} else if (DataConstraintModel.typeMap.isAncestorOf(resource.getParent().getResourceStateType())) {
+								Term selector = new Term(DataConstraintModel.lookup);
+								selector.addChild(new Field("value"));
+								selector.addChild(new Variable(getter.getParameters().get(getter.getParameters().size() - 1).getName()));
+								getter.addStatement("return " + selector.toImplementation(new String[] {}) + ";");
+							}
 						}
 					}
 					// methods for input events
@@ -273,10 +276,10 @@
 							MethodDeclaration input = getInputMethod(type, out);
 							if (input != null) {
 								// In each resource
-								if (resource.getTotalNumParameters() == 0) {
-									String[] sideEffects = new String[] {""};
-									Expression updateExp = entry.getKey().deriveUpdateExpressionOf(out, JavaCodeGenerator.pushAccessor);
-									String newState = updateExp.toImplementation(sideEffects);
+								String[] sideEffects = new String[] {""};
+								Expression updateExp = entry.getKey().deriveUpdateExpressionOf(out, JavaCodeGenerator.pushAccessor);
+								String newState = updateExp.toImplementation(sideEffects);
+								if (resource.getNumParameters() == 0) {
 									String updateStatement;
 									if (updateExp instanceof Term && ((Term) updateExp).getSymbol().isImplWithSideEffect()) {
 										updateStatement = sideEffects[0];	
@@ -286,6 +289,33 @@
 									if (input.getBody() == null || !input.getBody().getStatements().contains(updateStatement)) {
 										input.addFirstStatement(updateStatement);
 									}
+								} else {
+									String updateStatement = null;
+									if (updateExp instanceof Term && ((Term) updateExp).getSymbol().isImplWithSideEffect()) {
+										// ToDo.
+										updateStatement = sideEffects[0];	
+									} else {
+										if (DataConstraintModel.typeList.isAncestorOf(resource.getParent().getResourceStateType())) {
+											Term selector = new Term(DataConstraintModel.set);
+											selector.addChild(new Field("value"));
+											selector.addChild(new Variable(input.getParameters().get(input.getParameters().size() - 2).getName()));
+											selector.addChild(new Constant(newState));
+											String[] sideEffects2 = new String[] {""};
+											String newList = selector.toImplementation(sideEffects2);
+											updateStatement = sideEffects[0] + sideEffects2[0];
+										} else if (DataConstraintModel.typeMap.isAncestorOf(resource.getParent().getResourceStateType())) {
+											Term selector = new Term(DataConstraintModel.set);
+											selector.addChild(new Field("value"));
+											selector.addChild(new Variable(input.getParameters().get(input.getParameters().size() - 2).getName()));
+											selector.addChild(new Constant(newState));
+											String[] sideEffects2 = new String[] {""};
+											String newList = selector.toImplementation(sideEffects2);
+											updateStatement = sideEffects[0] + sideEffects2[0];
+										}
+										if (updateStatement != null && (input.getBody() == null || !input.getBody().getStatements().contains(updateStatement))) {
+											input.addFirstStatement(updateStatement);
+										}
+									}
 								}
 								
 								// In the main type
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
index 822481a..37d6fb6 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
@@ -16,6 +16,7 @@
 import code.ast.VariableDeclaration;
 import models.Edge;
 import models.Node;
+import models.algebra.Constant;
 import models.algebra.Expression;
 import models.algebra.Field;
 import models.algebra.InvalidMessage;
@@ -330,16 +331,18 @@
 						}
 					} else {
 						MethodDeclaration getter = getGetterMethod(type, resource.getNumParameters());
-						if (DataConstraintModel.typeList.isAncestorOf(resource.getParent().getResourceStateType())) {
-							Term selector = new Term(DataConstraintModel.get);
-							selector.addChild(new Field("value"));
-							selector.addChild(new Variable(getter.getParameters().get(getter.getParameters().size() - 1).getName()));
-							getter.addStatement("return " + selector.toImplementation(new String[] {}) + ";");
-						} else if (DataConstraintModel.typeMap.isAncestorOf(resource.getParent().getResourceStateType())) {
-							Term selector = new Term(DataConstraintModel.lookup);
-							selector.addChild(new Field("value"));
-							selector.addChild(new Variable(getter.getParameters().get(getter.getParameters().size() - 1).getName()));
-							getter.addStatement("return " + selector.toImplementation(new String[] {}) + ";");
+						if (getter.getBody() == null || getter.getBody().getStatements().size() == 0) {
+							if (DataConstraintModel.typeList.isAncestorOf(resource.getParent().getResourceStateType())) {
+								Term selector = new Term(DataConstraintModel.get);
+								selector.addChild(new Field("value"));
+								selector.addChild(new Variable(getter.getParameters().get(getter.getParameters().size() - 1).getName()));
+								getter.addStatement("return " + selector.toImplementation(new String[] {}) + ";");
+							} else if (DataConstraintModel.typeMap.isAncestorOf(resource.getParent().getResourceStateType())) {
+								Term selector = new Term(DataConstraintModel.lookup);
+								selector.addChild(new Field("value"));
+								selector.addChild(new Variable(getter.getParameters().get(getter.getParameters().size() - 1).getName()));
+								getter.addStatement("return " + selector.toImplementation(new String[] {}) + ";");
+							}
 						}
 					}
 					// methods for input events
@@ -349,10 +352,10 @@
 						for (ChannelMember out: outs) {
 							MethodDeclaration input = getInputMethod(type, out);
 							if (input != null) {
-								if (resource.getTotalNumParameters() == 0) {
-									Expression updateExp = entry.getKey().deriveUpdateExpressionOf(out, JerseyCodeGenerator.pushAccessor);
-									String[] sideEffects = new String[] {""};
-									String newState = updateExp.toImplementation(sideEffects);
+								Expression updateExp = entry.getKey().deriveUpdateExpressionOf(out, JerseyCodeGenerator.pushAccessor);
+								String[] sideEffects = new String[] {""};
+								String newState = updateExp.toImplementation(sideEffects);
+								if (resource.getNumParameters() == 0) {
 									String updateStatement;
 									if (updateExp instanceof Term && ((Term) updateExp).getSymbol().isImplWithSideEffect()) {
 										updateStatement = sideEffects[0];								
@@ -362,6 +365,33 @@
 									if (input.getBody() == null || !input.getBody().getStatements().contains(updateStatement)) {
 										input.addFirstStatement(updateStatement);
 									}
+								} else {
+									String updateStatement = null;
+									if (updateExp instanceof Term && ((Term) updateExp).getSymbol().isImplWithSideEffect()) {
+										// ToDo.
+										updateStatement = sideEffects[0];	
+									} else {
+										if (DataConstraintModel.typeList.isAncestorOf(resource.getParent().getResourceStateType())) {
+											Term selector = new Term(DataConstraintModel.set);
+											selector.addChild(new Field("value"));
+											selector.addChild(new Variable(input.getParameters().get(input.getParameters().size() - 2).getName()));
+											selector.addChild(new Constant(newState));
+											String[] sideEffects2 = new String[] {""};
+											String newList = selector.toImplementation(sideEffects2);
+											updateStatement = sideEffects[0] + sideEffects2[0];
+										} else if (DataConstraintModel.typeMap.isAncestorOf(resource.getParent().getResourceStateType())) {
+											Term selector = new Term(DataConstraintModel.set);
+											selector.addChild(new Field("value"));
+											selector.addChild(new Variable(input.getParameters().get(input.getParameters().size() - 2).getName()));
+											selector.addChild(new Constant(newState));
+											String[] sideEffects2 = new String[] {""};
+											String newList = selector.toImplementation(sideEffects2);
+											updateStatement = sideEffects[0] + sideEffects2[0];
+										}
+										if (updateStatement != null && (input.getBody() == null || !input.getBody().getStatements().contains(updateStatement))) {
+											input.addFirstStatement(updateStatement);
+										}
+									}
 								}
 							}
 						}