diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/Editor.java b/AlgebraicDataflowArchitectureModel/src/application/editor/Editor.java
index d2098aa..25604c4 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/editor/Editor.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/editor/Editor.java
@@ -9,6 +9,7 @@
 import java.util.AbstractMap;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -48,6 +49,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;
@@ -241,7 +243,7 @@
 				updateEdgeAttiributes(dataFlowGraph);
 				
 				// Set DAG layout.
-				setDAGLayout();
+//				setDAGLayout();
 				
 				curFilePath = file.getAbsolutePath();
 				curFileName = file.getName();
@@ -379,37 +381,82 @@
 				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);
+							}
+						}
 					}
 				}
 			}
 
 			// create resource vertices
 			for (ResourceNode resNode: dataFlowGraph.getRootResourceNodes()) {
+				int w = 300;
+				int h = 200;
 				ResourcePath res = resNode.getOutSideResource();
 				Object resource = graph.insertVertex(parent, null,
-						res.getResourceName(), 20, 20, 80, 30,
+						res.getResourceName(), 20, 20, w, h,
 						"shape=ellipse;perimeter=ellipsePerimeter"); // insert a resource as a vertex
 				resources.put(res, resource);
+				getChildResource(resource, resNode, resources, w, h);
 			}
-
+			
 			// add input, output and reference edges
 			for (Edge edge: dataFlowGraph.getEdges()) {
 				DataFlowEdge dfEdge = (DataFlowEdge) edge;
@@ -436,12 +483,29 @@
 		} finally {
 			graph.getModel().endUpdate();
 		}
-		setTreeLayout();
+//		setTreeLayout();
 		
 		bReflectingArchitectureModel = false;
 		return graph;
 	}
 
+	public void getChildResource(Object resource, ResourceNode resNode, Map<ResourcePath, Object> resources, int w, int h) {
+		
+		for (ResourceNode c: resNode.getChildren()) {
+			w = w - 100;
+			if(w <= 0) {
+				w = 100;
+			}
+			h = (2 * w) / 3;
+			ResourcePath chRes = c.getOutSideResource();
+			Object chResource = graph.insertVertex(resource, null,
+					chRes.getName(), 110, 90, w, h,
+					"shape=ellipse;perimeter=ellipsePerimeter"); // insert a resource as a vertex
+			resources.put(chRes, chResource);
+			getChildResource(chResource, c, resources, w, h);		
+		}
+	}
+	
 	public void setDAGLayout() {
 		Object parent = graph.getDefaultParent();
 		graph.getModel().beginUpdate();