diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index 57d42bb..cb60a92 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -23,6 +23,7 @@
 import models.algebra.Expression;
 import models.algebra.Field;
 import models.algebra.InvalidMessage;
+import models.algebra.Parameter;
 import models.algebra.ParameterizedIdentifierIsFutureWork;
 import models.algebra.Position;
 import models.algebra.Term;
@@ -860,18 +861,20 @@
 									// Add statements to the update method.
 									String[] sideEffects = new String[] {""};
 									String newState = updateExp.toImplementation(sideEffects);
+									int numOfOutResourcesWithTheSameHierarchy = 0;
+									for (ResourcePath outResPath: ch.getOutputResources()) {
+										if (outResPath.getResourceHierarchy().equals(outRes)) {
+											numOfOutResourcesWithTheSameHierarchy++;
+										}
+									}
+									String updateStatement = "";
 									if (generatesComponent(outRes)) {
-										String updateStatement;
 										if (updateExp instanceof Term && ((Term) updateExp).getSymbol().isImplWithSideEffect()) {
 											updateStatement = sideEffects[0];
 										} else {
 											updateStatement = sideEffects[0] + langSpec.getFieldAccessor(fieldOfResourceState) + langSpec.getAssignment() + newState + langSpec.getStatementDelimiter();	// this.value = ...
 										}
-										if (update.getBody() == null || !update.getBody().getStatements().contains(updateStatement)) {
-											update.addFirstStatement(updateStatement);
-										}
 									} else {
-										String updateStatement = "";
 										if (sideEffects[0] != null) {
 											updateStatement = sideEffects[0];	
 											String resourceName = langSpec.toVariableName(getComponentName(outRes, langSpec));
@@ -897,9 +900,44 @@
 											String resourceName = langSpec.toVariableName(getComponentName(outRes, langSpec));
 											updateStatement += langSpec.getFieldAccessor(resourceName) + langSpec.getAssignment() + newState + langSpec.getStatementDelimiter();
 										}
-										if (update.getBody() == null || !update.getBody().getStatements().contains(updateStatement)) {
-											update.addFirstStatement(updateStatement);
+									}
+									if (numOfOutResourcesWithTheSameHierarchy == 1) {
+										update.addFirstStatement(updateStatement);
+									} else {
+										Term conditions = null;
+										int i = 1;
+										Map<ChannelMember, Entry<ResourcePath, Set<ChannelMember>>> resourcePaths = ch.fillOutsideResourcePaths(out, JerseyCodeGenerator.pushAccessor);
+										for (Expression pathParam: out.getResource().getPathParams()) {
+											if (pathParam instanceof Variable) {
+												String selfParamName = ((Variable) pathParam).getName();
+												Expression arg = null;
+												for (Selector selector: ch.getAllSelectors()) {
+													if (selector.getExpression() instanceof Variable) {
+														Variable selVar = (Variable) selector.getExpression();
+														if (selVar.getName().equals(selfParamName)) {
+															arg = selVar;
+															break;
+														}
+													}
+												}
+												if (arg == null) {
+													ResourcePath filledPath = resourcePaths.get(out).getKey();
+													arg = filledPath.getPathParams().get(i - 1);
+												}
+												Term condition = new Term(DataConstraintModel.eq, new Expression[] {
+														new Parameter("self" + (i > 1 ? i : "")), 
+														arg});
+												if (conditions == null) {
+													conditions = condition;
+												} else {
+													conditions = new Term(DataConstraintModel.and, new Expression[] {
+															conditions, 
+															condition});
+												}
+											}
+											i++;
 										}
+										update.addFirstStatement(langSpec.getIfStatement(conditions, updateStatement));
 									}
 									break;
 								}