diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index f835dbf..8d981e6 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -61,7 +61,7 @@
 			Map<ResourceHierarchy, Set<ResourceHierarchy>> dependedRootComponentGraph, IPlatformSpecific platformSpec, ILanguageSpecific langSpec) {
 		Map<ResourceHierarchy, TypeDeclaration> resourceComponents = new HashMap<>();
 		Map<ResourceHierarchy, MethodDeclaration> resourceConstructors = new HashMap<>();
-		List<Map.Entry<ResourceHierarchy, VariableDeclaration>> constructorParams = new ArrayList<>();
+		Map<ResourceHierarchy, Map<String, VariableDeclaration>> constructorParams = new HashMap<>();
 		List<Map.Entry<ResourceHierarchy, String>> constructorStatements = new ArrayList<>();
 		Map<MethodDeclaration, Map.Entry<Expression, Map.Entry<ResourceHierarchy, ResourceHierarchy>>> updateStatements = new HashMap<>();
 		Map<ResourceHierarchy, Set<ResourceHierarchy>> descendantGetters = new HashMap<>();
@@ -132,7 +132,7 @@
 					}
 					
 					// Declare the getter method in this resource to obtain the state.
-					MethodDeclaration stateGetter = declareStateGetterMethod(resourceNode, component, resStateType, langSpec);
+					MethodDeclaration stateGetter = declareStateGetterMethod(resourceNode, component, resStateType, platformSpec, langSpec);
 					
 					// Declare the accessor method in the main component to call the getter method.
 					if (platformSpec.hasMain()) {
@@ -219,14 +219,14 @@
 	}
 
 	private static List<VariableDeclaration> addConstructorParameters(ResourceHierarchy resource, Map<ResourceHierarchy, TypeDeclaration> resourceComponents,
-			Map<ResourceHierarchy, MethodDeclaration> resourceConstructors, List<Entry<ResourceHierarchy, VariableDeclaration>> constructorParams, ILanguageSpecific langSpec) {
+			Map<ResourceHierarchy, MethodDeclaration> resourceConstructors, Map<ResourceHierarchy, Map<String, VariableDeclaration>> constructorParams, ILanguageSpecific langSpec) {
 		List<VariableDeclaration> params = new ArrayList<>();
 		for (ResourceHierarchy child: resource.getChildren()) {
 			params.addAll(addConstructorParameters(child, resourceComponents, resourceConstructors, constructorParams, langSpec));
 		}
-		for (Entry<ResourceHierarchy, VariableDeclaration> paramEnt: constructorParams) {
-			if (paramEnt.getKey().equals(resource)) {
-				params.add(paramEnt.getValue());
+		if (constructorParams.get(resource) != null) {
+			for (VariableDeclaration param: constructorParams.get(resource).values()) {
+				params.add(param);
 			}
 		}
 		if (params.size() > 0) {
@@ -441,12 +441,21 @@
 		return constructor;
 	}
 	
-	private void declareStateField(ResourceNode resourceNode, String resourceName, TypeDeclaration component, Type resStateType, List<Map.Entry<ResourceHierarchy, VariableDeclaration>> constructorParams, ILanguageSpecific langSpec) {
+	private void declareStateField(ResourceNode resourceNode, String resourceName, TypeDeclaration component, Type resStateType, Map<ResourceHierarchy, Map<String, VariableDeclaration>> constructorParams, ILanguageSpecific langSpec) {
 		Set<ResourceHierarchy> children = resourceNode.getResourceHierarchy().getChildren();
 		if (children == null || children.size() == 0) {
 			// leaf resource.
 			FieldDeclaration stateField = langSpec.newFieldDeclaration(resStateType, fieldOfResourceState, langSpec.getFieldInitializer(resStateType, resourceNode.getResourceHierarchy().getInitialValue()));
 			component.addField(stateField);
+			Map<String, VariableDeclaration> nameToParam = constructorParams.get(resourceNode.getResourceHierarchy());
+			if (nameToParam == null) {
+				nameToParam = new HashMap<>();
+				constructorParams.put(resourceNode.getResourceHierarchy(), nameToParam);
+			}
+			String varName = langSpec.toVariableName(resourceName);
+			if (nameToParam.get(varName) == null) {
+				nameToParam.put(varName, langSpec.newVariableDeclaration(resStateType, varName));
+			}
 		} else {
 			ResourceHierarchy child = children.iterator().next();
 			if (children.size() == 1 && child.getNumParameters() > 0) {
@@ -470,7 +479,8 @@
 		}
 	}
 
-	private void declareFieldsToReferToOtherResourcesAndStateFieldInParentComponent(ResourceNode resourceNode, TypeDeclaration component, TypeDeclaration parentComponent, List<Map.Entry<ResourceHierarchy, VariableDeclaration>> constructorParams, ILanguageSpecific langSpec) {
+	private void declareFieldsToReferToOtherResourcesAndStateFieldInParentComponent(ResourceNode resourceNode, TypeDeclaration component, TypeDeclaration parentComponent, 
+			Map<ResourceHierarchy, Map<String, VariableDeclaration>> constructorParams, ILanguageSpecific langSpec) {
 		// Declare reference fields for push data transfer.
 		boolean noPullTransfer = true;
 		for (Edge resToCh : resourceNode.getOutEdges()) {
@@ -529,7 +539,14 @@
 							if (resourceNode.getResourceHierarchy() != dstRes) {
 								component.addField(refFieldForPush);
 								if (!outsideOutputResource) {
-									constructorParams.add(new AbstractMap.SimpleEntry<>(resourceNode.getResourceHierarchy(), refVarForPush));
+									Map<String, VariableDeclaration> nameToParam = constructorParams.get(resourceNode.getResourceHierarchy());
+									if (nameToParam == null) {
+										nameToParam = new HashMap<>();
+										constructorParams.put(resourceNode.getResourceHierarchy(), nameToParam);
+									}
+									if (nameToParam.get(dstResName) == null) {
+										nameToParam.put(dstResName, refVarForPush);
+									}
 								}
 							}
 						} else {
@@ -537,7 +554,14 @@
 							if (resourceNode.getParent().getResourceHierarchy() != dstRes) {
 								parentComponent.addField(refFieldForPush);
 								if (!outsideOutputResource) {
-									constructorParams.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), refVarForPush));
+									Map<String, VariableDeclaration> nameToParam = constructorParams.get(resourceNode.getParent().getResourceHierarchy());
+									if (nameToParam == null) {
+										nameToParam = new HashMap<>();
+										constructorParams.put(resourceNode.getParent().getResourceHierarchy(), nameToParam);
+									}
+									if (nameToParam.get(dstResName) == null) {
+										nameToParam.put(dstResName, refVarForPush);
+									}
 								}
 							}
 						}
@@ -561,7 +585,14 @@
 									}
 									if (!existsField) {
 										component.addField(refRootFieldForPush);
-										constructorParams.add(new AbstractMap.SimpleEntry<>(resourceNode.getResourceHierarchy(), refRootVarForPush));
+										Map<String, VariableDeclaration> nameToParam = constructorParams.get(resourceNode.getResourceHierarchy());
+										if (nameToParam == null) {
+											nameToParam = new HashMap<>();
+											constructorParams.put(resourceNode.getResourceHierarchy(), nameToParam);
+										}
+										if (nameToParam.get(dstRootResName) == null) {
+											nameToParam.put(dstRootResName, refRootVarForPush);
+										}
 									}
 								} else {
 									// No component is created for this resource.
@@ -574,7 +605,14 @@
 									}
 									if (!existsField) {
 										parentComponent.addField(refRootFieldForPush);
-										constructorParams.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), refRootVarForPush));
+										Map<String, VariableDeclaration> nameToParam = constructorParams.get(resourceNode.getParent().getResourceHierarchy());
+										if (nameToParam == null) {
+											nameToParam = new HashMap<>();
+											constructorParams.put(resourceNode.getParent().getResourceHierarchy(), nameToParam);
+										}
+										if (nameToParam.get(dstRootResName) == null) {
+											nameToParam.put(dstRootResName, refRootVarForPush);
+										}
 									}
 								}
 							}
