diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/NewChannelAction.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/NewChannelAction.java
index 71bbc69..d8906b8 100644
--- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/NewChannelAction.java
+++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/NewChannelAction.java
@@ -32,7 +32,7 @@
 		}
 		String channelName = JOptionPane.showInputDialog("Channel Name:");
 		if (channelName == null) return;
-		model.addIOChannelGenerator(new DataflowChannelGenerator(channelName));
+		model.addChannelGenerator(new DataflowChannelGenerator(channelName));
 		ResourceDependencyGraph resourceGraph = NecessityOfStoringResourceStates.doDecide(model);
 		ResourceDependencyGraph resourceDependecyGraph = SelectableDataTransfers.init(resourceGraph);
 		editor.setResourceDependencyGraph(resourceDependecyGraph);
diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java
index fb9c3e1..ca28124 100644
--- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java
+++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java
@@ -151,21 +151,18 @@
 			Set<DataflowChannelGenerator> refEdgeCreated = new HashSet<>();
 
 			// create channel vertices
-			for (Edge e : resourceDependencyGraph.getEdges()) {
-				if (e instanceof ResourceDependency) {
-					ResourceDependency dependency = (ResourceDependency) e;
-					DataflowChannelGenerator channelGen = dependency.getChannelGenerator();
-					if (channelsIn.get(channelGen) == null || channelsOut.get(channelGen) == null) {
-						Object channel = graph.insertVertex(parent, null, channelGen.getChannelName(), 150, 20, 30, 30); // insert a channel as a vertex
-						mxCell port_in = new mxCell(null, geo1, "shape=ellipse;perimter=ellipsePerimeter");
-						port_in.setVertex(true);
-						graph.addCell(port_in, channel);		// insert the input port of a channel
-						mxCell port_out = new mxCell(null, geo2, "shape=ellipse;perimter=ellipsePerimeter");
-						port_out.setVertex(true);
-						graph.addCell(port_out, channel);		// insert the output port of a channel
-						channelsIn.put(channelGen, port_in);
-						channelsOut.put(channelGen, port_out);
-					}
+			for (ChannelGenerator c: model.getChannelGenerators()) {
+				DataflowChannelGenerator channelGen = (DataflowChannelGenerator) c;
+				if (channelsIn.get(channelGen) == null || channelsOut.get(channelGen) == null) {
+					Object channel = graph.insertVertex(parent, null, channelGen.getChannelName(), 150, 20, 30, 30); // insert a channel as a vertex
+					mxCell port_in = new mxCell(null, geo1, "shape=ellipse;perimter=ellipsePerimeter");
+					port_in.setVertex(true);
+					graph.addCell(port_in, channel);		// insert the input port of a channel
+					mxCell port_out = new mxCell(null, geo2, "shape=ellipse;perimter=ellipsePerimeter");
+					port_out.setVertex(true);
+					graph.addCell(port_out, channel);		// insert the output port of a channel
+					channelsIn.put(channelGen, port_in);
+					channelsOut.put(channelGen, port_out);
 				}
 			}