diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index e1bf0ae..ae86204 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -689,32 +689,31 @@
 											update.addFirstStatement(updateStatement);
 										}
 									} else {
-										String updateStatement = null;
-										if (updateExp instanceof Term && ((Term) updateExp).getSymbol().isImplWithSideEffect()) {
+										String updateStatement = "";
+										if (sideEffects[0] != null) {
 											updateStatement = sideEffects[0];	
 											String resourceName = langSpec.toVariableName(getComponentName(outRes, langSpec));
 											updateStatement = updateStatement.replace(langSpec.getFieldAccessor(fieldOfResourceState), langSpec.getFieldAccessor(resourceName));
+										}
+										if (DataConstraintModel.typeList.isAncestorOf(resourceNode.getParent().getResourceStateType())) {
+											Term selector = new Term(DataConstraintModel.set);
+											selector.addChild(new Constant(langSpec.getFieldAccessor(fieldOfResourceState)));
+											selector.addChild(new Variable(update.getParameters().get(update.getParameters().size() - 2).getName()));
+											selector.addChild(new Constant(newState));
+											String[] sideEffects2 = new String[] {""};
+											String newList = selector.toImplementation(sideEffects2);
+											updateStatement += sideEffects2[0];
+										} else if (DataConstraintModel.typeMap.isAncestorOf(resourceNode.getParent().getResourceStateType())) {
+											Term selector = new Term(DataConstraintModel.insert);
+											selector.addChild(new Constant(langSpec.getFieldAccessor(fieldOfResourceState)));
+											selector.addChild(new Variable(update.getParameters().get(update.getParameters().size() - 2).getName()));
+											selector.addChild(new Constant(newState));
+											String[] sideEffects2 = new String[] {""};
+											String newMap = selector.toImplementation(sideEffects2);
+											updateStatement += sideEffects2[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(update.getParameters().get(update.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.insert);
-												selector.addChild(new Constant(langSpec.getFieldAccessor(fieldOfResourceState)));
-												selector.addChild(new Variable(update.getParameters().get(update.getParameters().size() - 2).getName()));
-												selector.addChild(new Constant(newState));
-												String[] sideEffects2 = new String[] {""};
-												String newMap = selector.toImplementation(sideEffects2);
-												updateStatement = sideEffects[0] + sideEffects2[0];
-											} else {
-												String resourceName = langSpec.toVariableName(getComponentName(outRes, langSpec));
-												updateStatement = sideEffects[0] + langSpec.getFieldAccessor(resourceName) + langSpec.getAssignment() + newState + langSpec.getStatementDelimiter();
-											}
+											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);
@@ -857,9 +856,22 @@
 										params.add(refVarName);
 									}
 								}
-								update.addStatement(langSpec.getMethodInvocation(langSpec.getFieldAccessor(((ResourceNode) chToRes2.getDestination()).getResourceName()), 
-																					updateMethodName + resComponentName, 
-																					params) + langSpec.getStatementDelimiter());	// this.dst.updateSrc(value, refParams);
+								ResourceHierarchy srcRes2 = resourceNode.getResourceHierarchy();
+								if (!generatesComponent(srcRes2)) {
+									srcRes2 = srcRes2.getParent();
+								}
+								ResourceHierarchy dstRes = ((ResourceNode) chToRes2.getDestination()).getResourceHierarchy();
+								if (!generatesComponent(dstRes)) {
+									dstRes = dstRes.getParent();
+								}
+								String dstCompName = langSpec.toVariableName(getComponentName(dstRes, langSpec));
+								if (srcRes2 != dstRes) {
+									update.addStatement(langSpec.getMethodInvocation(langSpec.getFieldAccessor(dstCompName), updateMethodName + resComponentName, params) 
+											+ langSpec.getStatementDelimiter());	// this.dst.updateSrc(value, refParams);
+								} else {
+									update.addStatement(langSpec.getMethodInvocation(updateMethodName + resComponentName, params)
+											+ langSpec.getStatementDelimiter());	// this.updateSrc(value, refParams);
+								}
 							}
 						}
 						if (outsideInputMembers2.size() > 0) {
@@ -1165,32 +1177,31 @@
 									}
 									input.addFirstStatement(updateStatement);
 								} else {
-									String updateStatement = null;
-									if (updateExp instanceof Term && ((Term) updateExp).getSymbol().isImplWithSideEffect()) {
+									String updateStatement = "";
+									if (sideEffects[0] != null) {
 										updateStatement = sideEffects[0];	
 										String resourceName = langSpec.toVariableName(getComponentName(resource, langSpec));
 										updateStatement = updateStatement.replace(langSpec.getFieldAccessor(fieldOfResourceState), langSpec.getFieldAccessor(resourceName));
+									}
+									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 += sideEffects2[0];
+									} else if (DataConstraintModel.typeMap.isAncestorOf(resourceNode.getParent().getResourceStateType())) {
+										Term selector = new Term(DataConstraintModel.insert);
+										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 newMap = selector.toImplementation(sideEffects2);
+										updateStatement += sideEffects2[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.insert);
-											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 newMap = selector.toImplementation(sideEffects2);
-											updateStatement = sideEffects[0] + sideEffects2[0];
-										} else {
-											String resourceName = langSpec.toVariableName(getComponentName(resource, langSpec));
-											updateStatement = sideEffects[0] + langSpec.getFieldAccessor(resourceName) + langSpec.getAssignment() + newState + langSpec.getStatementDelimiter();
-										}
+										String resourceName = langSpec.toVariableName(getComponentName(resource, langSpec));
+										updateStatement += langSpec.getFieldAccessor(resourceName) + langSpec.getAssignment() + newState + langSpec.getStatementDelimiter();
 									}
 									if (updateStatement != null) {
 										input.addFirstStatement(updateStatement);
@@ -1250,9 +1261,22 @@
 											params.add(refVarName);
 										}
 									}
-									input.addStatement(langSpec.getMethodInvocation(langSpec.getFieldAccessor(((ResourceNode) chToRes.getDestination()).getResourceName()), 
-																						updateMethodName + resComponentName, 
-																						params) + langSpec.getStatementDelimiter());	// this.dst.updateSrc(value, refParams);
+									ResourceHierarchy srcRes = resourceNode.getResourceHierarchy();
+									if (!generatesComponent(srcRes)) {
+										srcRes = srcRes.getParent();
+									}
+									ResourceHierarchy dstRes = ((ResourceNode) chToRes.getDestination()).getResourceHierarchy();
+									if (!generatesComponent(dstRes)) {
+										dstRes = dstRes.getParent();
+									}
+									String dstCompName = langSpec.toVariableName(getComponentName(dstRes, langSpec));
+									if (srcRes != dstRes) {
+										input.addStatement(langSpec.getMethodInvocation(langSpec.getFieldAccessor(dstCompName), updateMethodName + resComponentName, params)
+												+ langSpec.getStatementDelimiter());	// this.dst.updateSrc(value, refParams);
+									} else {
+										input.addStatement(langSpec.getMethodInvocation(updateMethodName + resComponentName, params)
+												+ langSpec.getStatementDelimiter());	// this.updateSrc(value, refParams);
+									}
 								}
 							}
 							if (outsideInputMembers2.size() > 0) {