@@ -619,7 +657,14 @@
 						if (resourceNode.getResourceHierarchy() != srcRes.getResourceHierarchy()) {
 							component.addField(refFieldForPull);
 							if (!outsideInputResource) {
-								constructorParams.add(new AbstractMap.SimpleEntry<>(resourceNode.getResourceHierarchy(), refVarForPull));
+								Map<String, VariableDeclaration> nameToParam = constructorParams.get(resourceNode.getResourceHierarchy());
+								if (nameToParam == null) {
+									nameToParam = new HashMap<>();
+									constructorParams.put(resourceNode.getResourceHierarchy(), nameToParam);
+								}
+								if (nameToParam.get(srcResName) == null) {
+									nameToParam.put(srcResName, refVarForPull);
+								}
 							}
 						}
 					} else {
@@ -627,7 +672,14 @@
 						if (resourceNode.getParent().getResourceHierarchy() != srcRes.getResourceHierarchy()) {
 							parentComponent.addField(refFieldForPull);
 							if (!outsideInputResource) {
-								constructorParams.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), refVarForPull));
+								Map<String, VariableDeclaration> nameToParam = constructorParams.get(resourceNode.getParent().getResourceHierarchy());
+								if (nameToParam == null) {
+									nameToParam = new HashMap<>();
+									constructorParams.put(resourceNode.getParent().getResourceHierarchy(), nameToParam);
+								}
+								if (nameToParam.get(srcResName) == null) {
+									nameToParam.put(srcResName, refVarForPull);
+								}
 							}
 						}
 					}
