diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
index 2776604..0962ce2 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
@@ -783,6 +783,15 @@
 		return resourceHierarchies.get(hierarchy);
 	}
 	
+	public ResourceHierarchy getOrPutResourceHierarchy(ResourceHierarchy resourceHierarchy) {
+		String hierarchy = resourceHierarchy.toString();
+		if (resourceHierarchies.get(hierarchy) != null) {
+			return resourceHierarchies.get(hierarchy);
+		}
+		resourceHierarchies.put(hierarchy, resourceHierarchy);
+		return resourceHierarchy;
+	}
+	
 	public List<ResourcePath> getResourcePaths() {
 		return resourcePaths;
 	}
diff --git a/AlgebraicDataflowArchitectureModel/src/parser/Parser.java b/AlgebraicDataflowArchitectureModel/src/parser/Parser.java
index 585cc6d..b1dd535 100644
--- a/AlgebraicDataflowArchitectureModel/src/parser/Parser.java
+++ b/AlgebraicDataflowArchitectureModel/src/parser/Parser.java
@@ -617,6 +617,7 @@
 			if (stream.checkNext().equals(LEFT_BRACKET)) break;
 			if (stream.checkNext().equals(COLON)) break;
 		} while (stream.next().equals(DOT));
+		hierarchy = model.getOrPutResourceHierarchy(hierarchy);
 		return hierarchy;
 	}
 	
diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/Resource.java b/AlgebraicDataflowArchitectureModel/src/simulator/Resource.java
index 23254b8..14e30bb 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/Resource.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/Resource.java
@@ -5,6 +5,7 @@
 import java.util.Map;
 
 import models.algebra.Constant;
+import models.algebra.Expression;
 import models.algebra.Type;
 import models.dataConstraintModel.DataConstraintModel;
 import models.dataConstraintModel.ResourceHierarchy;
@@ -48,7 +49,12 @@
 				}
 			}
 		} else {
-			state = new PrimitiveResourceState((Constant) resourceHierarchy.getInitialValue());
+			Expression initValue = resourceHierarchy.getInitialValue();
+			if (initValue != null && initValue instanceof Constant) {
+				state = new PrimitiveResourceState((Constant) resourceHierarchy.getInitialValue());
+			} else {
+				state = new PrimitiveResourceState(null);
+			}
 		}
 	}
 	
diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java b/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
index 368b3a6..cb4fbd8 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
@@ -49,7 +49,11 @@
 		for (ResourceHierarchy res: model.getResourceHierarchies()) {
 			if (res.getParent() == null) {
 				// root resource
-				curState.addResource(new Resource(res));
+				Resource resource = new Resource(res);
+				curState.addResource(resource);
+				if (res.getInitialValue() != null) {
+					curState.updateResourceState(resource.getResourceIdentifier(), res.getInitialValue());
+				}
 			}
 		}
 		for (Channel channel: model.getChannels()) {