diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index c18bfc2..91c8bd0 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -480,10 +480,19 @@
 		// Declare the state field in the parent component.
 		ResourceHierarchy res = resourceNode.getOutSideResource().getResourceHierarchy();
 		if (((StoreAttribute) resourceNode.getAttribute()).isStored() && noPullTransfer && res.getNumParameters() == 0) {
-			String resName = getComponentName(res, langSpec);
-			FieldDeclaration stateField = langSpec.newFieldDeclaration(res.getResourceStateType(), langSpec.toVariableName(resName));
-			parentComponent.addField(stateField);
-			constructorParams.add(new AbstractMap.SimpleEntry<>(resourceNode.getParent().getResourceHierarchy(), langSpec.newVariableDeclaration(res.getResourceStateType(), langSpec.toVariableName(resName))));
+			String resName = langSpec.toVariableName(getComponentName(res, langSpec));
+			boolean existsField = false;
+			for (FieldDeclaration field: parentComponent.getFields()) {
+				if (resName.equals(field.getName())) {
+					existsField = true;
+					break;
+				}
+			}
+			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)));
+			}
 		}
 	}
 	
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
index 3d51562..8e8466e 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
@@ -186,12 +186,25 @@
 										if (getter.getBody() == null || getter.getBody().getStatements().size() == 0) {
 											Type resourceType = dst.getResourceStateType();
 											if (dst.getResourceHierarchy().getNumParameters() == 0) {
-												if (model.isPrimitiveType(resourceType)) {
-													getter.addStatement("return value;");
+												if (JavaCodeGenerator.generatesComponent(dst.getResourceHierarchy())) {
+													// dst has a component.
+													if (model.isPrimitiveType(resourceType)) {
+														getter.addStatement("return value;");
+													} else {
+														// copy the current state to be returned as a 'value'
+														String implTypeName = resourceType.getImplementationTypeName();
+														getter.addStatement("return new " + implTypeName + "(value);");
+													}
 												} else {
-													// copy the current state to be returned as a 'value'
-													String implTypeName = resourceType.getImplementationTypeName();
-													getter.addStatement("return new " + implTypeName + "(value);");
+													// dst has no component.
+													String dstResName = JavaCodeGenerator.toVariableName(JavaCodeGenerator.getComponentName(dst.getResourceHierarchy()));
+													if (model.isPrimitiveType(resourceType)) {
+														getter.addStatement("return " + dstResName + ";");
+													} else {
+														// copy the current state to be returned as a 'value'
+														String implTypeName = resourceType.getImplementationTypeName();
+														getter.addStatement("return new " + implTypeName + "(" + dstResName + ");");
+													}
 												}
 											} else {
 												String[] sideEffects = new String[] {""};
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
index fd766cc..4254cab 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
@@ -268,7 +268,14 @@
 										}
 										if (getter.getBody() == null || getter.getBody().getStatements().size() == 0) {
 											if (dst.getResourceHierarchy().getNumParameters() == 0) {
-												getter.addStatement("return value;");
+												if (JerseyCodeGenerator.generatesComponent(dst.getResourceHierarchy())) {
+													// dst has a component.
+													getter.addStatement("return value;");
+												} else {
+													// dst has no component.
+													String dstResName = JerseyCodeGenerator.toVariableName(JerseyCodeGenerator.getComponentName(dst.getResourceHierarchy()));
+													getter.addStatement("return " + dstResName + ";");
+												}
 											} else {
 												if (DataConstraintModel.typeList.isAncestorOf(dst.getParent().getResourceStateType())) {
 													Term selector = new Term(DataConstraintModel.get);