@@ -651,7 +703,14 @@
 								}
 								if (!existsField) {
 									component.addField(refRootFieldForPull);
-									constructorParams.add(new AbstractMap.SimpleEntry<>(resourceNode.getResourceHierarchy(), refRootVarForPull));
+									Map<String, VariableDeclaration> nameToParam = constructorParams.get(resourceNode.getResourceHierarchy());
+									if (nameToParam == null) {
+										nameToParam = new HashMap<>();
+										constructorParams.put(resourceNode.getResourceHierarchy(), nameToParam);
+									}
+									if (nameToParam.get(srcRootResName) == null) {
+										nameToParam.put(srcRootResName, refRootVarForPull);
+									}
 								}
 							} else {
 								// No component is created for this resource.
@@ -663,8 +722,15 @@
 									}
 								}
 								if (!existsField) {
-									parentComponent.addField(refRootFieldForPull);
-									constructorParams.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), refRootVarForPull));
+									parentComponent.addField(refRootFieldForPull);									
+									Map<String, VariableDeclaration> nameToParam = constructorParams.get(resourceNode.getParent().getResourceHierarchy());
+									if (nameToParam == null) {
+										nameToParam = new HashMap<>();
+										constructorParams.put(resourceNode.getParent().getResourceHierarchy(), nameToParam);
+									}
+									if (nameToParam.get(srcRootResName) == null) {
+										nameToParam.put(srcRootResName, refRootVarForPull);
+									}
 								}
 							}
 						}
@@ -687,16 +753,27 @@
 				if (!existsField) {
 					FieldDeclaration stateField = langSpec.newFieldDeclaration(res.getResourceStateType(), resName);
 					parentComponent.addField(stateField);
-					constructorParams.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), langSpec.newVariableDeclaration(res.getResourceStateType(), resName)));
+					Map<String, VariableDeclaration> nameToParam = constructorParams.get(resourceNode.getParent().getResourceHierarchy());
+					if (nameToParam == null) {
+						nameToParam = new HashMap<>();
+						constructorParams.put(resourceNode.getParent().getResourceHierarchy(), nameToParam);
+					}
+					if (nameToParam.get(resName) == null) {
+						nameToParam.put(resName, langSpec.newVariableDeclaration(res.getResourceStateType(), resName));
+					}
 				}
 			}
 		}
 	}
 	
 	
-	private MethodDeclaration declareStateGetterMethod(ResourceNode resourceNode, TypeDeclaration component, Type resStateType, ILanguageSpecific langSpec) {
+	private MethodDeclaration declareStateGetterMethod(ResourceNode resourceNode, TypeDeclaration component, Type resStateType, IPlatformSpecific platformSpec, ILanguageSpecific langSpec) {
 		// Declare the getter method of the resource state.
 		MethodDeclaration stateGetter = langSpec.newMethodDeclaration(getterOfResourceState, resStateType);
+		if (!platformSpec.isMonolithic() && resourceNode.getResourceHierarchy().getParent() == null) {
+			// Since this getter is also an accessor.
+			platformSpec.addGetAnnotations(stateGetter);
+		}
 		component.addMethod(stateGetter);
 		
 		boolean hasDescendantIn = hasDescendantInput(resourceNode);