diff --git a/AlgebraicDataflowArchitectureModel/models/StockManagement.model b/AlgebraicDataflowArchitectureModel/models/StockManagement.model
index 131b7ef..b133f44 100644
--- a/AlgebraicDataflowArchitectureModel/models/StockManagement.model
+++ b/AlgebraicDataflowArchitectureModel/models/StockManagement.model
@@ -31,16 +31,20 @@
 channel C3 {
 	in deriver(dr, update3(dr2)) == dr2
 	out stock(st, update3(dr2)) == insert(st, fst(dr2), snd(snd(dr2)))
-	out shipping(sp:Tuple, update3(dr2)) == tuple(fst(dr2), fst(snd(dr2)))
 }
 
 channel C4 {
-	in request(rq, update4(rq2, st)) == rq2
-	ref stock(st, update4(rq2, st))
-	out deriver(dr, update4(rq2, st)) == if(ge(lookup(st, fst(rq2)), snd(rq2)), 
+	in deriver(dr, update4(dr2)) == dr2
+	out shipping(sp:Tuple, update4(dr2)) == tuple(fst(dr2), fst(snd(dr2)))
+}
+
+channel C5 {
+	in request(rq, update5(rq2, st)) == rq2
+	ref stock(st, update5(rq2, st))
+	out deriver(dr, update5(rq2, st)) == if(ge(lookup(st, fst(rq2)), snd(rq2)), 
 												tuple(fst(rq2), snd(rq2), lookup(st, fst(rq2)) - snd(rq2)), 
 												tuple(fst(rq2), 0, lookup(st, fst(rq2))))
-	out shortage(sh, update4(rq2, st)) == if(ge(lookup(st, fst(rq2)), snd(rq2)), 
+	out shortage(sh, update5(rq2, st)) == if(ge(lookup(st, fst(rq2)), snd(rq2)), 
 												sh, 
 												insert(sh, fst(rq2), lookup(sh, fst(rq2)) + snd(rq2)))
 }
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/src/algorithms/JavaMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/algorithms/JavaMethodBodyGenerator.java
index b36ae42..fa03235 100644
--- a/AlgebraicDataflowArchitectureModel/src/algorithms/JavaMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/algorithms/JavaMethodBodyGenerator.java
@@ -17,11 +17,13 @@
 import models.algebra.InvalidMessage;
 import models.algebra.ParameterizedIdentifierIsFutureWork;
 import models.algebra.Term;
+import models.algebra.Type;
 import models.algebra.UnificationFailed;
 import models.algebra.ValueUndefined;
 import models.algebra.Variable;
 import models.dataConstraintModel.ChannelGenerator;
 import models.dataConstraintModel.ChannelMember;
+import models.dataConstraintModel.DataConstraintModel;
 import models.dataConstraintModel.IdentifierTemplate;
 import models.dataFlowModel.DataFlowModel;
 import models.dataFlowModel.DataflowChannelGenerator;
@@ -87,7 +89,23 @@
 							if (((StoreAttribute) dst.getAttribute()).isStored()) {
 								// returns the current state stored in a field.
 								if (getter.getBody() == null || getter.getBody().getStatements().size() == 0) {
-									getter.addStatement("return value;");
+									Type resourceType = dst.getIdentifierTemplate().getResourceStateType();
+									if (model.isPrimitiveType(resourceType)) {
+										getter.addStatement("return value;");
+									} else {
+										// copy the current state to be returned as a 'value'
+										String implTypeName = resourceType.getImplementationTypeName();
+//										String interfaceTypeName = resourceType.getInterfaceTypeName();
+//										String concreteTypeName;
+//										if (interfaceTypeName.contains("<")) {
+//											String typeName = implTypeName.substring(0, implTypeName.indexOf("<"));
+////											String generics = interfaceTypeName.substring(interfaceTypeName.indexOf("<") + 1, interfaceTypeName.lastIndexOf(">"));
+//											concreteTypeName = typeName + "<>";
+//										} else {
+//											concreteTypeName = implTypeName;
+//										}
+										getter.addStatement("return new " + implTypeName + "(value);");
+									}
 								}
 							}
 							// src side (for a chain of update method invocations)
@@ -109,7 +127,7 @@
 											String[] sideEffects = new String[] {""};
 											String refExp = refGetter.toImplementation(sideEffects);
 											String refTypeName = ref.getResourceStateType().getInterfaceTypeName();
-											srcUpdate.addStatement(sideEffects[0] + refTypeName + " " + refVarName + " = " + refExp + ";");
+											srcUpdate.addFirstStatement(sideEffects[0] + refTypeName + " " + refVarName + " = " + refExp + ";");
 										}
 										refParams += ", " + refVarName;
 									}
@@ -134,7 +152,7 @@
 											String[] sideEffects = new String[] {""};
 											String refExp = refGetter.toImplementation(sideEffects);
 											String refTypeName = ref.getResourceStateType().getInterfaceTypeName();
-											srcInput.addStatement(sideEffects[0] + refTypeName + " " + refVarName + " = " + refExp + ";");
+											srcInput.addFirstStatement(sideEffects[0] + refTypeName + " " + refVarName + " = " + refExp + ";");
 										}
 										refParams += ", " + refVarName;
 									}
@@ -187,7 +205,23 @@
 					// getter method
 					MethodDeclaration getter = getGetterMethod(type);
 					if (getter.getBody() == null || getter.getBody().getStatements().size() == 0) {
-						getter.addStatement("return value;");
+						Type resourceType = resource.getIdentifierTemplate().getResourceStateType();
+						if (model.isPrimitiveType(resourceType)) {
+							getter.addStatement("return value;");							
+						} else {
+							// copy the current state to be returned as a 'value'
+							String implTypeName = resourceType.getImplementationTypeName();
+//							String interfaceTypeName = resourceType.getInterfaceTypeName();
+//							String concreteTypeName;
+//							if (interfaceTypeName.contains("<")) {
+//								String typeName = implTypeName.substring(0, implTypeName.indexOf("<"));
+//								String generics = interfaceTypeName.substring(interfaceTypeName.indexOf("<") + 1, interfaceTypeName.lastIndexOf(">"));
+//								concreteTypeName = typeName + "<" + generics + ">";
+//							} else {
+//								concreteTypeName = implTypeName;
+//							}
+							getter.addStatement("return new " + implTypeName + "(value);");
+						}
 					}
 					// methods for input events
 					Map<DataflowChannelGenerator, Set<ChannelMember>> ioChannelsAndMembers = getIOChannelsAndMembers(resource, model);
diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
index 3686bb8..4643b4c 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
@@ -319,6 +319,17 @@
 		}
 		return null;
 	}
+	
+	public boolean isPrimitiveType(Type type) {
+		if (type == typeInt 
+			|| type == typeLong
+			|| type == typeFloat
+			|| type == typeDouble
+			|| type == typeBoolean) {
+			return true;
+		}
+		return false;
+	}
 
 	public static boolean isListType(Type type) {
 		return typeList.isAncestorOf(type);