diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
index 3464845..481ac10 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
@@ -324,29 +324,29 @@
 		} else {
 			if (resourceHierarchy.getChildren() != null && resourceHierarchy.getChildren().size() == 1 && resourceHierarchy.getChildren().iterator().next().getNumParameters() > 0) {
 				// list or map
-				if (!platformSpec.isMonolithic()) {
-					// For REST API
-					stateGetter.addStatement(langSpec.getReturnStatement(langSpec.getFieldAccessor(fieldOfResourceState)) + langSpec.getStatementDelimiter());	// return value;
-				} else {
+//				if (!platformSpec.isMonolithic()) {
+//					// For REST API
+//					stateGetter.addStatement(langSpec.getReturnStatement(langSpec.getFieldAccessor(fieldOfResourceState)) + langSpec.getStatementDelimiter());	// return value;
+//				} else {
 					String implTypeName = resStateType.getImplementationTypeName();
 					// copy the current state to be returned as a 'value'
 					List<String> parameters = new ArrayList<>();
 					parameters.add(langSpec.getFieldAccessor(fieldOfResourceState));
 					stateGetter.addStatement(langSpec.getReturnStatement(langSpec.getConstructorInvocation(implTypeName, parameters)) + langSpec.getStatementDelimiter());	// return new Resource(value);
-				}
+//				}
 			} else {
 				if (resourceHierarchy.getChildren() == null || resourceHierarchy.getChildren().size() == 0) {
-					// a leaf resource
-					if (!platformSpec.isMonolithic()) {
-						// For REST API
-						stateGetter.addStatement(langSpec.getReturnStatement(langSpec.getFieldAccessor(fieldOfResourceState)) + langSpec.getStatementDelimiter());	// return value;
-					} else {
+//					// a leaf resource
+//					if (!platformSpec.isMonolithic()) {
+//						// For REST API
+//						stateGetter.addStatement(langSpec.getReturnStatement(langSpec.getFieldAccessor(fieldOfResourceState)) + langSpec.getStatementDelimiter());	// return value;
+//					} else {
 						String implTypeName = resStateType.getImplementationTypeName();
 						// copy the current state to be returned as a 'value'
 						List<String> parameters = new ArrayList<>();
 						parameters.add(langSpec.getFieldAccessor(fieldOfResourceState));
 						stateGetter.addStatement(langSpec.getReturnStatement(langSpec.getConstructorInvocation(implTypeName, parameters)) + langSpec.getStatementDelimiter());	// return new Resource(value);
-					}
+//					}
 				} else {
 					Term composer = null; 
 					Term composerSub = new Constant(DataConstraintModel.nil);