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;
 			}
diff --git a/AlgebraicDataflowArchitectureModel/src/tests/SimulatorTest.java b/AlgebraicDataflowArchitectureModel/src/tests/SimulatorTest.java
index 7e37604..b6988f9 100644
--- a/AlgebraicDataflowArchitectureModel/src/tests/SimulatorTest.java
+++ b/AlgebraicDataflowArchitectureModel/src/tests/SimulatorTest.java
@@ -149,8 +149,8 @@
 				assertEquals(0, rootRes.getChildren().size());
 				assertEquals(0, ((MapResourceState) rootRes.getState()).getChildStates().size());
 			}
-			System.out.println("customers:" + initialState.getResource(ResourceIdentifier.createFrom(customers)).getState().getValue());
 			System.out.println("companies:" + initialState.getResource(ResourceIdentifier.createFrom(companies)).getState().getValue());
+			System.out.println("customers:" + initialState.getResource(ResourceIdentifier.createFrom(customers)).getState().getValue());
 			
 			// Next state
 			stream.addLine("addCompany(\"A\", \"Osaka\")");
@@ -164,8 +164,8 @@
 			assertTrue(companiesRes.getState() instanceof MapResourceState);
 			assertEquals(1, companiesRes.getChildren().size());
 			assertEquals(1, ((MapResourceState) companiesRes.getState()).getChildStates().size());
-			System.out.println("customers:" + nextState.getResource(ResourceIdentifier.createFrom(customers)).getState().getValue());
 			System.out.println("companies:" + nextState.getResource(ResourceIdentifier.createFrom(companies)).getState().getValue());
+			System.out.println("customers:" + nextState.getResource(ResourceIdentifier.createFrom(customers)).getState().getValue());
 			
 			// After the next state
 			stream.addLine("addCustomer(\"1\", \"A\")");
@@ -179,8 +179,8 @@
 			assertTrue(customersRes.getState() instanceof MapResourceState);
 			assertEquals(1, customersRes.getChildren().size());
 			assertEquals(1, ((MapResourceState) customersRes.getState()).getChildStates().size());
-			System.out.println("customers:" + nextNextState.getResource(ResourceIdentifier.createFrom(customers)).getState().getValue());
 			System.out.println("companies:" + nextNextState.getResource(ResourceIdentifier.createFrom(companies)).getState().getValue());
+			System.out.println("customers:" + nextNextState.getResource(ResourceIdentifier.createFrom(customers)).getState().getValue());
 			
 		} catch (ExpectedRightBracket | WrongJsonExpression | ExpectedColon | ParameterizedIdentifierIsFutureWork | ResolvingMultipleDefinitionIsFutureWork | InvalidMessage | UnificationFailed | ValueUndefined e) {
 			e.printStackTrace();