diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/ChannelState.java b/AlgebraicDataflowArchitectureModel/src/simulator/ChannelState.java
index c571236..feb0ab5 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/ChannelState.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/ChannelState.java
@@ -13,25 +13,73 @@
 public class ChannelState {
 	private DataTransferChannel channel;
 	private Map<Expression, List<Expression>> childrenMap;
-	private Map<List<Constant>, Map<Selector, Constant>> referenceStructure;
+	private ReferenceStructure referenceStructure;
 	
 	public ChannelState(DataTransferChannel channel) {
 		this.channel = channel;
 	}
 
-	public Map<Selector, Constant> getDependentParams(Map<Selector, Constant> channelParameters) {
-		Map<Selector, Constant> dependentParams = new HashMap<>();
-		if (referenceStructure != null) {
-			List<Expression> channelParams = new ArrayList<>();
-			for (Selector sel: channel.getAllSelectors()) {
-				channelParams.add(channelParameters.get(sel));
-			}
-			for (Map.Entry<Selector, Constant> paramEnt: referenceStructure.get(channelParams).entrySet()) {
-				dependentParams.put(paramEnt.getKey(), paramEnt.getValue());
-			}
+	public DataTransferChannel getChannel() {
+		return channel;
+	}
+
+	public Map<Expression, Expression> getDependentParams(Map<Selector, Constant> channelParameters) {
+		if (referenceStructure == null) {
+			return null;
 		}
-		return dependentParams;
+		return referenceStructure.getDependentParams(channelParameters);
 	}
 	
+	public void addDependantParam(Map<Selector, Constant> channelParameters, Expression variable, Expression value) {
+		referenceStructure.addDependantParam(channelParameters, variable, value);
+	}
 	
+	private static class ReferenceStructure {
+		private Map<Expression, Expression> dependentParams = null;
+		private Map<Constant, ReferenceStructure> referenceStructure;
+		
+		public Map<Expression, Expression> getDependentParams() {
+			return dependentParams;
+		}
+		
+		public Map<Expression, Expression> getDependentParams(Map<Selector, Constant> channelParameters) {
+			ReferenceStructure subStructure = this;
+			for (Selector sel: channelParameters.keySet()) {
+				if (subStructure.getDependentParams() == null) {
+					subStructure = subStructure.getReferenceStructure(channelParameters.get(sel));
+				} else {
+					return null;
+				}
+			}
+			return subStructure.getDependentParams();
+		}
+		
+		public void addDependantParam(Expression variable, Expression value) {
+			if (dependentParams == null) {
+				dependentParams = new HashMap<>();
+			}
+			dependentParams.put(variable, value);
+		}
+		
+		public void addDependantParam(Map<Selector, Constant> channelParameters, Expression variable, Expression value) {
+			ReferenceStructure subStructure = this;
+			for (Selector sel: channelParameters.keySet()) {
+				Constant chParam = channelParameters.get(sel);
+				if (subStructure.referenceStructure == null) {
+					subStructure.referenceStructure = new HashMap<>();
+				}
+				ReferenceStructure nextStructure = subStructure.referenceStructure.get(chParam);
+				if (nextStructure == null) {
+					nextStructure = new ReferenceStructure();
+					subStructure.referenceStructure.put(chParam, nextStructure);
+				}
+				subStructure = nextStructure;
+			}
+			subStructure.addDependantParam(variable, value);
+		}
+		
+		public ReferenceStructure getReferenceStructure(Constant channelParam) {
+			return referenceStructure.get(channelParam);
+		}
+	}
 }