diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/Editor.java b/AlgebraicDataflowArchitectureModel/src/application/editor/Editor.java
index b1b0230..933f5ea 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/editor/Editor.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/editor/Editor.java
@@ -7,6 +7,7 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -41,6 +42,7 @@
 import models.dataConstraintModel.DataConstraintModel;
 import models.dataConstraintModel.ResourceHierarchy;
 import models.dataConstraintModel.ResourcePath;
+import models.dataConstraintModel.Selector;
 import models.dataFlowModel.DataTransferModel;
 import models.dataFlowModel.DataTransferChannel;
 import models.dataFlowModel.PushPullAttribute;
@@ -369,24 +371,66 @@
 				if (channel.getInputResources().size() > 0) {
 					// Normal channel
 					if (channelsIn.get(channel) == null || channelsOut.get(channel) == null) {
-						Object chCell = graph.insertVertex(parent, null, channel.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, chCell);		// 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, chCell);		// insert the output port of a channel
-						channelsIn.put(channel, port_in);
-						channelsOut.put(channel, port_out);
+						if(channel.getSelectors().toString() == "[]") {
+							Object chCell = graph.insertVertex(parent, null, channel.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, chCell);		// 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, chCell);		// insert the output port of a channel
+							channelsIn.put(channel, port_in);
+							channelsOut.put(channel, port_out);
+						}else {
+
+							for (Selector s: channel.getSelectors()) {
+								Expression exp = s.getExpression();
+								String selName = exp.toString();	
+								String cName = channel.getChannelName();
+								String channelName = cName + " (" + selName + ")";
+								Object chCell = graph.insertVertex(parent, null, channelName, 150, 20, 60, 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, chCell);		// 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, chCell);		// insert the output port of a channel
+								channelsIn.put(channel, port_in);
+								channelsOut.put(channel, port_out);
+							}
+						}
 					}
 				} else {
 					// I/O channel
 					if (channelsOut.get(channel) == null) {
-						Object chCell = graph.insertVertex(parent, null, channel.getChannelName(), 150, 20, 30, 30); // insert an I/O channel as a vertex
-						mxCell port_out = new mxCell(null, geo2, "shape=ellipse;perimter=ellipsePerimeter");
-						port_out.setVertex(true);
-						graph.addCell(port_out, chCell);		// insert the output port of a channel
-						channelsOut.put((DataTransferChannel) channel, port_out);
+						if(channel.getSelectors().toString() == "[]") {
+							Object chCell = graph.insertVertex(parent, null, channel.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, chCell);		// 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, chCell);		// insert the output port of a channel
+							channelsIn.put(channel, port_in);
+							channelsOut.put(channel, port_out);
+						}else {
+							
+							for (Selector s: channel.getSelectors()) {
+								Expression exp = s.getExpression();
+								String selName = exp.toString();
+								String cName = channel.getChannelName();
+								String channelName = cName + " (" + selName + ")";
+								Object chCell = graph.insertVertex(parent, null, channelName, 150, 20, 60, 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, chCell);		// 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, chCell);		// insert the output port of a channel
+								channelsIn.put(channel, port_in);
+								channelsOut.put(channel, port_out);
+							}
+						}
 					}
 				}
 			}