diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java b/AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java
index 7316ec1..04d5961 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java
@@ -113,7 +113,16 @@
 					state = res.getState();
 					((PrimitiveResourceState) state).setValue((Constant) resStateValue);
 				} else {
-					state = new PrimitiveResourceState((Constant) resStateValue);
+					ResourceIdentifier parentResId = (ResourceIdentifier) resourceIdentifier.getParent();
+					Type parentResType = parentResId.getResourceStateType();
+					if (parentResType != null && DataConstraintModel.typeList.isAncestorOf(parentResType)) {
+					} else if (parentResType != null && DataConstraintModel.typeMap.isAncestorOf(parentResType)) {
+						JsonResourceState parentState = (JsonResourceState) getResource(parentResId).getState();
+						parentState.addChildState(((Constant) resourceIdentifier.getLastParam()).toString(), new PrimitiveResourceState((Constant) resStateValue));
+					} else if (parentResType != null && DataConstraintModel.typeJson.isAncestorOf(parentResType)) {
+						JsonResourceState parentState = (JsonResourceState) getResource(parentResId).getState();
+						parentState.addChildState("\"" + resourceIdentifier.getResourceName() + "\"", new PrimitiveResourceState((Constant) resStateValue));
+					}
 				}
 				return resourceIdentifier;
 			}