Merge lp:~danilovesky/workcraft/trunk-refactor-stg-generator into lp:workcraft

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/stg/CircuitToStgConverter.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/stg/CircuitToStgConverter.java	2015-07-26 21:27:56 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/stg/CircuitToStgConverter.java	2015-09-25 14:54:20 +0000
@@ -16,6 +16,7 @@
 import org.workcraft.dom.Node;
 import org.workcraft.dom.hierarchy.NamespaceHelper;
 import org.workcraft.dom.visual.Movable;
+import org.workcraft.dom.visual.Positioning;
 import org.workcraft.dom.visual.TransformHelper;
 import org.workcraft.dom.visual.VisualNode;
 import org.workcraft.exceptions.InvalidConnectionException;
@@ -41,6 +42,7 @@
 import org.workcraft.plugins.stg.VisualImplicitPlaceArc;
 import org.workcraft.plugins.stg.VisualSTG;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.SignalStg;
 import org.workcraft.util.Geometry;
 import org.workcraft.util.Hierarchy;
 import org.workcraft.util.TwoWayMap;
@@ -53,12 +55,12 @@
 
 	private static final double SCALE_X = 4.0;
 	private static final double SCALE_Y = 4.0;
-	private static final Point2D OFFSET_P1 = new Point2D.Double(0.0, -1.0);
-	private static final Point2D OFFSET_P0 = new Point2D.Double(0.0, 1.0);
-	private static final Point2D OFFSET_INIT_PLUS = new Point2D.Double(0.0, -1.0);
-	private static final Point2D OFFSET_INIT_MINUS = new Point2D.Double(0.0, 1.0);
-	private static final Point2D OFFSET_INC_PLUS = new Point2D.Double(0.0, -2.0);
-	private static final Point2D OFFSET_INC_MINUS = new Point2D.Double(0.0, 2.0);
+	private static final Point2D OFFSET_P1 = new Point2D.Double(0.0, -2.0);
+	private static final Point2D OFFSET_P0 = new Point2D.Double(0.0, +2.0);
+	private static final Point2D OFFSET_INIT_PLUS = new Point2D.Double(0.0, -2.0);
+	private static final Point2D OFFSET_INIT_MINUS = new Point2D.Double(0.0, +2.0);
+	private static final Point2D OFFSET_INC_PLUS = new Point2D.Double(0.0, -1.0);
+	private static final Point2D OFFSET_INC_MINUS = new Point2D.Double(0.0, +1.0);
 
 	private final VisualCircuit circuit;
 	private final VisualSTG stg;
@@ -176,13 +178,15 @@
 			String signalName = CircuitUtils.getSignalName(circuit, signal);
 
 			VisualPlace zeroPlace = stg.createPlace(signalName + NAME_SUFFIX_0, container);
-			zeroPlace.setLabel(signalName + LABEL_SUFFIX_0);
+			zeroPlace.setNamePositioning(Positioning.TOP);
+			zeroPlace.setLabelPositioning(Positioning.BOTTOM);
 			if (!signal.getReferencedContact().getInitToOne()) {
 				zeroPlace.getReferencedPlace().setTokens(1);
 			}
 			
 			VisualPlace onePlace = stg.createPlace(signalName + NAME_SUFFIX_1, container);
-			onePlace.setLabel(signalName + LABEL_SUFFIX_1);
+			onePlace.setNamePositioning(Positioning.BOTTOM);
+			onePlace.setLabelPositioning(Positioning.TOP);
 			if (signal.getReferencedContact().getInitToOne()) {
 				onePlace.getReferencedPlace().setTokens(1);
 			}
@@ -217,9 +221,9 @@
 
 	private void createSignalStgTransitions(VisualContact driver, Dnf dnf, Direction direction) {
 		SignalStg driverStg = driverToStgMap.getValue(driver);
-		VisualPlace predPlace = (direction == Direction.PLUS ? driverStg.P0 : driverStg.P1); 
-		VisualPlace succPlace = (direction == Direction.PLUS ? driverStg.P1 : driverStg.P0); 
-		HashSet<VisualSignalTransition> transitions = (direction == Direction.PLUS ? driverStg.Rs : driverStg.Fs); 
+		VisualPlace predPlace = (direction == Direction.PLUS ? driverStg.zero : driverStg.one); 
+		VisualPlace succPlace = (direction == Direction.PLUS ? driverStg.one : driverStg.zero); 
+		Collection<VisualSignalTransition> transitions = (direction == Direction.PLUS ? driverStg.riseList : driverStg.fallList);
 		
 		TreeSet<DnfClause> clauses = new TreeSet<DnfClause>(
 				new Comparator<DnfClause>() {
@@ -258,7 +262,7 @@
 				if (sourceDriverStg == null) {
 					throw new RuntimeException("No source for '" + circuit.getMathName(sourceContact) + "' while generating '" + signalName + "'.");
 				}
-				VisualPlace place = literal.getNegation() ? sourceDriverStg.P0 : sourceDriverStg.P1;
+				VisualPlace place = literal.getNegation() ? sourceDriverStg.zero : sourceDriverStg.one;
 				placesToRead.add(place);
 			}
 			
@@ -267,14 +271,8 @@
 			}
 			
 			for (VisualPlace place : placesToRead) {
-				// FIXME: Why duplicate arcs would be created in the first place?
 				try {
-					if(stg.getConnection(place, transition) == null) {
-						stg.connect(place, transition);
-					}
-					if(stg.getConnection(transition, place) == null) {
-						stg.connect(transition, place);
-					}
+					stg.connectUndirected(place, transition);
 				} catch (InvalidConnectionException e) {
 					throw new RuntimeException(e);
 				}
@@ -333,17 +331,15 @@
 			}
 
 			if ((zeroPlace != null) && (onePlace != null)) {
-				zeroPlace.setLabel(signalName + LABEL_SUFFIX_0);
-				onePlace.setLabel(signalName + LABEL_SUFFIX_1);
 				SignalStg signalStg = new SignalStg(zeroPlace, onePlace);
 				result.put(driver, signalStg);
 				for (VisualSignalTransition transition: stg.getVisualSignalTransitions()) {
 					if (signalName.equals(transition.getSignalName())) {
 						if (transition.getDirection() == Direction.PLUS) {
-							signalStg.Rs.add(transition);
+							signalStg.riseList.add(transition);
 						}
 						if (transition.getDirection() == Direction.MINUS) {
-							signalStg.Fs.add(transition);
+							signalStg.fallList.add(transition);
 						}
 					}
 				}
@@ -358,8 +354,8 @@
 		for (VisualContact driver: drivers) {
 			SignalStg signalStg = driverToStgMap.getValue(driver);
 			if (signalStg != null) {
-				signalStg.Rs.removeAll(redundantTransitions);
-				signalStg.Fs.removeAll(redundantTransitions);
+				signalStg.riseList.removeAll(redundantTransitions);
+				signalStg.fallList.removeAll(redundantTransitions);
 			}
 		}
 		stg.remove(redundantTransitions);
@@ -370,8 +366,8 @@
 		for (VisualContact driver: drivers) {
 			SignalStg signalStg = driverToStgMap.getValue(driver);
 			if (signalStg != null) {
-				HashSet<Node> deadPostset = new HashSet<Node>(stg.getPostset(signalStg.P0));
-				deadPostset.retainAll(stg.getPostset(signalStg.P1));
+				HashSet<Node> deadPostset = new HashSet<Node>(stg.getPostset(signalStg.zero));
+				deadPostset.retainAll(stg.getPostset(signalStg.one));
 				result.addAll(deadPostset);
 			}
 		}
@@ -383,14 +379,14 @@
 		for (VisualContact driver: drivers) {
 			SignalStg signalStg = driverToStgMap.getValue(driver);
 			if (signalStg != null) {
-				result.addAll(getDuplicates(signalStg.Rs));
-				result.addAll(getDuplicates(signalStg.Fs));
+				result.addAll(getDuplicates(signalStg.riseList));
+				result.addAll(getDuplicates(signalStg.fallList));
 			}
 		}
 		return result;
 	}
 	
-	private HashSet<Node> getDuplicates(HashSet<VisualSignalTransition> transitions) {
+	private HashSet<Node> getDuplicates(Collection<VisualSignalTransition> transitions) {
 		HashSet<Node> result = new HashSet<>();
 		for (VisualSignalTransition t1: transitions) {
 			if (result.contains(t1)) continue;
@@ -414,18 +410,18 @@
 			if (signalStg != null) {
 				VisualContact signal = CircuitUtils.findSignal(circuit, driver); 
 				Point2D centerPosition = getPosition(signal);
-				setPosition(signalStg.P0, Geometry.add(centerPosition, OFFSET_P0));
-				setPosition(signalStg.P1, Geometry.add(centerPosition, OFFSET_P1));
+				setPosition(signalStg.zero, Geometry.add(centerPosition, OFFSET_P0));
+				setPosition(signalStg.one, Geometry.add(centerPosition, OFFSET_P1));
 				
 				centerPosition = Geometry.add(centerPosition, getDirectionOffset(signal));
 				Point2D plusPosition = Geometry.add(centerPosition, OFFSET_INIT_PLUS);
-				for (VisualSignalTransition transition: signalStg.Rs) {
+				for (VisualSignalTransition transition: signalStg.riseList) {
 					setPosition(transition, plusPosition);
 					plusPosition = Geometry.add(plusPosition, OFFSET_INC_PLUS);
 				}
 
 				Point2D minusPosition = Geometry.add(centerPosition, OFFSET_INIT_MINUS);
-				for (VisualSignalTransition transition: signalStg.Fs) {
+				for (VisualSignalTransition transition: signalStg.fallList) {
 					setPosition(transition, minusPosition);
 					minusPosition = Geometry.add(minusPosition, OFFSET_INC_MINUS);
 				}
@@ -465,10 +461,7 @@
 			SignalStg signalStg = driverToStgMap.getValue(driver);
 			if (signalStg != null) {
 				Collection<Node> nodesToGroup = new LinkedList<Node>();
-				nodesToGroup.add(signalStg.P1);
-				nodesToGroup.add(signalStg.P0);
-				nodesToGroup.addAll(signalStg.Rs);
-				nodesToGroup.addAll(signalStg.Fs);
+				nodesToGroup.addAll(signalStg.getAllNodes());
 
 				Container currentLevel = null;
 				Container oldLevel = stg.getCurrentLevel();

=== removed file 'CircuitPlugin/src/org/workcraft/plugins/circuit/stg/NodeStg.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/stg/NodeStg.java	2015-05-06 20:28:22 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/stg/NodeStg.java	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-package org.workcraft.plugins.circuit.stg;
-
-import java.util.List;
-
-import org.workcraft.dom.Node;
-import org.workcraft.plugins.petri.VisualPlace;
-import org.workcraft.plugins.stg.VisualSignalTransition;
-
-public abstract class NodeStg {
-	public abstract List<VisualPlace> getAllVisualPlaces();
-	public abstract List<VisualSignalTransition> getAllVisualTransitions();
-
-	public boolean containsDirectlyOrByReference(Node n) {
-		if (n != null) {
-			for (VisualPlace p: getAllVisualPlaces()) {
-				if ((n == p) || ((p != null) && (n == p.getReferencedPlace()))) {
-					return true;
-				}
-			}
-			for (VisualSignalTransition t: getAllVisualTransitions()) {
-				if ((n == t) || ((t != null) && (n == t.getReferencedTransition()))) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-}

=== removed file 'CircuitPlugin/src/org/workcraft/plugins/circuit/stg/SignalStg.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/stg/SignalStg.java	2015-05-06 20:28:22 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/stg/SignalStg.java	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-package org.workcraft.plugins.circuit.stg;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
-import org.workcraft.plugins.petri.VisualPlace;
-import org.workcraft.plugins.stg.VisualSignalTransition;
-
-
-public class SignalStg extends NodeStg {
-	public final VisualPlace P0;
-	public final VisualPlace P1;
-	public final HashSet<VisualSignalTransition> Rs;
-	public final HashSet<VisualSignalTransition> Fs;
-
-	public SignalStg(VisualPlace P0, VisualPlace P1) {
-		this(P0, P1, new HashSet<VisualSignalTransition>(), new HashSet<VisualSignalTransition>()); 
-	}
-	
-	public SignalStg(VisualPlace P0, VisualPlace P1, HashSet<VisualSignalTransition> Rs, HashSet<VisualSignalTransition> Fs) {
-		this.P0 = P0;
-		this.P1 = P1;
-		this.Rs = Rs;
-		this.Fs = Fs;
-	}
-
-	@Override
-	public List<VisualSignalTransition> getAllVisualTransitions() {
-		List<VisualSignalTransition> result = new ArrayList<VisualSignalTransition>();
-		result.addAll(Rs);
-		result.addAll(Fs);
-		return result;
-	}
-
-	@Override
-	public List<VisualPlace> getAllVisualPlaces() {
-		return Arrays.asList(P0, P1);
-	}
-
-}

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java	2015-06-30 13:42:58 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java	2015-09-25 14:54:20 +0000
@@ -27,13 +27,13 @@
 import org.workcraft.plugins.circuit.VisualContact;
 import org.workcraft.plugins.circuit.VisualJoint;
 import org.workcraft.plugins.circuit.stg.CircuitToStgConverter;
-import org.workcraft.plugins.circuit.stg.SignalStg;
 import org.workcraft.plugins.petri.Place;
 import org.workcraft.plugins.petri.Transition;
 import org.workcraft.plugins.shared.CommonSimulationSettings;
 import org.workcraft.plugins.stg.LabelParser;
 import org.workcraft.plugins.stg.SignalTransition;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.SignalStg;
 import org.workcraft.plugins.stg.tools.StgSimulationTool;
 import org.workcraft.util.Func;
 
@@ -149,7 +149,7 @@
 		if ((converter != null) && contact.isDriver()) {
 			SignalStg signalStg = converter.getSignalStg(contact);
 			if (signalStg != null) {
-				for (VisualSignalTransition transition : signalStg.getAllVisualTransitions()) {
+				for (VisualSignalTransition transition : signalStg.getAllTransitions()) {
 					if (net.isEnabled(transition.getReferencedTransition())) {
 						result = transition.getReferencedTransition();
 						break;
@@ -209,10 +209,10 @@
 					SignalStg signalStg = converter.getSignalStg(contact);
 					if (signalStg != null) {
 						Node traceCurrentNode = getTraceCurrentNode();
-						final boolean isOne = (signalStg.P1.getReferencedPlace().getTokens() == 1);
-						final boolean isZero = (signalStg.P0.getReferencedPlace().getTokens() == 1);
+						final boolean isOne = (signalStg.one.getReferencedPlace().getTokens() == 1);
+						final boolean isZero = (signalStg.zero.getReferencedPlace().getTokens() == 1);
 						final boolean isExcited = (getContactExcitedTransition(contact) != null);
-						final boolean isInTrace = (signalStg.containsDirectlyOrByReference(traceCurrentNode));
+						final boolean isInTrace = (signalStg.contains(traceCurrentNode));
 						return new Decoration() {
 							@Override
 							public Color getColorisation() {
@@ -248,8 +248,8 @@
 				} else if ((node instanceof VisualJoint) || (node instanceof VisualCircuitConnection)) {
 					SignalStg signalStg = converter.getSignalStg((VisualNode)node);
 					if (signalStg != null) {
-						final boolean isOne = (signalStg.P1.getReferencedPlace().getTokens() == 1);
-						final boolean isZero = (signalStg.P0.getReferencedPlace().getTokens() == 1);
+						final boolean isOne = (signalStg.one.getReferencedPlace().getTokens() == 1);
+						final boolean isZero = (signalStg.zero.getReferencedPlace().getTokens() == 1);
 						return new Decoration() {
 							@Override
 							public Color getColorisation() {

=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/stg/BinaryRegisterStg.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/stg/BinaryRegisterStg.java	2013-09-10 15:21:42 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/stg/BinaryRegisterStg.java	2015-09-25 14:54:20 +0000
@@ -10,6 +10,7 @@
 import org.workcraft.dom.Node;
 import org.workcraft.plugins.petri.VisualPlace;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
 
 public class BinaryRegisterStg extends NodeStg {
 	public final VisualPlace M0;				// M=0

=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/stg/CounterflowLogicStg.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/stg/CounterflowLogicStg.java	2015-08-27 21:29:15 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/stg/CounterflowLogicStg.java	2015-09-25 14:54:20 +0000
@@ -10,6 +10,7 @@
 import org.workcraft.dom.Node;
 import org.workcraft.plugins.petri.VisualPlace;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
 
 public class CounterflowLogicStg extends NodeStg {
 	public final VisualPlace fwC0;							// forwardC=0

=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/stg/CounterflowRegisterStg.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/stg/CounterflowRegisterStg.java	2013-09-09 11:11:43 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/stg/CounterflowRegisterStg.java	2015-09-25 14:54:20 +0000
@@ -5,6 +5,7 @@
 
 import org.workcraft.plugins.petri.VisualPlace;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
 
 public class CounterflowRegisterStg extends NodeStg {
 	public final VisualPlace orM0;				// orM=0

=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/stg/LogicStg.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/stg/LogicStg.java	2015-08-27 21:29:15 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/stg/LogicStg.java	2015-09-25 14:54:20 +0000
@@ -10,6 +10,7 @@
 import org.workcraft.dom.Node;
 import org.workcraft.plugins.petri.VisualPlace;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
 
 public class LogicStg extends NodeStg {
 	public final VisualPlace C0;						// C=0

=== removed file 'DfsPlugin/src/org/workcraft/plugins/dfs/stg/NodeStg.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/stg/NodeStg.java	2015-08-27 21:29:15 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/stg/NodeStg.java	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-package org.workcraft.plugins.dfs.stg;
-
-import java.util.List;
-
-import org.workcraft.dom.Node;
-import org.workcraft.plugins.petri.VisualPlace;
-import org.workcraft.plugins.stg.VisualSignalTransition;
-
-public abstract class NodeStg {
-	public abstract List<VisualSignalTransition> getAllTransitions();
-	
-	public abstract List<VisualPlace> getAllPlaces();
-
-	public boolean contains(Node n) {
-		if (n != null) {
-			for (VisualPlace p: getAllPlaces()) {
-				if (n == p || (p != null && n == p.getReferencedPlace())) {
-					return true;
-				}
-			}
-			for (VisualSignalTransition t: getAllTransitions()) {
-				if (n == t || (t != null && n == t.getReferencedTransition())) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-}

=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/stg/RegisterStg.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/stg/RegisterStg.java	2015-08-27 21:29:15 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/stg/RegisterStg.java	2015-09-25 14:54:20 +0000
@@ -5,6 +5,7 @@
 
 import org.workcraft.plugins.petri.VisualPlace;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
 
 public class RegisterStg extends NodeStg {
 	public final VisualPlace M0;			// M=0

=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/stg/StgGenerator.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/stg/StgGenerator.java	2015-09-13 20:57:03 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/stg/StgGenerator.java	2015-09-25 14:54:20 +0000
@@ -1,7 +1,7 @@
 package org.workcraft.plugins.dfs.stg;
 
 import java.awt.Color;
-import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -12,10 +12,7 @@
 import org.workcraft.dom.Connection;
 import org.workcraft.dom.Container;
 import org.workcraft.dom.Node;
-import org.workcraft.dom.visual.Movable;
 import org.workcraft.dom.visual.Positioning;
-import org.workcraft.dom.visual.TransformHelper;
-import org.workcraft.dom.visual.connections.VisualConnection;
 import org.workcraft.exceptions.InvalidConnectionException;
 import org.workcraft.plugins.dfs.ControlRegister.SynchronisationType;
 import org.workcraft.plugins.dfs.DfsSettings;
@@ -30,15 +27,14 @@
 import org.workcraft.plugins.dfs.VisualPushRegister;
 import org.workcraft.plugins.dfs.VisualRegister;
 import org.workcraft.plugins.petri.VisualPlace;
-import org.workcraft.plugins.stg.STG;
 import org.workcraft.plugins.stg.SignalTransition;
-import org.workcraft.plugins.stg.VisualSTG;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
 import org.workcraft.util.CieColorUtils;
 import org.workcraft.util.ColorGenerator;
 import org.workcraft.util.Hierarchy;
 
-public class StgGenerator {
+public class StgGenerator extends org.workcraft.plugins.stg.generator.StgGenerator {
 	public static final String nameC 		= "C_";
 	public static final String nameFwC 		= "fwC_";
 	public static final String nameBwC 		= "bwC_";
@@ -59,86 +55,97 @@
 	public static final String labelFalseM	= "falseM(";
 	public static final String label0 		= ")=0";
 	public static final String label1 		= ")=1";
-	private static final double xScaling = 6;
-	private static final double yScaling = 6;
 
-	private Map<VisualLogic, LogicStg> logicMap = new HashMap<>(); 
-	private Map<VisualRegister, RegisterStg> registerMap = new HashMap<>();
-	private Map<VisualCounterflowLogic, CounterflowLogicStg> counterflowLogicMap = new HashMap<>(); 
-	private Map<VisualCounterflowRegister, CounterflowRegisterStg> counterflowRegisterMap = new HashMap<>();
-	private Map<VisualControlRegister, BinaryRegisterStg> controlRegisterMap = new HashMap<>();
-	private Map<VisualPushRegister, BinaryRegisterStg> pushRegisterMap = new HashMap<>();
-	private Map<VisualPopRegister, BinaryRegisterStg> popRegisterMap = new HashMap<>();
-	private final VisualDfs dfs;
-	private final VisualSTG stg;
+	private Map<VisualLogic, LogicStg> logicMap; 
+	private Map<VisualRegister, RegisterStg> registerMap;
+	private Map<VisualCounterflowLogic, CounterflowLogicStg> counterflowLogicMap; 
+	private Map<VisualCounterflowRegister, CounterflowRegisterStg> counterflowRegisterMap;
+	private Map<VisualControlRegister, BinaryRegisterStg> controlRegisterMap;
+	private Map<VisualPushRegister, BinaryRegisterStg> pushRegisterMap;
+	private Map<VisualPopRegister, BinaryRegisterStg> popRegisterMap;
 
 	public StgGenerator(VisualDfs dfs) {
-		this.dfs = dfs;
-		this.stg = new VisualSTG(new STG());
-		convert();
+		super(dfs);
 	}
 	
-	private void convert() {
+	private VisualDfs getDfsModel() {
+		return (VisualDfs)getSrcModel();
+	}
+
+	@Override
+	public Point2D getScale() {
+		return new Point2D.Double(6.0, 6.0);
+	}
+
+	@Override
+	public void convert() {
 		try {
-			for(VisualLogic l : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualLogic.class)) {
+			for(VisualLogic l : Hierarchy.getDescendantsOfType(getDfsModel().getRoot(), VisualLogic.class)) {
 				LogicStg lstg = generateLogicStg(l);
-				logicMap.put(l, lstg);
+				groupComponentStg(lstg);
+				putLogicStg(l, lstg);
 			}
-			for(VisualRegister r : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualRegister.class)) {
+			for(VisualRegister r : Hierarchy.getDescendantsOfType(getDfsModel().getRoot(), VisualRegister.class)) {
 				RegisterStg rstg = generateRegisterSTG(r);
-				registerMap.put(r, rstg);
+				groupComponentStg(rstg);
+				putRegisterStg(r, rstg);
 			}
 
-			for(VisualCounterflowLogic l : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualCounterflowLogic.class)) {
+			for(VisualCounterflowLogic l : Hierarchy.getDescendantsOfType(getDfsModel().getRoot(), VisualCounterflowLogic.class)) {
 				CounterflowLogicStg lstg = generateCounterflowLogicStg(l);
-				counterflowLogicMap.put(l, lstg);
+				groupComponentStg(lstg);
+				putCounterflowLogicStg(l, lstg);
 			}
-			for(VisualCounterflowRegister r : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualCounterflowRegister.class)) {
+			for(VisualCounterflowRegister r : Hierarchy.getDescendantsOfType(getDfsModel().getRoot(), VisualCounterflowRegister.class)) {
 				CounterflowRegisterStg rstg = generateCounterflowRegisterSTG(r);
-				counterflowRegisterMap.put(r, rstg);
+				groupComponentStg(rstg);
+				putCounterflowRegisterStg(r, rstg);
 			}
 
-			for(VisualControlRegister r : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualControlRegister.class)) {
+			for(VisualControlRegister r : Hierarchy.getDescendantsOfType(getDfsModel().getRoot(), VisualControlRegister.class)) {
 				BinaryRegisterStg rstg = generateControlRegisterStg(r);
-				controlRegisterMap.put(r, rstg);
+				groupComponentStg(rstg);
+				putControlRegisterStg(r, rstg);
 			}
-			for(VisualPushRegister r : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualPushRegister.class)) {
+			for(VisualPushRegister r : Hierarchy.getDescendantsOfType(getDfsModel().getRoot(), VisualPushRegister.class)) {
 				BinaryRegisterStg rstg = generatePushRegisterStg(r);
-				pushRegisterMap.put(r, rstg);
+				groupComponentStg(rstg);
+				putPushRegisterStg(r, rstg);
 			}
-			for(VisualPopRegister r : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualPopRegister.class)) {
+			for(VisualPopRegister r : Hierarchy.getDescendantsOfType(getDfsModel().getRoot(), VisualPopRegister.class)) {
 				BinaryRegisterStg rstg = generatePopRegisterStg(r);
-				popRegisterMap.put(r, rstg);
+				groupComponentStg(rstg);
+				putPopRegisterStg(r, rstg);
 			}
 
-			for(VisualLogic l : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualLogic.class)) {
+			for(VisualLogic l : Hierarchy.getDescendantsOfType(getDfsModel().getRoot(), VisualLogic.class)) {
 				connectLogicStg(l);
 			}
-			for(VisualRegister r : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualRegister.class)) {
+			for(VisualRegister r : Hierarchy.getDescendantsOfType(getDfsModel().getRoot(), VisualRegister.class)) {
 				connectRegisterStg(r);
 			}			
 
-			for(VisualCounterflowLogic l : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualCounterflowLogic.class)) {
+			for(VisualCounterflowLogic l : Hierarchy.getDescendantsOfType(getDfsModel().getRoot(), VisualCounterflowLogic.class)) {
 				connectCounterflowLogicStg(l);
 			}
-			for(VisualCounterflowRegister r : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualCounterflowRegister.class)) {
+			for(VisualCounterflowRegister r : Hierarchy.getDescendantsOfType(getDfsModel().getRoot(), VisualCounterflowRegister.class)) {
 				connectCounterflowRegisterStg(r);
 			}			
 
-			for(VisualControlRegister r : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualControlRegister.class)) {
+			for(VisualControlRegister r : Hierarchy.getDescendantsOfType(getDfsModel().getRoot(), VisualControlRegister.class)) {
 				connectControlRegisterStg(r);
 			}			
-			for(VisualPushRegister r : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualPushRegister.class)) {
+			for(VisualPushRegister r : Hierarchy.getDescendantsOfType(getDfsModel().getRoot(), VisualPushRegister.class)) {
 				connectPushRegisterStg(r);
 			}			
-			for(VisualPopRegister r : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualPopRegister.class)) {
+			for(VisualPopRegister r : Hierarchy.getDescendantsOfType(getDfsModel().getRoot(), VisualPopRegister.class)) {
 				connectPopRegisterStg(r);
 			}			
 		} catch (InvalidConnectionException e) {
 			throw new RuntimeException(e);
 		}
 	}
-	
+
 	static Color[] tokenColors = DfsSettings.getTokenPalette().getColors();
 	private ColorGenerator createColorGenerator(boolean required) {
 		ColorGenerator result = null;
@@ -150,55 +157,21 @@
 		}
 		return result;
 	}
-
-	public VisualSTG getStg() {
-		return stg;
-	}
-
-	static void setPosition(Movable node, double x, double y) {
-		TransformHelper.applyTransform(node, AffineTransform.getTranslateInstance(x, y));
-	}
-	
-	private void createConsumingArc(VisualPlace p, VisualSignalTransition t, boolean propagateTokenColor) throws InvalidConnectionException {
-		if (p != null && t != null) {
-			VisualConnection connection = stg.connect(p, t);
-			connection.setTokenColorPropagator(propagateTokenColor);
-		}
-	}
-	
-	private void createProducingArc(VisualSignalTransition t, VisualPlace p, boolean propagateTokenColor) throws InvalidConnectionException {
-		if (p != null && t != null) {
-			VisualConnection connection = stg.connect(t, p);
-			connection.setTokenColorPropagator(propagateTokenColor);
-		}
-	}
-	
-	private void createReadArc(VisualPlace p, VisualSignalTransition t, boolean propagateTokenColor) throws InvalidConnectionException {
-		if (p != null && t != null) {
-			VisualConnection connection = stg.connectUndirected(p, t);
-			connection.setTokenColorPropagator(propagateTokenColor);
-		}
-	}
-
-	private void createReadArcs(VisualPlace p, Collection<VisualSignalTransition> ts, boolean propagateTokenColor) throws InvalidConnectionException {
-		for (VisualSignalTransition t : new HashSet<VisualSignalTransition>(ts)) {
-			createReadArc(p, t, propagateTokenColor);
-		}
-	}
-
+	
+	
 	private LogicStg generateLogicStg(VisualLogic l) throws InvalidConnectionException {
-		String name = dfs.getName(l);
-		AffineTransform transform = TransformHelper.getTransformToRoot(l);
-		double x =	xScaling * (transform.getTranslateX() + l.getX());
-		double y =	yScaling * (transform.getTranslateY() + l.getY());
+		String name = getDfsModel().getName(l);
+		Point2D pos = getComponentPosition(l);
+		double x = pos.getX();
+		double y = pos.getY();
 		Collection<Node> nodes = new LinkedList<Node>();
 		SignalTransition.Type type = SignalTransition.Type.INTERNAL;
-		ColorGenerator tokenColorGenerator = createColorGenerator(dfs.getPreset(l).size() == 0);
+		ColorGenerator tokenColorGenerator = createColorGenerator(getDfsModel().getPreset(l).size() == 0);
 		
 		
 		Container curContainer = null;
 		
-		VisualPlace C0 = stg.createPlace(nameC + name + name0, curContainer);
+		VisualPlace C0 = getStgModel().createPlace(nameC + name + name0, curContainer);
 		C0.setLabel(labelC + name + label0);
 		C0.setLabelPositioning(Positioning.BOTTOM);
 		if (!l.getReferencedLogic().isComputed()) {
@@ -209,7 +182,7 @@
 		setPosition(C0, x + 2.0, y + 1.0);
 		nodes.add(C0);
 
-		VisualPlace C1 = stg.createPlace(nameC + name + name1, curContainer);
+		VisualPlace C1 = getStgModel().createPlace(nameC + name + name1, curContainer);
 		C1.setLabel(labelC + name + label1);
 		C1.setLabelPositioning(Positioning.TOP);
 		if (l.getReferencedLogic().isComputed()) {
@@ -221,11 +194,11 @@
 		nodes.add(C1);
 
 		Set<Node> preset = new HashSet<Node>();
-		preset.addAll(dfs.getPreset(l, VisualLogic.class));
-		preset.addAll(dfs.getPreset(l, VisualRegister.class));
-		preset.addAll(dfs.getPreset(l, VisualControlRegister.class));
-		preset.addAll(dfs.getPreset(l, VisualPushRegister.class));
-		preset.addAll(dfs.getPreset(l, VisualPopRegister.class));
+		preset.addAll(getDfsModel().getPreset(l, VisualLogic.class));
+		preset.addAll(getDfsModel().getPreset(l, VisualRegister.class));
+		preset.addAll(getDfsModel().getPreset(l, VisualControlRegister.class));
+		preset.addAll(getDfsModel().getPreset(l, VisualPushRegister.class));
+		preset.addAll(getDfsModel().getPreset(l, VisualPopRegister.class));
 		if (preset.size() == 0) {
 			preset.add(l);
 		}
@@ -236,7 +209,7 @@
 		double dy = 0.0;
 		for (Node n: preset) {
 			if (CR == null || l.getReferencedLogic().isEarlyEvaluation()) { 
-				CR = stg.createSignalTransition(nameC + name, type, SignalTransition.Direction.PLUS, curContainer);
+				CR = getStgModel().createSignalTransition(nameC + name, type, SignalTransition.Direction.PLUS, curContainer);
 				CR.setTokenColorGenerator(tokenColorGenerator);
 				createConsumingArc(C0, CR, false);
 				createProducingArc(CR, C1, true);
@@ -245,7 +218,7 @@
 			}
 			CRs.put(n, CR);
 			if (CF == null) { 
-				CF = stg.createSignalTransition(nameC + name, type, SignalTransition.Direction.MINUS, curContainer);
+				CF = getStgModel().createSignalTransition(nameC + name, type, SignalTransition.Direction.MINUS, curContainer);
 				createConsumingArc(C1, CF, false);
 				createProducingArc(CF, C0, false);
 				setPosition(CF, x - 2.0, y - 1.0 - dy);
@@ -255,34 +228,32 @@
 			dy += 1.0;
 		}
 
-		stg.select(nodes);
-		stg.groupSelection();
 		return new LogicStg(C0, C1, CRs, CFs);
 	}
 
 	private void connectLogicStg(VisualLogic l) throws InvalidConnectionException {
 		LogicStg lstg = getLogicStg(l);
-		for (VisualLogic n: dfs.getPreset(l, VisualLogic.class)) {
+		for (VisualLogic n: getDfsModel().getPreset(l, VisualLogic.class)) {
 			LogicStg nstg = getLogicStg(n);
 			createReadArc(nstg.C1, lstg.CRs.get(n), true);
 			createReadArc(nstg.C0, lstg.CFs.get(n), false);
 		}
-		for (VisualRegister n: dfs.getPreset(l, VisualRegister.class)) {
+		for (VisualRegister n: getDfsModel().getPreset(l, VisualRegister.class)) {
 			RegisterStg nstg = getRegisterStg(n);
 			createReadArc(nstg.M1, lstg.CRs.get(n), true);
 			createReadArc(nstg.M0, lstg.CFs.get(n), false);
 		}
-		for (VisualControlRegister n: dfs.getPreset(l, VisualControlRegister.class)) {
+		for (VisualControlRegister n: getDfsModel().getPreset(l, VisualControlRegister.class)) {
 			BinaryRegisterStg nstg = getControlRegisterStg(n);
 			createReadArc(nstg.M1, lstg.CRs.get(n), true);
 			createReadArc(nstg.M0, lstg.CFs.get(n), false);
 		}
-		for (VisualPushRegister n: dfs.getPreset(l, VisualPushRegister.class)) {
+		for (VisualPushRegister n: getDfsModel().getPreset(l, VisualPushRegister.class)) {
 			BinaryRegisterStg nstg = getPushRegisterStg(n);
 			createReadArc(nstg.tM1, lstg.CRs.get(n), true);
 			createReadArc(nstg.tM0, lstg.CFs.get(n), false);
 		}
-		for (VisualPopRegister n: dfs.getPreset(l, VisualPopRegister.class)) {
+		for (VisualPopRegister n: getDfsModel().getPreset(l, VisualPopRegister.class)) {
 			BinaryRegisterStg nstg = getPopRegisterStg(n);
 			createReadArc(nstg.M1, lstg.CRs.get(n), true);
 			createReadArc(nstg.M0, lstg.CFs.get(n), false);
@@ -290,25 +261,33 @@
 	}
 
 	public LogicStg getLogicStg(VisualLogic logic) {
-		return logicMap.get(logic);
-	}
-
+		return ((logicMap == null) ? null : logicMap.get(logic));
+	}
+
+	public void putLogicStg(VisualLogic logic, LogicStg stg) {
+		if (logicMap == null) {
+			logicMap = new HashMap<>();
+		}
+		logicMap.put(logic, stg);
+	}
+
+	
 	private RegisterStg generateRegisterSTG(VisualRegister r) throws InvalidConnectionException {
-		String name = dfs.getName(r);
-		AffineTransform transform = TransformHelper.getTransformToRoot(r);
-		double x =	xScaling * (transform.getTranslateX() + r.getX());
-		double y =	yScaling * (transform.getTranslateY() + r.getY());
+		String name = getDfsModel().getName(r);
+		Point2D pos = getComponentPosition(r);
+		double x = pos.getX();
+		double y = pos.getY();
 		Collection<Node> nodes = new LinkedList<Node>();
 		SignalTransition.Type type = SignalTransition.Type.INTERNAL;
-		if (dfs.getPreset(r).size() == 0) {
+		if (getDfsModel().getPreset(r).size() == 0) {
 			type = SignalTransition.Type.INPUT;
-		} else if (dfs.getPostset(r).size() == 0) {
+		} else if (getDfsModel().getPostset(r).size() == 0) {
 			type = SignalTransition.Type.OUTPUT;
 		}
-		ColorGenerator tokenColorGenerator = createColorGenerator(dfs.getPreset(r).size() == 0);
+		ColorGenerator tokenColorGenerator = createColorGenerator(getDfsModel().getPreset(r).size() == 0);
 		Container curContainer = null;
 
-		VisualPlace M0 = stg.createPlace(nameM + name + name0, curContainer);
+		VisualPlace M0 = getStgModel().createPlace(nameM + name + name0, curContainer);
 		M0.setLabel(labelM + name + label0);
 		M0.setLabelPositioning(Positioning.BOTTOM);
 		if (!r.getReferencedRegister().isMarked()) {
@@ -319,7 +298,7 @@
 		setPosition(M0, x + 2.0, y + 1.0);
 		nodes.add(M0);
 	
-		VisualPlace M1 = stg.createPlace(nameM + name + name1, curContainer);
+		VisualPlace M1 = getStgModel().createPlace(nameM + name + name1, curContainer);
 		M1.setLabel(labelM + name + label1);
 		M1.setLabelPositioning(Positioning.TOP);
 		if (r.getReferencedRegister().isMarked()) {
@@ -329,82 +308,80 @@
 		setPosition(M1, x + 2.0, y - 1.0);
 		nodes.add(M1);
 	
-		VisualSignalTransition MR = stg.createSignalTransition(nameM + name, type, SignalTransition.Direction.PLUS, curContainer);
+		VisualSignalTransition MR = getStgModel().createSignalTransition(nameM + name, type, SignalTransition.Direction.PLUS, curContainer);
 		MR.setTokenColorGenerator(tokenColorGenerator);
 		createConsumingArc(M0, MR, false);
 		createProducingArc(MR, M1, true);
 		setPosition(MR, x - 2.0, y + 1.0);
 		nodes.add(MR);
 	
-		VisualSignalTransition MF = stg.createSignalTransition(nameM + name, type, SignalTransition.Direction.MINUS, curContainer);
+		VisualSignalTransition MF = getStgModel().createSignalTransition(nameM + name, type, SignalTransition.Direction.MINUS, curContainer);
 		createConsumingArc(M1, MF, false);
 		createProducingArc(MF, M0, false);
 		setPosition(MF, x - 2.0, y - 1.0);
 		nodes.add(MF);
 	
-		stg.select(nodes);
-		stg.groupSelection();
 		return new RegisterStg(M0, M1, MR, MF);
 	}
 
 	private void connectRegisterStg(VisualRegister r) throws InvalidConnectionException {
 		RegisterStg rstg = getRegisterStg(r);
 		// preset
-		for (VisualLogic n: dfs.getPreset(r, VisualLogic.class)) {
+		for (VisualLogic n: getDfsModel().getPreset(r, VisualLogic.class)) {
 			LogicStg nstg = getLogicStg(n);
 			createReadArc(nstg.C1, rstg.MR, true);
 			createReadArc(nstg.C0, rstg.MF, false);
 		}
 		// R-preset
-		for (VisualRegister n: dfs.getRPreset(r, VisualRegister.class)) {
+		for (VisualRegister n: getDfsModel().getRPreset(r, VisualRegister.class)) {
 			RegisterStg nstg = getRegisterStg(n);
 			createReadArc(nstg.M1, rstg.MR, true);
 			createReadArc(nstg.M0, rstg.MF, false);
 		}
-		for (VisualCounterflowRegister n: dfs.getRPreset(r, VisualCounterflowRegister.class)) {
+		for (VisualCounterflowRegister n: getDfsModel().getRPreset(r, VisualCounterflowRegister.class)) {
 			CounterflowRegisterStg nstg = getCounterflowRegisterStg(n);
 			createReadArc(nstg.orM1, rstg.MR, true);
 			createReadArc(nstg.orM0, rstg.MF, false);
 			createReadArc(nstg.andM1, rstg.MF, false);
 			createReadArc(nstg.andM0, rstg.MR, false);
 		}
-		for (VisualControlRegister n: dfs.getRPreset(r, VisualControlRegister.class)) {
+		for (VisualControlRegister n: getDfsModel().getRPreset(r, VisualControlRegister.class)) {
 			BinaryRegisterStg nstg = getControlRegisterStg(n);
 			createReadArc(nstg.M1, rstg.MR, true);
 			createReadArc(nstg.M0, rstg.MF, false);
 		}
-		for (VisualPushRegister n: dfs.getRPreset(r, VisualPushRegister.class)) {
+		for (VisualPushRegister n: getDfsModel().getRPreset(r, VisualPushRegister.class)) {
 			BinaryRegisterStg nstg = getPushRegisterStg(n);
 			createReadArc(nstg.tM1, rstg.MR, true);
 			createReadArc(nstg.tM0, rstg.MF, false);
 		}
-		for (VisualPopRegister n: dfs.getRPreset(r, VisualPopRegister.class)) {
+		for (VisualPopRegister n: getDfsModel().getRPreset(r, VisualPopRegister.class)) {
 			BinaryRegisterStg nstg = getPopRegisterStg(n);
 			createReadArc(nstg.M1, rstg.MR, true);
 			createReadArc(nstg.M0, rstg.MF, false);
 		}
 		// R-postset
-		for (VisualRegister n: dfs.getRPostset(r, VisualRegister.class)) {
+		for (VisualRegister n: getDfsModel().getRPostset(r, VisualRegister.class)) {
 			RegisterStg nstg = getRegisterStg(n);
 			createReadArc(nstg.M1, rstg.MF, false);
 			createReadArc(nstg.M0, rstg.MR, false);
 		}
-		for (VisualCounterflowRegister n: dfs.getRPostset(r, VisualCounterflowRegister.class)) {
+		for (VisualCounterflowRegister n: getDfsModel().getRPostset(r, VisualCounterflowRegister.class)) {
 			CounterflowRegisterStg nstg = getCounterflowRegisterStg(n);
 			createReadArc(nstg.andM1, rstg.MF, false);
 			createReadArc(nstg.andM0, rstg.MR, false);
 		}
-		for (VisualControlRegister n: dfs.getRPostset(r, VisualControlRegister.class)) {
+		for (VisualControlRegister n: getDfsModel().getRPostset(r, VisualControlRegister.class)) {
 			BinaryRegisterStg nstg = getControlRegisterStg(n);
 			createReadArc(nstg.M1, rstg.MF, false);
 			createReadArc(nstg.M0, rstg.MR, false);
 		}
-		for (VisualPushRegister n: dfs.getRPostset(r, VisualPushRegister.class)) {
+		for (VisualPushRegister n: getDfsModel().getRPostset(r, VisualPushRegister.class)) {
 			BinaryRegisterStg nstg = getPushRegisterStg(n);
 			createReadArc(nstg.M1, rstg.MF, false);
 			createReadArc(nstg.M0, rstg.MR, false);
 		}
-		for (VisualPopRegister n: dfs.getRPostset(r, VisualPopRegister.class)) {
+		for (VisualPopRegister n: getDfsModel().getRPostset(r, VisualPopRegister.class)) {
 			BinaryRegisterStg nstg = getPopRegisterStg(n);
 			createReadArc(nstg.tM1, rstg.MF, false);
 			createReadArc(nstg.tM0, rstg.MR, false);
@@ -412,22 +389,30 @@
 	}
 
 	public RegisterStg getRegisterStg(VisualRegister register) {
-		return registerMap.get(register);
-	}
-
+		return ((registerMap == null) ? null : registerMap.get(register));
+	}
+
+	public void putRegisterStg(VisualRegister register, RegisterStg stg) {
+		if (registerMap == null) {
+			registerMap = new HashMap<>();
+		}
+		registerMap.put(register, stg);
+	}
+
+	
 	private CounterflowLogicStg generateCounterflowLogicStg(VisualCounterflowLogic l) throws InvalidConnectionException {
-		String name = dfs.getName(l);
-		AffineTransform transform = TransformHelper.getTransformToRoot(l);
-		double x =	xScaling * (transform.getTranslateX() + l.getX()); 
-		double y = yScaling * (transform.getTranslateY() + l.getY());
+		String name = getDfsModel().getName(l);
+		Point2D pos = getComponentPosition(l);
+		double x = pos.getX();
+		double y = pos.getY();
 		Collection<Node> nodes = new LinkedList<Node>();
 		SignalTransition.Type type = SignalTransition.Type.INTERNAL;
-		ColorGenerator presetTokenColorGenerator = createColorGenerator(dfs.getPreset(l).size() == 0);
-		ColorGenerator postsetTokenColorGenerator = createColorGenerator(dfs.getPostset(l).size() == 0);
+		ColorGenerator presetTokenColorGenerator = createColorGenerator(getDfsModel().getPreset(l).size() == 0);
+		ColorGenerator postsetTokenColorGenerator = createColorGenerator(getDfsModel().getPostset(l).size() == 0);
 		
 		Container curContainer = null;
 		
-		VisualPlace fwC0 = stg.createPlace(nameFwC + name + name0, curContainer);
+		VisualPlace fwC0 = getStgModel().createPlace(nameFwC + name + name0, curContainer);
 		fwC0.setLabel(labelFwC + name + label0);
 		fwC0.setLabelPositioning(Positioning.BOTTOM);
 		if (!l.getReferencedCounterflowLogic().isForwardComputed()) {
@@ -438,7 +423,7 @@
 		setPosition(fwC0, x + 2.0, y - 2.0);
 		nodes.add(fwC0);
 
-		VisualPlace fwC1 = stg.createPlace(nameFwC + name + name1, curContainer);
+		VisualPlace fwC1 = getStgModel().createPlace(nameFwC + name + name1, curContainer);
 		fwC1.setLabel(labelFwC + name + label1);
 		fwC1.setLabelPositioning(Positioning.TOP);
 		if (l.getReferencedCounterflowLogic().isForwardComputed()) {
@@ -450,8 +435,8 @@
 		nodes.add(fwC1);
 
 		Set<Node> preset = new HashSet<Node>();
-		preset.addAll(dfs.getPreset(l, VisualCounterflowLogic.class));
-		preset.addAll(dfs.getPreset(l, VisualCounterflowRegister.class));
+		preset.addAll(getDfsModel().getPreset(l, VisualCounterflowLogic.class));
+		preset.addAll(getDfsModel().getPreset(l, VisualCounterflowRegister.class));
 		if (preset.size() == 0) {
 			preset.add(l);
 		}
@@ -463,7 +448,7 @@
 			double dy = 0.0;
 			for (Node n: preset) {
 				if (fwCR == null || l.getReferencedCounterflowLogic().isForwardEarlyEvaluation()) { 
-					fwCR = stg.createSignalTransition(nameFwC + name, type, SignalTransition.Direction.PLUS, curContainer);
+					fwCR = getStgModel().createSignalTransition(nameFwC + name, type, SignalTransition.Direction.PLUS, curContainer);
 					fwCR.setTokenColorGenerator(presetTokenColorGenerator);
 					createConsumingArc(fwC0, fwCR, false);
 					createProducingArc(fwCR, fwC1, true);
@@ -472,7 +457,7 @@
 				}
 				fwCRs.put(n, fwCR);
 				if (fwCF == null) { 
-					fwCF = stg.createSignalTransition(nameFwC + name, type, SignalTransition.Direction.MINUS, curContainer);
+					fwCF = getStgModel().createSignalTransition(nameFwC + name, type, SignalTransition.Direction.MINUS, curContainer);
 					createConsumingArc(fwC1, fwCF, false);
 					createProducingArc(fwCF, fwC0, false);
 					setPosition(fwCF, x - 2.0, y - 4.0 - dy);
@@ -483,7 +468,7 @@
 			}
 		}
 		
-		VisualPlace bwC0 = stg.createPlace(nameBwC + name + name0, curContainer);
+		VisualPlace bwC0 = getStgModel().createPlace(nameBwC + name + name0, curContainer);
 		bwC0.setLabel(labelBwC + name + label0);
 		bwC0.setLabelPositioning(Positioning.BOTTOM);
 		if (!l.getReferencedCounterflowLogic().isBackwardComputed()) {
@@ -494,7 +479,7 @@
 		setPosition(bwC0, x + 2.0, y + 4.0);
 		nodes.add(bwC0);
 
-		VisualPlace bwC1 = stg.createPlace(nameBwC + name + name1, curContainer);
+		VisualPlace bwC1 = getStgModel().createPlace(nameBwC + name + name1, curContainer);
 		bwC1.setLabel(labelBwC + name + label1);
 		bwC1.setLabelPositioning(Positioning.TOP);
 		if (l.getReferencedCounterflowLogic().isBackwardComputed()) {
@@ -506,8 +491,8 @@
 		nodes.add(bwC1);
 		
 		Set<Node> postset = new HashSet<Node>();
-		postset.addAll(dfs.getPostset(l, VisualCounterflowLogic.class));
-		postset.addAll(dfs.getPostset(l, VisualCounterflowRegister.class));
+		postset.addAll(getDfsModel().getPostset(l, VisualCounterflowLogic.class));
+		postset.addAll(getDfsModel().getPostset(l, VisualCounterflowRegister.class));
 		if (postset.size() == 0) {
 			postset.add(l);
 		}
@@ -519,7 +504,7 @@
 			double dy = 0.0;
 			for (Node n: postset) {
 				if (bwCR == null || l.getReferencedCounterflowLogic().isBackwardEarlyEvaluation()) { 
-					bwCR = stg.createSignalTransition(nameBwC + name, type, SignalTransition.Direction.PLUS, curContainer);
+					bwCR = getStgModel().createSignalTransition(nameBwC + name, type, SignalTransition.Direction.PLUS, curContainer);
 					bwCR.setTokenColorGenerator(postsetTokenColorGenerator);
 					createConsumingArc(bwC0, bwCR, false);
 					createProducingArc(bwCR, bwC1, false);
@@ -528,7 +513,7 @@
 				}
 				bwCRs.put(n, bwCR);
 				if (bwCF == null) { 
-					bwCF = stg.createSignalTransition(nameBwC + name, type, SignalTransition.Direction.MINUS, curContainer);
+					bwCF = getStgModel().createSignalTransition(nameBwC + name, type, SignalTransition.Direction.MINUS, curContainer);
 					createConsumingArc(bwC1, bwCF, false);
 					createProducingArc(bwCF, bwC0, false);
 					setPosition(bwCF, x - 2.0, y + 2.0 - dy);
@@ -538,32 +523,30 @@
 				dy += 1.0;
 			}
 		}		
-		
-		stg.select(nodes);
-		stg.groupSelection();
+
 		return new CounterflowLogicStg(fwC0, fwC1, fwCRs, fwCFs, bwC0, bwC1, bwCRs, bwCFs);
 	}
 
 	private void connectCounterflowLogicStg(VisualCounterflowLogic l) throws InvalidConnectionException {
 		CounterflowLogicStg lstg = getCounterflowLogicStg(l);
 		// preset
-		for (VisualCounterflowLogic n: dfs.getPreset(l, VisualCounterflowLogic.class)) {
+		for (VisualCounterflowLogic n: getDfsModel().getPreset(l, VisualCounterflowLogic.class)) {
 			CounterflowLogicStg nstg = getCounterflowLogicStg(n);
 			createReadArc(nstg.fwC1, lstg.fwCRs.get(n), true);
 			createReadArc(nstg.fwC0, lstg.fwCFs.get(n), false);
 		}
-		for (VisualCounterflowRegister n: dfs.getPreset(l, VisualCounterflowRegister.class)) {
+		for (VisualCounterflowRegister n: getDfsModel().getPreset(l, VisualCounterflowRegister.class)) {
 			CounterflowRegisterStg nstg = getCounterflowRegisterStg(n);
 			createReadArc(nstg.orM1, lstg.fwCRs.get(n), true);
 			createReadArc(nstg.orM0, lstg.fwCFs.get(n), false);
 		}
 		// postset
-		for (VisualCounterflowLogic n: dfs.getPostset(l, VisualCounterflowLogic.class)) {
+		for (VisualCounterflowLogic n: getDfsModel().getPostset(l, VisualCounterflowLogic.class)) {
 			CounterflowLogicStg nstg = getCounterflowLogicStg(n);
 			createReadArc(nstg.bwC1, lstg.bwCRs.get(n), false);
 			createReadArc(nstg.bwC0, lstg.bwCFs.get(n), false);
 		}
-		for (VisualCounterflowRegister n: dfs.getPostset(l, VisualCounterflowRegister.class)) {
+		for (VisualCounterflowRegister n: getDfsModel().getPostset(l, VisualCounterflowRegister.class)) {
 			CounterflowRegisterStg nstg = getCounterflowRegisterStg(n);
 			createReadArc(nstg.orM1, lstg.bwCRs.get(n), false);
 			createReadArc(nstg.orM0, lstg.bwCFs.get(n), false);
@@ -571,25 +554,33 @@
 	}
 
 	public CounterflowLogicStg getCounterflowLogicStg(VisualCounterflowLogic logic) {
-		return counterflowLogicMap.get(logic);
-	}
+		return ((counterflowLogicMap == null) ? null : counterflowLogicMap.get(logic));
+	}
+
+	public void putCounterflowLogicStg(VisualCounterflowLogic logic, CounterflowLogicStg stg) {
+		if (counterflowLogicMap == null) {
+			counterflowLogicMap = new HashMap<>();
+		}
+		counterflowLogicMap.put(logic, stg);
+	}
+	
 
 	private CounterflowRegisterStg generateCounterflowRegisterSTG(VisualCounterflowRegister r) throws InvalidConnectionException {
-		String name = dfs.getName(r);
-		AffineTransform transform = TransformHelper.getTransformToRoot(r);
-		double x = xScaling * (transform.getTranslateX() + r.getX()); 
-		double y = yScaling * (transform.getTranslateY() + r.getY());
+		String name = getDfsModel().getName(r);
+		Point2D pos = getComponentPosition(r);
+		double x = pos.getX();
+		double y = pos.getY();
 		Collection<Node> nodes = new LinkedList<Node>();
 		SignalTransition.Type type = SignalTransition.Type.INTERNAL;
-		if (dfs.getPreset(r).size() == 0 || dfs.getPostset(r).size() == 0) {
+		if (getDfsModel().getPreset(r).size() == 0 || getDfsModel().getPostset(r).size() == 0) {
 			type = SignalTransition.Type.INPUT;
 		}
-		ColorGenerator presetTokenColorGenerator = createColorGenerator(dfs.getPreset(r).size() == 0);
-		ColorGenerator postsetTokenColorGenerator = createColorGenerator(dfs.getPostset(r).size() == 0);
+		ColorGenerator presetTokenColorGenerator = createColorGenerator(getDfsModel().getPreset(r).size() == 0);
+		ColorGenerator postsetTokenColorGenerator = createColorGenerator(getDfsModel().getPostset(r).size() == 0);
 
 		Container curContainer = null;
 		
-		VisualPlace orM0 = stg.createPlace(nameOrM + name + name0, curContainer);
+		VisualPlace orM0 = getStgModel().createPlace(nameOrM + name + name0, curContainer);
 		orM0.setLabel(labelOrM + name + label0);
 		orM0.setLabelPositioning(Positioning.BOTTOM);
 		if (!r.getReferencedCounterflowRegister().isOrMarked()) {
@@ -600,7 +591,7 @@
 		setPosition(orM0, x + 2.0, y - 2.0);
 		nodes.add(orM0);
 
-		VisualPlace orM1 = stg.createPlace(nameOrM + name + name1, curContainer);
+		VisualPlace orM1 = getStgModel().createPlace(nameOrM + name + name1, curContainer);
 		orM1.setLabel(labelOrM + name + label1);
 		orM1.setLabelPositioning(Positioning.TOP);
 		if (r.getReferencedCounterflowRegister().isOrMarked()) {
@@ -611,33 +602,33 @@
 		setPosition(orM1, x + 2.0, y - 4.0);
 		nodes.add(orM1);
 
-		VisualSignalTransition orMRfw = stg.createSignalTransition(nameOrM + name, type, SignalTransition.Direction.PLUS, curContainer);
+		VisualSignalTransition orMRfw = getStgModel().createSignalTransition(nameOrM + name, type, SignalTransition.Direction.PLUS, curContainer);
 		orMRfw.setTokenColorGenerator(presetTokenColorGenerator);
 		createConsumingArc(orM0, orMRfw, false);
 		createProducingArc(orMRfw, orM1, true);
 		setPosition(orMRfw, x - 2.0, y - 2.5);
 		nodes.add(orMRfw);
 
-		VisualSignalTransition orMRbw = stg.createSignalTransition(nameOrM + name, type, SignalTransition.Direction.PLUS, curContainer);
+		VisualSignalTransition orMRbw = getStgModel().createSignalTransition(nameOrM + name, type, SignalTransition.Direction.PLUS, curContainer);
 		orMRbw.setTokenColorGenerator(postsetTokenColorGenerator);
 		createConsumingArc(orM0, orMRbw, false);
 		createProducingArc(orMRbw, orM1, true);
 		setPosition(orMRbw, x - 2.0, y - 1.5);
 		nodes.add(orMRbw);
 
-		VisualSignalTransition orMFfw = stg.createSignalTransition(nameOrM + name, type, SignalTransition.Direction.MINUS, curContainer);
+		VisualSignalTransition orMFfw = getStgModel().createSignalTransition(nameOrM + name, type, SignalTransition.Direction.MINUS, curContainer);
 		createConsumingArc(orM1, orMFfw, false);
 		createProducingArc(orMFfw, orM0, false);
 		setPosition(orMFfw, x - 2.0, y - 4.5);
 		nodes.add(orMFfw);
 
-		VisualSignalTransition orMFbw = stg.createSignalTransition(nameOrM + name, type, SignalTransition.Direction.MINUS, curContainer);
+		VisualSignalTransition orMFbw = getStgModel().createSignalTransition(nameOrM + name, type, SignalTransition.Direction.MINUS, curContainer);
 		createConsumingArc(orM1, orMFbw, false);
 		createProducingArc(orMFbw, orM0, false);
 		setPosition(orMFbw, x - 2.0, y - 3.5);
 		nodes.add(orMFbw);
 
-		VisualPlace andM0 = stg.createPlace(nameAndM + name + name0, curContainer);
+		VisualPlace andM0 = getStgModel().createPlace(nameAndM + name + name0, curContainer);
 		andM0.setLabel(labelAndM + name + label0);
 		andM0.setLabelPositioning(Positioning.BOTTOM);
 		if (!r.getReferencedCounterflowRegister().isAndMarked()) {
@@ -648,7 +639,7 @@
 		setPosition(andM0, x + 2.0, y + 4.0);
 		nodes.add(andM0);
 
-		VisualPlace andM1 = stg.createPlace(nameAndM + name + name1, curContainer);
+		VisualPlace andM1 = getStgModel().createPlace(nameAndM + name + name1, curContainer);
 		andM1.setLabel(labelAndM + name + label1);
 		andM1.setLabelPositioning(Positioning.TOP);
 		if (r.getReferencedCounterflowRegister().isAndMarked()) {
@@ -659,34 +650,32 @@
 		setPosition(andM1, x + 2.0, y + 2.0);
 		nodes.add(andM1);
 
-		VisualSignalTransition andMR = stg.createSignalTransition(nameAndM + name, type, SignalTransition.Direction.PLUS, curContainer);
+		VisualSignalTransition andMR = getStgModel().createSignalTransition(nameAndM + name, type, SignalTransition.Direction.PLUS, curContainer);
 		createConsumingArc(andM0, andMR, false);
 		createProducingArc(andMR, andM1, false);
 		setPosition(andMR, x - 2.0, y + 4.0);
 		nodes.add(andMR);
 
-		VisualSignalTransition andMF = stg.createSignalTransition(nameAndM + name, type, SignalTransition.Direction.MINUS, curContainer);
+		VisualSignalTransition andMF = getStgModel().createSignalTransition(nameAndM + name, type, SignalTransition.Direction.MINUS, curContainer);
 		createConsumingArc(andM1, andMF, false);
 		createProducingArc(andMF, andM0, false);
 		setPosition(andMF, x - 2.0, y + 2.0);
 		nodes.add(andMF);
 
-		stg.select(nodes);
-		stg.groupSelection();
 		return new CounterflowRegisterStg(orM0, orM1, orMRfw, orMRbw, orMFfw, orMFbw, andM0, andM1, andMR, andMF);
 	}
 
 	private void connectCounterflowRegisterStg(VisualCounterflowRegister r) throws InvalidConnectionException {
 		CounterflowRegisterStg rstg = getCounterflowRegisterStg(r); 
 		
-        for (VisualRegister n: dfs.getPreset(r, VisualRegister.class)) {
+        for (VisualRegister n: getDfsModel().getPreset(r, VisualRegister.class)) {
             RegisterStg nstg = getRegisterStg(n);
             createReadArc(nstg.M1, rstg.orMRfw, true);
             createReadArc(nstg.M1, rstg.andMR, false);
             createReadArc(nstg.M0, rstg.orMFfw, false);
             createReadArc(nstg.M0, rstg.andMF, false);
         }
-        for (VisualRegister n: dfs.getPostset(r, VisualRegister.class)) {
+        for (VisualRegister n: getDfsModel().getPostset(r, VisualRegister.class)) {
             RegisterStg nstg = getRegisterStg(n);
             createReadArc(nstg.M1, rstg.orMRbw, true);
             createReadArc(nstg.M1, rstg.andMR, false);
@@ -694,14 +683,14 @@
             createReadArc(nstg.M0, rstg.andMF, false);
         }
 
-        for (VisualCounterflowLogic n: dfs.getPreset(r, VisualCounterflowLogic.class)) {
+        for (VisualCounterflowLogic n: getDfsModel().getPreset(r, VisualCounterflowLogic.class)) {
 			CounterflowLogicStg nstg = getCounterflowLogicStg(n);
 			createReadArc(nstg.fwC1, rstg.orMRfw, true);
 			createReadArc(nstg.fwC0, rstg.orMFfw, false);
 			createReadArc(nstg.fwC1, rstg.andMR, false);
 			createReadArc(nstg.fwC0, rstg.andMF, false);
 		}
-		for (VisualCounterflowLogic n: dfs.getPostset(r, VisualCounterflowLogic.class)) {
+		for (VisualCounterflowLogic n: getDfsModel().getPostset(r, VisualCounterflowLogic.class)) {
 			CounterflowLogicStg nstg = getCounterflowLogicStg(n);
 			createReadArc(nstg.bwC1, rstg.orMRbw, true);
 			createReadArc(nstg.bwC0, rstg.orMFbw, false);
@@ -709,12 +698,12 @@
 			createReadArc(nstg.bwC0, rstg.andMF, false);
 		}
 		
-		for (VisualCounterflowRegister n: dfs.getPreset(r, VisualCounterflowRegister.class)) {
+		for (VisualCounterflowRegister n: getDfsModel().getPreset(r, VisualCounterflowRegister.class)) {
 			CounterflowRegisterStg nstg = getCounterflowRegisterStg(n);
 			createReadArc(nstg.orM1, rstg.orMRfw, true);
 			createReadArc(nstg.orM0, rstg.orMFfw, false);
 		}
-		for (VisualCounterflowRegister n: dfs.getPostset(r, VisualCounterflowRegister.class)) {
+		for (VisualCounterflowRegister n: getDfsModel().getPostset(r, VisualCounterflowRegister.class)) {
 			CounterflowRegisterStg nstg = getCounterflowRegisterStg(n);
 			createReadArc(nstg.orM1, rstg.orMRbw, true);
 			createReadArc(nstg.orM0, rstg.orMFbw, false);
@@ -722,8 +711,8 @@
 		
 		Set<VisualCounterflowRegister> rSet = new HashSet<VisualCounterflowRegister>();
 		rSet.add(r);
-		rSet.addAll(dfs.getRPreset(r, VisualCounterflowRegister.class));
-		rSet.addAll(dfs.getRPostset(r, VisualCounterflowRegister.class)); 
+		rSet.addAll(getDfsModel().getRPreset(r, VisualCounterflowRegister.class));
+		rSet.addAll(getDfsModel().getRPostset(r, VisualCounterflowRegister.class)); 
 		for (VisualCounterflowRegister n: rSet) {
 			CounterflowRegisterStg nstg = getCounterflowRegisterStg(n);
 			createReadArc(nstg.orM1, rstg.andMR, true);
@@ -736,26 +725,34 @@
 	}
 	
 	public CounterflowRegisterStg getCounterflowRegisterStg(VisualCounterflowRegister register) {
-		return counterflowRegisterMap.get(register);
-	}
+		return ((counterflowRegisterMap == null) ? null: counterflowRegisterMap.get(register));
+	}
+	
+	public void putCounterflowRegisterStg(VisualCounterflowRegister register, CounterflowRegisterStg stg) {
+		if (counterflowRegisterMap == null) {
+			counterflowRegisterMap = new HashMap<>();
+		}
+		counterflowRegisterMap.put(register, stg);
+	}
+	
 
 	private BinaryRegisterStg generateBinaryRegisterSTG(VisualBinaryRegister r, 
 			boolean andSync, boolean orSync) throws InvalidConnectionException {
 		Collection<Node> nodes = new LinkedList<Node>();
-		String name = dfs.getName(r);
-		AffineTransform transform = TransformHelper.getTransformToRoot(r);
-		double x =	xScaling * (transform.getTranslateX() + r.getX());
-		double y =	yScaling * (transform.getTranslateY() + r.getY());
+		String name = getDfsModel().getName(r);
+		Point2D pos = getComponentPosition(r);
+		double x = pos.getX();
+		double y = pos.getY();
 		SignalTransition.Type type = SignalTransition.Type.INTERNAL;
-		if (dfs.getPreset(r, VisualControlRegister.class).size() == 0) {
+		if (getDfsModel().getPreset(r, VisualControlRegister.class).size() == 0) {
 			type = SignalTransition.Type.INPUT;
-		} else if (dfs.getPostset(r).size() == 0) {
+		} else if (getDfsModel().getPostset(r).size() == 0) {
 			type = SignalTransition.Type.OUTPUT;
 		}
-		ColorGenerator tokenColorGenerator = createColorGenerator(dfs.getPreset(r).size() == 0);
+		ColorGenerator tokenColorGenerator = createColorGenerator(getDfsModel().getPreset(r).size() == 0);
 		Container curContainer = null;
 
-		VisualPlace M0 = stg.createPlace(nameM + name + name0, curContainer);
+		VisualPlace M0 = getStgModel().createPlace(nameM + name + name0, curContainer);
 		M0.setLabel(labelM + name + label0);
 		M0.setLabelPositioning(Positioning.BOTTOM);
 		if (!r.getReferencedBinaryRegister().isTrueMarked() && !r.getReferencedBinaryRegister().isFalseMarked()) {
@@ -766,7 +763,7 @@
 		setPosition(M0, x - 4.0, y + 1.0);
 		nodes.add(M0);
 
-		VisualPlace M1 = stg.createPlace(nameM + name + name1, curContainer);
+		VisualPlace M1 = getStgModel().createPlace(nameM + name + name1, curContainer);
 		M1.setLabel(labelM + name + label1);
 		M1.setLabelPositioning(Positioning.TOP);
 		if (r.getReferencedBinaryRegister().isTrueMarked() || r.getReferencedBinaryRegister().isFalseMarked()) {
@@ -777,7 +774,7 @@
 		setPosition(M1, x - 4.0, y - 1.0);
 		nodes.add(M1);
 
-		VisualPlace tM0 = stg.createPlace(nameTrueM + name + name0, curContainer);
+		VisualPlace tM0 = getStgModel().createPlace(nameTrueM + name + name0, curContainer);
 		tM0.setLabel(labelTrueM + name + label0);
 		tM0.setLabelPositioning(Positioning.BOTTOM);
 		if (!r.getReferencedBinaryRegister().isTrueMarked()) {
@@ -788,7 +785,7 @@
 		setPosition(tM0, x + 4.0, y - 2.0);
 		nodes.add(tM0);
 
-		VisualPlace tM1 = stg.createPlace(nameTrueM + name + name1, curContainer);
+		VisualPlace tM1 = getStgModel().createPlace(nameTrueM + name + name1, curContainer);
 		tM1.setLabel(labelTrueM + name + label1);
 		tM1.setLabelPositioning(Positioning.TOP);
 		if (r.getReferencedBinaryRegister().isTrueMarked()) {
@@ -800,7 +797,7 @@
 		nodes.add(tM1);
 
 		Set<Node> preset = new HashSet<Node>();
-		preset.addAll(dfs.getRPreset(r, VisualControlRegister.class));
+		preset.addAll(getDfsModel().getRPreset(r, VisualControlRegister.class));
 		if (preset.size() == 0) {
 			preset.add(r);
 		}
@@ -810,7 +807,7 @@
 		double dy = 0.0;
 		for (Node n: preset) {
 			if (tMR == null || orSync) { 
-				tMR = stg.createSignalTransition(nameTrueM + name, type, SignalTransition.Direction.PLUS, curContainer);
+				tMR = getStgModel().createSignalTransition(nameTrueM + name, type, SignalTransition.Direction.PLUS, curContainer);
 				tMR.setTokenColorGenerator(tokenColorGenerator);
 				createConsumingArc(tM0, tMR, false);
 				createProducingArc(tMR, tM1, true);
@@ -822,7 +819,7 @@
 			tMRs.put(n, tMR);
 			dy += 1.0;
 		}
-		VisualSignalTransition tMF = stg.createSignalTransition(nameTrueM + name, type, SignalTransition.Direction.MINUS, curContainer);
+		VisualSignalTransition tMF = getStgModel().createSignalTransition(nameTrueM + name, type, SignalTransition.Direction.MINUS, curContainer);
 		createConsumingArc(tM1, tMF, false);
 		createProducingArc(tMF, tM0, false);
 		createConsumingArc(M1, tMF, false);
@@ -831,7 +828,7 @@
 		nodes.add(tMF);
 
 		
-		VisualPlace fM0 = stg.createPlace(nameFalseM + name + name0, curContainer);
+		VisualPlace fM0 = getStgModel().createPlace(nameFalseM + name + name0, curContainer);
 		fM0.setLabel(labelFalseM + name + label0);
 		fM0.setLabelPositioning(Positioning.BOTTOM);
 		if (!r.getReferencedBinaryRegister().isFalseMarked()) {
@@ -842,7 +839,7 @@
 		setPosition(fM0, x + 4.0, y + 4.0);
 		nodes.add(fM0);
 
-		VisualPlace fM1 = stg.createPlace(nameFalseM + name + name1, curContainer);
+		VisualPlace fM1 = getStgModel().createPlace(nameFalseM + name + name1, curContainer);
 		fM1.setLabel(labelFalseM + name + label1);
 		fM1.setLabelPositioning(Positioning.TOP);
 		if (r.getReferencedBinaryRegister().isFalseMarked()) {
@@ -858,7 +855,7 @@
 		dy = 0.0;
 		for (Node n: preset) {
 			if (fMR == null || andSync) { 
-				fMR = stg.createSignalTransition(nameFalseM + name, type, SignalTransition.Direction.PLUS, curContainer);
+				fMR = getStgModel().createSignalTransition(nameFalseM + name, type, SignalTransition.Direction.PLUS, curContainer);
 				fMR.setTokenColorGenerator(tokenColorGenerator);
 				createConsumingArc(fM0, fMR, false);
 				createProducingArc(fMR, fM1, true);
@@ -870,7 +867,7 @@
 			fMRs.put(n, fMR);
 			dy += 1.0;
 		}
-		VisualSignalTransition fMF = stg.createSignalTransition(nameFalseM + name, type, SignalTransition.Direction.MINUS, curContainer);
+		VisualSignalTransition fMF = getStgModel().createSignalTransition(nameFalseM + name, type, SignalTransition.Direction.MINUS, curContainer);
 		createConsumingArc(fM1, fMF, false);
 		createProducingArc(fMF, fM0, false);
 		createConsumingArc(M1, fMF, false);
@@ -882,8 +879,6 @@
 		createReadArcs(tM0, fMRs.values(), false);
 		createReadArcs(fM0, tMRs.values(), false);
 
-		stg.select(nodes);
-		stg.groupSelection();
 		return new BinaryRegisterStg(M0, M1, tM0, tM1, tMRs, tMF, fM0, fM1, fMRs, fMF);
 	}
 
@@ -896,7 +891,7 @@
 	private void connectControlRegisterStg(VisualControlRegister r) throws InvalidConnectionException {
 		BinaryRegisterStg rstg = getControlRegisterStg(r);
 		// preset
-		for (VisualLogic n: dfs.getPreset(r, VisualLogic.class)) {
+		for (VisualLogic n: getDfsModel().getPreset(r, VisualLogic.class)) {
 			LogicStg nstg = getLogicStg(n);
 			createReadArcs(nstg.C1, rstg.tMRs.values(), true);
 			createReadArcs(nstg.C1, rstg.fMRs.values(), true);
@@ -904,17 +899,17 @@
 			createReadArc(nstg.C0, rstg.fMF, false);
 		}
 		// R-preset
-		for (VisualRegister n: dfs.getRPreset(r, VisualRegister.class)) {
+		for (VisualRegister n: getDfsModel().getRPreset(r, VisualRegister.class)) {
 			RegisterStg nstg = getRegisterStg(n);
 			createReadArcs(nstg.M1, rstg.tMRs.values(), true);
 			createReadArcs(nstg.M1, rstg.fMRs.values(), true);
 			createReadArc(nstg.M0, rstg.tMF, false);
 			createReadArc(nstg.M0, rstg.fMF, false);
 		}
-		Collection<VisualControlRegister> crPreset = dfs.getRPreset(r, VisualControlRegister.class);
+		Collection<VisualControlRegister> crPreset = getDfsModel().getRPreset(r, VisualControlRegister.class);
 		for (VisualControlRegister n: crPreset) {
 			BinaryRegisterStg nstg = getControlRegisterStg(n);
-			Connection connection = dfs.getConnection(n, r);
+			Connection connection = getDfsModel().getConnection(n, r);
 			if (connection instanceof VisualControlConnection && ((VisualControlConnection)connection).getReferencedControlConnection().isInverting()) {
 				createReadArc(nstg.tM1, rstg.fMRs.get(n), true);
 				createReadArc(nstg.fM1, rstg.tMRs.get(n), true);
@@ -937,14 +932,14 @@
 			createReadArc(nstg.M0, rstg.tMF, false);
 			createReadArc(nstg.M0, rstg.fMF, false);
 		}
-		for (VisualPushRegister n: dfs.getRPreset(r, VisualPushRegister.class)) {
+		for (VisualPushRegister n: getDfsModel().getRPreset(r, VisualPushRegister.class)) {
 			BinaryRegisterStg nstg = getPushRegisterStg(n);
 			createReadArcs(nstg.tM1, rstg.tMRs.values(), true);
 			createReadArcs(nstg.tM1, rstg.fMRs.values(), true);
 			createReadArc(nstg.tM0, rstg.tMF, false);
 			createReadArc(nstg.tM0, rstg.fMF, false);
 		}
-		for (VisualPopRegister n: dfs.getRPreset(r, VisualPopRegister.class)) {
+		for (VisualPopRegister n: getDfsModel().getRPreset(r, VisualPopRegister.class)) {
 			BinaryRegisterStg nstg = getPopRegisterStg(n);
 			createReadArcs(nstg.M1, rstg.tMRs.values(), true);
 			createReadArcs(nstg.M1, rstg.fMRs.values(), true);
@@ -952,23 +947,23 @@
 			createReadArc(nstg.M0, rstg.fMF, false);
 		}
 		// R-postset
-		for (VisualRegister n: dfs.getRPostset(r, VisualRegister.class)) {
+		for (VisualRegister n: getDfsModel().getRPostset(r, VisualRegister.class)) {
 			RegisterStg nstg = getRegisterStg(n);
 			createReadArc(nstg.M1, rstg.tMF, false); 
 			createReadArc(nstg.M1, rstg.fMF, false); 
 			createReadArcs(nstg.M0, rstg.tMRs.values(), false);
 			createReadArcs(nstg.M0, rstg.fMRs.values(), false);
 		}
-		for (VisualControlRegister n: dfs.getRPostset(r, VisualControlRegister.class)) {
+		for (VisualControlRegister n: getDfsModel().getRPostset(r, VisualControlRegister.class)) {
 			BinaryRegisterStg nstg = getControlRegisterStg(n);
 			createReadArc(nstg.M1, rstg.tMF, false);
 			createReadArc(nstg.M1, rstg.fMF, false);
 			createReadArcs(nstg.M0, rstg.tMRs.values(), false);
 			createReadArcs(nstg.M0, rstg.fMRs.values(), false);
 		}
-		for (VisualPushRegister n: dfs.getRPostset(r, VisualPushRegister.class)) {
+		for (VisualPushRegister n: getDfsModel().getRPostset(r, VisualPushRegister.class)) {
 			BinaryRegisterStg nstg = getPushRegisterStg(n);
-			Connection connection = dfs.getConnection(r, n);
+			Connection connection = getDfsModel().getConnection(r, n);
 			if (connection instanceof VisualControlConnection && ((VisualControlConnection)connection).getReferencedControlConnection().isInverting()) {
 				createReadArc(nstg.tM1, rstg.fMF, false); 
 				createReadArc(nstg.fM1, rstg.tMF, false);
@@ -979,9 +974,9 @@
 			createReadArcs(nstg.M0, rstg.tMRs.values(), false);
 			createReadArcs(nstg.M0, rstg.fMRs.values(), false);
 		}
-		for (VisualPopRegister n: dfs.getRPostset(r, VisualPopRegister.class)) {
+		for (VisualPopRegister n: getDfsModel().getRPostset(r, VisualPopRegister.class)) {
 			BinaryRegisterStg nstg = getPopRegisterStg(n);
-			Connection connection = dfs.getConnection(r, n);
+			Connection connection = getDfsModel().getConnection(r, n);
 			if (connection instanceof VisualControlConnection && ((VisualControlConnection)connection).getReferencedControlConnection().isInverting()) {
 				createReadArc(nstg.tM1, rstg.fMF, false); 
 				createReadArc(nstg.fM1, rstg.tMF, false);
@@ -995,8 +990,16 @@
 	}
 	
 	public BinaryRegisterStg getControlRegisterStg(VisualControlRegister register) {
-		return controlRegisterMap.get(register);
-	}
+		return ((controlRegisterMap == null) ? null : controlRegisterMap.get(register));
+	}
+	
+	public void putControlRegisterStg(VisualControlRegister register, BinaryRegisterStg stg) {
+		if (controlRegisterMap == null) {
+			controlRegisterMap = new HashMap<>();
+		}
+		controlRegisterMap.put(register, stg);
+	}
+
 
 	private BinaryRegisterStg generatePushRegisterStg(VisualPushRegister r) throws InvalidConnectionException {
 		return generateBinaryRegisterSTG(r, false, false);
@@ -1005,7 +1008,7 @@
 	private void connectPushRegisterStg(VisualPushRegister r) throws InvalidConnectionException {
 		BinaryRegisterStg rstg = getPushRegisterStg(r);
 		// preset
-		for (VisualLogic n: dfs.getPreset(r, VisualLogic.class)) {
+		for (VisualLogic n: getDfsModel().getPreset(r, VisualLogic.class)) {
 			LogicStg nstg = getLogicStg(n);
 			createReadArcs(nstg.C1, rstg.tMRs.values(), true);
 			createReadArcs(nstg.C1, rstg.fMRs.values(), true);
@@ -1013,16 +1016,16 @@
 			createReadArc(nstg.C0, rstg.fMF, false);
 		}
 		// R-preset
-		for (VisualRegister n: dfs.getRPreset(r, VisualRegister.class)) {
+		for (VisualRegister n: getDfsModel().getRPreset(r, VisualRegister.class)) {
 			RegisterStg nstg = getRegisterStg(n);
 			createReadArcs(nstg.M1, rstg.tMRs.values(), true);
 			createReadArcs(nstg.M1, rstg.fMRs.values(), true);
 			createReadArc(nstg.M0, rstg.tMF, false);
 			createReadArc(nstg.M0, rstg.fMF, false);
 		}
-		for (VisualControlRegister n: dfs.getRPreset(r, VisualControlRegister.class)) {
+		for (VisualControlRegister n: getDfsModel().getRPreset(r, VisualControlRegister.class)) {
 			BinaryRegisterStg nstg = getControlRegisterStg(n);
-			Connection connection = dfs.getConnection(n, r);
+			Connection connection = getDfsModel().getConnection(n, r);
 			if (connection instanceof VisualControlConnection && ((VisualControlConnection)connection).getReferencedControlConnection().isInverting()) {
 				createReadArc(nstg.tM1, rstg.fMRs.get(n), true);
 				createReadArc(nstg.fM1, rstg.tMRs.get(n), true);
@@ -1035,14 +1038,14 @@
 				createReadArc(nstg.fM0, rstg.fMF, false);
 			}
 		}
-		for (VisualPushRegister n: dfs.getRPreset(r, VisualPushRegister.class)) {
+		for (VisualPushRegister n: getDfsModel().getRPreset(r, VisualPushRegister.class)) {
 			BinaryRegisterStg nstg = getPushRegisterStg(n);
 			createReadArcs(nstg.tM1, rstg.tMRs.values(), true);
 			createReadArcs(nstg.tM1, rstg.fMRs.values(), true);
 			createReadArc(nstg.tM0, rstg.tMF, false);
 			createReadArc(nstg.tM0, rstg.fMF, false);
 		}
-		for (VisualPopRegister n: dfs.getRPreset(r, VisualPopRegister.class)) {
+		for (VisualPopRegister n: getDfsModel().getRPreset(r, VisualPopRegister.class)) {
 			BinaryRegisterStg nstg = getPopRegisterStg(n);
 			createReadArcs(nstg.M1, rstg.tMRs.values(), true);
 			createReadArcs(nstg.M1, rstg.fMRs.values(), true);
@@ -1050,22 +1053,22 @@
 			createReadArc(nstg.M0, rstg.fMF, false);
 		}
 		// R-postset
-		for (VisualRegister n: dfs.getRPostset(r, VisualRegister.class)) {
+		for (VisualRegister n: getDfsModel().getRPostset(r, VisualRegister.class)) {
 			RegisterStg nstg = getRegisterStg(n);
 			createReadArc(nstg.M1, rstg.tMF, false); // register M1 in R-postset is read only by tMF
 			createReadArcs(nstg.M0, rstg.tMRs.values(), false); // register M0 in R-postset is read only by tMR
 		}
-		for (VisualControlRegister n: dfs.getRPostset(r, VisualControlRegister.class)) {
+		for (VisualControlRegister n: getDfsModel().getRPostset(r, VisualControlRegister.class)) {
 			BinaryRegisterStg nstg = getControlRegisterStg(n);
 			createReadArc(nstg.M1, rstg.tMF, false);
 			createReadArcs(nstg.M0, rstg.tMRs.values(), false);
 		}
-		for (VisualPushRegister n: dfs.getRPostset(r, VisualPushRegister.class)) {
+		for (VisualPushRegister n: getDfsModel().getRPostset(r, VisualPushRegister.class)) {
 			BinaryRegisterStg nstg = getPushRegisterStg(n);
 			createReadArc(nstg.M1, rstg.tMF, false);
 			createReadArcs(nstg.M0, rstg.tMRs.values(), false);
 		}
-		for (VisualPopRegister n: dfs.getRPostset(r, VisualPopRegister.class)) {
+		for (VisualPopRegister n: getDfsModel().getRPostset(r, VisualPopRegister.class)) {
 			BinaryRegisterStg nstg = getPopRegisterStg(n);
 			createReadArc(nstg.tM1, rstg.tMF, false); // pop tM1 in R-postset is read only by tMF
 			createReadArcs(nstg.tM0, rstg.tMRs.values(), false); // pop tM0 in R-postset is read only by tMR
@@ -1073,7 +1076,14 @@
 	}
 	
 	public BinaryRegisterStg getPushRegisterStg(VisualPushRegister register) {
-		return pushRegisterMap.get(register);
+		return ((pushRegisterMap == null) ? null : pushRegisterMap.get(register));
+	}
+	
+	public void putPushRegisterStg(VisualPushRegister register, BinaryRegisterStg stg) {
+		if (pushRegisterMap == null) {
+			pushRegisterMap = new HashMap<>();
+		}
+		pushRegisterMap.put(register, stg);
 	}
 
 
@@ -1084,20 +1094,20 @@
 	private void connectPopRegisterStg(VisualPopRegister r) throws InvalidConnectionException {
 		BinaryRegisterStg rstg = getPopRegisterStg(r);
 		// preset
-		for (VisualLogic n: dfs.getPreset(r, VisualLogic.class)) {
+		for (VisualLogic n: getDfsModel().getPreset(r, VisualLogic.class)) {
 			LogicStg nstg = getLogicStg(n);
 			createReadArcs(nstg.C1, rstg.tMRs.values(), true);
 			createReadArc(nstg.C0, rstg.tMF, false);
 		}
 		// R-preset
-		for (VisualRegister n: dfs.getRPreset(r, VisualRegister.class)) {
+		for (VisualRegister n: getDfsModel().getRPreset(r, VisualRegister.class)) {
 			RegisterStg nstg = getRegisterStg(n);
 			createReadArcs(nstg.M1, rstg.tMRs.values(), true);
 			createReadArc(nstg.M0, rstg.tMF, false);
 		}
-		for (VisualControlRegister n: dfs.getRPreset(r, VisualControlRegister.class)) {
+		for (VisualControlRegister n: getDfsModel().getRPreset(r, VisualControlRegister.class)) {
 			BinaryRegisterStg nstg = getControlRegisterStg(n);
-			Connection connection = dfs.getConnection(n, r);
+			Connection connection = getDfsModel().getConnection(n, r);
 			if (connection instanceof VisualControlConnection && ((VisualControlConnection)connection).getReferencedControlConnection().isInverting()) {
 				createReadArc(nstg.tM1, rstg.fMRs.get(n), true);
 				createReadArc(nstg.fM1, rstg.tMRs.get(n), true);
@@ -1110,39 +1120,39 @@
 				createReadArc(nstg.fM0, rstg.fMF, false);
 			}
 		}
-		for (VisualPushRegister n: dfs.getRPreset(r, VisualPushRegister.class)) {
+		for (VisualPushRegister n: getDfsModel().getRPreset(r, VisualPushRegister.class)) {
 			BinaryRegisterStg nstg = getPushRegisterStg(n);
 			createReadArcs(nstg.tM1, rstg.tMRs.values(), true);
 			createReadArc(nstg.tM0, rstg.tMF, false);
 		}
-		for (VisualPopRegister n: dfs.getRPreset(r, VisualPopRegister.class)) {
+		for (VisualPopRegister n: getDfsModel().getRPreset(r, VisualPopRegister.class)) {
 			BinaryRegisterStg nstg = getPopRegisterStg(n);
 			createReadArcs(nstg.M1, rstg.tMRs.values(), true);
 			createReadArc(nstg.M0, rstg.tMF, false);
 		}
 		// R-postset
-		for (VisualRegister n: dfs.getRPostset(r, VisualRegister.class)) {
+		for (VisualRegister n: getDfsModel().getRPostset(r, VisualRegister.class)) {
 			RegisterStg nstg = getRegisterStg(n);
 			createReadArc(nstg.M1, rstg.tMF, false);
 			createReadArc(nstg.M1, rstg.fMF, false);
 			createReadArcs(nstg.M0, rstg.tMRs.values(), false);
 			createReadArcs(nstg.M0, rstg.fMRs.values(), false);
 		}
-		for (VisualControlRegister n: dfs.getRPostset(r, VisualControlRegister.class)) {
+		for (VisualControlRegister n: getDfsModel().getRPostset(r, VisualControlRegister.class)) {
 			BinaryRegisterStg nstg = getControlRegisterStg(n);
 			createReadArc(nstg.M1, rstg.tMF, false);
 			createReadArc(nstg.M1, rstg.fMF, false);
 			createReadArcs(nstg.M0, rstg.tMRs.values(), false);
 			createReadArcs(nstg.M0, rstg.fMRs.values(), false);
 		}
-		for (VisualPushRegister n: dfs.getRPostset(r, VisualPushRegister.class)) {
+		for (VisualPushRegister n: getDfsModel().getRPostset(r, VisualPushRegister.class)) {
 			BinaryRegisterStg nstg = getPushRegisterStg(n);
 			createReadArc(nstg.M1, rstg.tMF, false);
 			createReadArc(nstg.M1, rstg.fMF, false);
 			createReadArcs(nstg.M0, rstg.tMRs.values(), false);
 			createReadArcs(nstg.M0, rstg.fMRs.values(), false);
 		}
-		for (VisualPopRegister n: dfs.getRPostset(r, VisualPopRegister.class)) {
+		for (VisualPopRegister n: getDfsModel().getRPostset(r, VisualPopRegister.class)) {
 			BinaryRegisterStg nstg = getPopRegisterStg(n);
 			createReadArc(nstg.tM1, rstg.tMF, false);
 			createReadArc(nstg.tM1, rstg.fMF, false);
@@ -1152,8 +1162,16 @@
 	}
 
 	public BinaryRegisterStg getPopRegisterStg(VisualPopRegister register) {
-		return popRegisterMap.get(register);
-	}
+		return ((popRegisterMap == null) ? null : popRegisterMap.get(register));
+	}
+
+	public void putPopRegisterStg(VisualPopRegister register, BinaryRegisterStg stg) {
+		if (popRegisterMap == null) {
+			popRegisterMap = new HashMap<>();
+		}
+		popRegisterMap.put(register, stg);
+	}
+	
 
 	public boolean isRelated(Node highLevelNode, Node node) {
 		NodeStg nodeStg = null;

=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowDeadlockTask.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowDeadlockTask.java	2015-04-30 23:14:48 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowDeadlockTask.java	2015-09-25 14:54:20 +0000
@@ -43,7 +43,7 @@
 		final Framework framework = Framework.getInstance();
 		try {
 			StgGenerator generator = new StgGenerator((VisualDfs)we.getModelEntry().getVisualModel());
-			STGModel model = (STGModel)generator.getStg().getMathModel(); 
+			STGModel model = (STGModel)generator.getStgModel().getMathModel(); 
 			Exporter exporter = Export.chooseBestExporter(framework.getPluginManager(), model, Format.STG);
 			if (exporter == null) {
 				throw new RuntimeException ("Exporter not available: model class " + model.getClass().getName() + " to format STG.");

=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowHazardTask.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowHazardTask.java	2015-04-30 23:14:48 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowHazardTask.java	2015-09-25 14:54:20 +0000
@@ -43,7 +43,7 @@
 		final Framework framework = Framework.getInstance();
 		try {
 			StgGenerator generator = new StgGenerator((VisualDfs)we.getModelEntry().getVisualModel());
-			STGModel model = (STGModel)generator.getStg().getMathModel(); 
+			STGModel model = (STGModel)generator.getStgModel().getMathModel(); 
 			Exporter exporter = Export.chooseBestExporter(framework.getPluginManager(), model, Format.STG);
 			if (exporter == null) {
 				throw new RuntimeException ("Exporter not available: model class " + model.getClass().getName() + " to format STG.");

=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowTask.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowTask.java	2015-04-30 23:14:48 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowTask.java	2015-09-25 14:54:20 +0000
@@ -48,7 +48,7 @@
 		final Framework framework = Framework.getInstance();
 		try {
 			StgGenerator generator = new StgGenerator((VisualDfs)we.getModelEntry().getVisualModel());
-			STGModel model = (STGModel)generator.getStg().getMathModel(); 
+			STGModel model = (STGModel)generator.getStgModel().getMathModel(); 
 			Exporter exporter = Export.chooseBestExporter(framework.getPluginManager(), model, Format.STG);
 			if (exporter == null) {
 				throw new RuntimeException ("Exporter not available: model class " + model.getClass().getName() + " to format STG.");

=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/tools/DfsSimulationTool.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/tools/DfsSimulationTool.java	2015-08-27 21:29:15 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/tools/DfsSimulationTool.java	2015-09-25 14:54:20 +0000
@@ -64,7 +64,7 @@
 	@Override
 	public VisualModel getUnderlyingModel(VisualModel model) {
 		generator = new StgGenerator((VisualDfs)model);
-		return generator.getStg();
+		return generator.getStgModel();
 	}
 	
 	private VisualPlace getVisualPlace(Place place) {

=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/tools/StgGeneratorTool.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/tools/StgGeneratorTool.java	2015-07-30 15:45:39 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/tools/StgGeneratorTool.java	2015-09-25 14:54:20 +0000
@@ -37,7 +37,7 @@
 		final Workspace workspace = framework.getWorkspace();
 		final Path<String> directory = we.getWorkspacePath().getParent();
 		final String desiredName = we.getWorkspacePath().getNode();
-		final ModelEntry me = new ModelEntry(new StgDescriptor(), generator.getStg());
+		final ModelEntry me = new ModelEntry(new StgDescriptor(), generator.getStgModel());
 		boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
 		workspace.add(directory, desiredName, me, false, openInEditor);
 	}

=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatTask.java'
--- MpsatPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatTask.java	2015-08-03 12:45:13 +0000
+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatTask.java	2015-09-25 14:54:20 +0000
@@ -34,7 +34,7 @@
 	
 	@Override
 	public Result<? extends ExternalProcessResult> run(ProgressMonitor<? super ExternalProcessResult> monitor) {
-		ArrayList<String> command = new ArrayList<String>();
+		ArrayList<String> command = new ArrayList<>();
 		// Name of the executable
 		command.add(MpsatUtilitySettings.getCommand() + MpsatUtilitySettings.getCommandSuffix(tryPnml));
 		// Built-in arguments

=== modified file 'PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetSimulationTool.java'
--- PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetSimulationTool.java	2015-09-10 22:34:47 +0000
+++ PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetSimulationTool.java	2015-09-25 14:54:20 +0000
@@ -48,6 +48,7 @@
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JScrollBar;
 import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.JSlider;
@@ -70,6 +71,7 @@
 import org.workcraft.dom.visual.HitMan;
 import org.workcraft.dom.visual.VisualGroup;
 import org.workcraft.dom.visual.VisualModel;
+import org.workcraft.dom.visual.VisualNode;
 import org.workcraft.dom.visual.VisualPage;
 import org.workcraft.dom.visual.connections.VisualConnection;
 import org.workcraft.gui.Coloriser;
@@ -88,6 +90,7 @@
 import org.workcraft.plugins.petri.Transition;
 import org.workcraft.plugins.petri.VisualPetriNet;
 import org.workcraft.plugins.petri.VisualPlace;
+import org.workcraft.plugins.petri.VisualReplicaPlace;
 import org.workcraft.plugins.petri.VisualTransition;
 import org.workcraft.plugins.shared.CommonSimulationSettings;
 import org.workcraft.util.ColorGenerator;
@@ -213,6 +216,7 @@
 					timer.start();
 				}
 				updateState(editor);
+				editor.requestFocus();
 			}
 		});
 		
@@ -236,6 +240,7 @@
 					random = true;
 				}
 				updateState(editor);
+				editor.requestFocus();
 			}
 		});
 
@@ -259,6 +264,7 @@
 					random = false;
 				}
 				updateState(editor);
+				editor.requestFocus();
 			}
 		});
 
@@ -266,6 +272,7 @@
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				clearTraces(editor);
+				editor.requestFocus();
 			}
 		});
 		
@@ -273,6 +280,7 @@
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				stepBack(editor);
+				editor.requestFocus();
 			}
 		});
 		
@@ -280,6 +288,7 @@
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				step(editor);
+				editor.requestFocus();
 			}
 		});
 		
@@ -287,6 +296,7 @@
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				copyState(editor);
+				editor.requestFocus();
 			}
 		});
 		
@@ -294,6 +304,7 @@
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				pasteState(editor);
+				editor.requestFocus();
 			}
 		});
 		
@@ -301,6 +312,7 @@
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				mergeTrace(editor);
+				editor.requestFocus();
 			}
 		});
 		
@@ -308,6 +320,7 @@
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				saveInitState(editor);
+				editor.requestFocus();
 			}
 		});
 		
@@ -341,6 +354,7 @@
 					}
 				}
 				updateState(editor);
+				editor.requestFocus();
 			}
 
 			@Override
@@ -432,9 +446,13 @@
 		backwardButton.setEnabled((mainTrace.getPosition() > 0) || (branchTrace.getPosition() > 0));
 		forwardButton.setEnabled(branchTrace.canProgress() || (branchTrace.isEmpty() && mainTrace.canProgress()));
 		traceTable.tableChanged(new TableModelEvent(traceTable.getModel()));
-		editor.requestFocus();
 		editor.repaint();
 	}
+	
+	public void scrollTraceToBottom() {
+		JScrollBar verticalScrollBar = tracePane.getVerticalScrollBar();
+		verticalScrollBar.setValue(verticalScrollBar.getMaximum());
+	}
 
 	private boolean quietStepBack() {
 		excitedContainers.clear();
@@ -786,11 +804,11 @@
 		if (t == null) return;
 		
 		String transitionId = null;
-		// if clicked on the trace event, do the step forward
+		// If clicked on the trace event, do the step forward.
 		if (branchTrace.isEmpty() && !mainTrace.isEmpty() && (mainTrace.getPosition() < mainTrace.size())) {
 			transitionId = mainTrace.get(mainTrace.getPosition());
 		}
-		// otherwise form/use the branch trace
+		// Otherwise form/use the branch trace.
 		if (!branchTrace.isEmpty() && (branchTrace.getPosition() < branchTrace.size())) {
 			transitionId = branchTrace.get(branchTrace.getPosition());
 		}
@@ -806,7 +824,7 @@
 		}
 		branchTrace.add(net.getNodeReference(t));
 		step(editor);
-		return;
+		scrollTraceToBottom();
 	}
 	
 	@Override
@@ -897,7 +915,7 @@
 			@Override
 			public Decoration getDecoration(Node node) {
 				
-				if(node instanceof VisualTransition) {
+				if (node instanceof VisualTransition) {
 					Transition transition = ((VisualTransition)node).getReferencedTransition();
 					Node currentTraceTransition = getTraceCurrentNode();
 					if (transition == currentTraceTransition) {
@@ -927,7 +945,7 @@
 					}
 				}
 				
-				if (node instanceof VisualPage || node instanceof VisualGroup) {
+				if ((node instanceof VisualPage) || (node instanceof VisualGroup)) {
 					final boolean ret = isContainerExcited((Container)node);
 					return new ContainerDecoration() {
 
@@ -947,12 +965,40 @@
 						}
 					};
 				}
+
+				if (node instanceof VisualConnection) {
+					if (isArcExcited((VisualConnection)node)) { 
+						return new Decoration() {
+	
+							@Override
+							public Color getColorisation() {
+								return CommonSimulationSettings.getEnabledForegroundColor();
+							}
+							
+							@Override
+							public Color getBackground() {
+								return CommonSimulationSettings.getEnabledBackgroundColor();
+							}
+						};
+					}
+				}
 				
 				return null;
 			}
 		};
 	}
 
+	private boolean isArcExcited(VisualConnection connection) {
+		VisualNode first = connection.getFirst();
+		Place place = null;
+		if (first instanceof VisualPlace) {
+			place = ((VisualPlace)first).getReferencedPlace();
+		} else if (first instanceof VisualReplicaPlace) {
+			place = ((VisualReplicaPlace)first).getReferencedPlace();
+		}
+		return ((place != null) && (place.getTokens() > 0));
+	}
+
 	@Override
 	public void lostOwnership(Clipboard clip, Transferable arg) {
 	}

=== modified file 'SONPlugin/src/org/workcraft/plugins/son/tools/SONSimulationTool.java'
--- SONPlugin/src/org/workcraft/plugins/son/tools/SONSimulationTool.java	2015-09-14 20:30:27 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/tools/SONSimulationTool.java	2015-09-25 14:54:20 +0000
@@ -215,6 +215,7 @@
 					timer = null;
 				} 
 				updateState(editor);
+				editor.requestFocus();
 			}
 		});
 
@@ -248,6 +249,7 @@
 				setDecoration(simuAlg.getEnabledNodes(sync, phases, isRev));
 				excitedContainers.clear();
 				updateState(editor);
+				editor.requestFocus();
 			}
 		});
 		
@@ -320,6 +322,7 @@
 					}
 				}
 				updateState(editor);
+				editor.requestFocus();
 			}
 
 			@Override
@@ -360,6 +363,7 @@
 			net.resetConditionErrStates();
 		}	
 		updateState(editor);	
+		editor.requestFocus();
 		editor.forceRedraw();
 		editor.getModel().setTemplateNode(null);
 	}
@@ -418,8 +422,6 @@
 			reverseButton.setIcon(GUI.createIconFromSVG("images/icons/svg/son-reverse-simulation.svg"));
 			reverseButton.setToolTipText("Switch to forward simulation");
 		}
-		
-		editor.requestFocus();	
 		editor.repaint();
 	}
 	

=== added directory 'STGPlugin/src/org/workcraft/plugins/stg/generator'
=== added file 'STGPlugin/src/org/workcraft/plugins/stg/generator/NodeStg.java'
--- STGPlugin/src/org/workcraft/plugins/stg/generator/NodeStg.java	1970-01-01 00:00:00 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/generator/NodeStg.java	2015-09-25 14:54:20 +0000
@@ -0,0 +1,38 @@
+package org.workcraft.plugins.stg.generator;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.workcraft.dom.Node;
+import org.workcraft.plugins.petri.VisualPlace;
+import org.workcraft.plugins.stg.VisualSignalTransition;
+
+public abstract class NodeStg {
+	public abstract Collection<VisualSignalTransition> getAllTransitions();
+	
+	public abstract Collection<VisualPlace> getAllPlaces();
+
+	public Collection<Node> getAllNodes() {
+		HashSet<Node> result = new HashSet<>();
+		result.addAll(getAllPlaces());
+		result.addAll(getAllTransitions());
+		return result;
+	}
+
+	public boolean contains(Node n) {
+		if (n != null) {
+			for (VisualPlace p: getAllPlaces()) {
+				if ((n == p) || ((p != null) && (n == p.getReferencedPlace()))) {
+					return true;
+				}
+			}
+			for (VisualSignalTransition t: getAllTransitions()) {
+				if ((n == t) || ((t != null) && (n == t.getReferencedTransition()))) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+}

=== added file 'STGPlugin/src/org/workcraft/plugins/stg/generator/SignalStg.java'
--- STGPlugin/src/org/workcraft/plugins/stg/generator/SignalStg.java	1970-01-01 00:00:00 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/generator/SignalStg.java	2015-09-25 14:54:20 +0000
@@ -0,0 +1,52 @@
+package org.workcraft.plugins.stg.generator;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
+import org.workcraft.plugins.petri.VisualPlace;
+import org.workcraft.plugins.stg.VisualSignalTransition;
+
+public class SignalStg extends NodeStg {
+	public final VisualPlace zero;
+	public final VisualPlace one;
+	public final ArrayList<VisualSignalTransition> fallList = new ArrayList<>();
+	public final ArrayList<VisualSignalTransition> riseList = new ArrayList<>();
+
+	public SignalStg(VisualPlace zero, VisualPlace one) {
+		this.zero = zero;
+		this.one = one;
+	}
+	
+	public SignalStg(VisualPlace zero, VisualPlace one, VisualSignalTransition fall, VisualSignalTransition rise) {
+		this.zero = zero;
+		this.one = one;
+		this.fallList.add(fall);
+		this.riseList.add(rise);
+	}
+
+	public SignalStg(VisualPlace zero, VisualPlace one, ArrayList<VisualSignalTransition> fallList, ArrayList<VisualSignalTransition> riseList) {
+		this.zero = zero;
+		this.one = one;
+		this.fallList.addAll(fallList);
+		this.riseList.addAll(riseList);
+	}
+
+	@Override
+	public Collection<VisualSignalTransition> getAllTransitions() {
+		HashSet<VisualSignalTransition> tmp = new HashSet<>();
+		tmp.addAll(fallList);
+		tmp.addAll(riseList);
+		List<VisualSignalTransition> result = new ArrayList<>();
+		result.addAll(tmp);
+		return result;
+	}
+
+	@Override
+	public Collection<VisualPlace> getAllPlaces() {
+		return Arrays.asList(zero, one);
+	}
+
+}

=== added file 'STGPlugin/src/org/workcraft/plugins/stg/generator/StgGenerator.java'
--- STGPlugin/src/org/workcraft/plugins/stg/generator/StgGenerator.java	1970-01-01 00:00:00 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/generator/StgGenerator.java	2015-09-25 14:54:20 +0000
@@ -0,0 +1,294 @@
+package org.workcraft.plugins.stg.generator;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
+import org.workcraft.dom.Container;
+import org.workcraft.dom.Node;
+import org.workcraft.dom.visual.Movable;
+import org.workcraft.dom.visual.Positioning;
+import org.workcraft.dom.visual.TransformHelper;
+import org.workcraft.dom.visual.VisualComponent;
+import org.workcraft.dom.visual.VisualModel;
+import org.workcraft.dom.visual.connections.VisualConnection;
+import org.workcraft.exceptions.InvalidConnectionException;
+import org.workcraft.plugins.petri.VisualPlace;
+import org.workcraft.plugins.petri.VisualReplicaPlace;
+import org.workcraft.plugins.stg.STG;
+import org.workcraft.plugins.stg.SignalTransition;
+import org.workcraft.plugins.stg.VisualSTG;
+import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.util.Hierarchy;
+
+abstract public class StgGenerator {
+	
+	public enum SignalLayoutType { LEFT_TO_RIGHT, RIGHT_TO_LEFT, LEFT_TO_RIGHT_INVERTED, RIGHT_TO_LEFT_INVERTED }
+
+	public static final String _NAME0	 	= "_0";
+	public static final String _NAME1		= "_1";
+	
+	private final VisualModel src;
+	private final VisualSTG stg;
+
+	public StgGenerator(VisualModel src) {
+		this.src = src;
+		this.stg = new VisualSTG(new STG());
+		convert();
+	}
+	
+	public VisualModel getSrcModel() {
+		return src;
+	}
+
+	public VisualSTG getStgModel() {
+		return stg;
+	}
+	
+	abstract public void convert();
+
+	public void setPosition(Movable node, double x, double y) {
+		TransformHelper.applyTransform(node, AffineTransform.getTranslateInstance(x, y));
+	}
+
+	
+	public VisualConnection createConsumingArc(VisualPlace p, VisualSignalTransition t) throws InvalidConnectionException {
+		VisualConnection connection = null;
+		if (p != null && t != null) {
+			connection = stg.connect(p, t);
+		}
+		return connection;
+	}
+
+	public VisualConnection createConsumingArc(VisualPlace p, VisualSignalTransition t, boolean propagateTokenColor) throws InvalidConnectionException {
+		VisualConnection connection = null;
+		if (p != null && t != null) {
+			connection = stg.connect(p, t);
+			connection.setTokenColorPropagator(propagateTokenColor);
+		}
+		return connection;
+	}
+	
+	
+	public VisualConnection createProducingArc(VisualSignalTransition t, VisualPlace p) throws InvalidConnectionException {
+		VisualConnection connection = null;
+		if (p != null && t != null) {
+			connection = stg.connect(t, p);
+		}
+		return connection;
+	}
+	
+	public VisualConnection createProducingArc(VisualSignalTransition t, VisualPlace p, boolean propagateTokenColor) throws InvalidConnectionException {
+		VisualConnection connection = null;
+		if (p != null && t != null) {
+			connection = stg.connect(t, p);
+			connection.setTokenColorPropagator(propagateTokenColor);
+		}
+		return connection;
+	}
+	
+	public VisualConnection createReadArc(VisualPlace p, VisualSignalTransition t) throws InvalidConnectionException {
+		VisualConnection connection = null;
+		if (p != null && t != null) {
+			connection = stg.connectUndirected(p, t);
+		}
+		return connection;
+	}
+	
+	public VisualConnection createReadArc(VisualPlace p, VisualSignalTransition t, boolean propagateTokenColor) throws InvalidConnectionException {
+		VisualConnection connection = null;
+		if (p != null && t != null) {
+			connection = stg.connectUndirected(p, t);
+			connection.setTokenColorPropagator(propagateTokenColor);
+		}
+		return connection;
+	}
+
+	public void createReadArcs(VisualPlace p, Collection<VisualSignalTransition> ts) throws InvalidConnectionException {
+		if (ts != null) {
+			for (VisualSignalTransition t: ts) {
+				stg.connectUndirected(p, t);
+			}
+		}
+	}
+
+	public void createReadArcs(VisualPlace p, Collection<VisualSignalTransition> ts, boolean propagateTokenColor) throws InvalidConnectionException {
+		for (VisualSignalTransition t : new HashSet<VisualSignalTransition>(ts)) {
+			createReadArc(p, t, propagateTokenColor);
+		}
+	}
+	
+	public void createReadArcsBetweenSignals(SignalStg from, SignalStg to) throws InvalidConnectionException {
+		if ((from != null) && (to != null)) {
+			createReadArcs(from.one, to.riseList);
+			createReadArcs(from.zero, to.fallList);
+		}
+	}
+
+	
+	public void createReplicaReadArc(VisualPlace p, VisualSignalTransition t) throws InvalidConnectionException {
+		double dx = ((p.getRootSpaceX() > t.getRootSpaceX()) ? 6.0 : -6.0);
+		createReplicaReadArc(p, t, dx, 0.0);
+	}
+	
+	public void createReplicaReadArc(VisualPlace p, VisualSignalTransition t, double xOffset, double yOffset) throws InvalidConnectionException {
+		Point2D replicaPosition = new Point2D.Double(t.getRootSpaceX() + xOffset, t.getRootSpaceY() + yOffset);
+		createReplicaReadArcs(p, Arrays.asList(t), replicaPosition);
+	}
+
+	public void createReplicaReadArcs(VisualPlace p, List<VisualSignalTransition> ts, double xOffset, double yOffset) throws InvalidConnectionException {
+		if ((p != null) && (ts != null)) {
+			VisualReplicaPlace replicaPlace = null;
+			for (VisualSignalTransition t: ts) {
+				if (replicaPlace == null) {
+					Container container = Hierarchy.getNearestContainer(new HashSet<Node>(ts));
+					replicaPlace = stg.createVisualReplica(p, container, VisualReplicaPlace.class);
+					Point2D pos = new Point2D.Double(t.getRootSpaceX() + xOffset, t.getRootSpaceY() + yOffset);
+					replicaPlace.setRootSpacePosition(pos);
+				}
+				stg.connectUndirected(replicaPlace, t);				
+			}
+		}
+	}
+
+	public void createReplicaReadArcs(VisualPlace p, Collection<VisualSignalTransition> ts, Point2D replicaPosition) throws InvalidConnectionException {
+		if ((p != null) && (ts != null)) {
+			Container container = Hierarchy.getNearestContainer(new HashSet<Node>(ts));
+			VisualReplicaPlace replicaPlace = stg.createVisualReplica(p, container, VisualReplicaPlace.class);
+			if (replicaPosition != null) {
+				replicaPlace.setRootSpacePosition(replicaPosition);
+			}
+			for (VisualSignalTransition t: ts) {
+				stg.connectUndirected(replicaPlace, t);				
+			}
+		}
+	}
+
+	public void createReplicaReadArcBetweenSignals(SignalStg from, SignalStg to) throws InvalidConnectionException {
+		double xT = to.fallList.get(0).getRootSpaceX();
+		double xP = to.one.getRootSpaceX();
+		double yZero = to.zero.getRootSpaceY();
+		double yOne = to.one.getRootSpaceY();
+		double x = ((xT > xP) ? xT + 6.0 : xT - 6.0);
+		createReplicaReadArcs(from.zero, to.fallList, new Point2D.Double(x, yZero));
+		createReplicaReadArcs(from.one, to.riseList, new Point2D.Double(x, yOne));
+	}
+	
+	public Point2D getSignalCenterPosition(SignalStg signal) {
+		double x = 0.0;
+		for (VisualSignalTransition t: signal.getAllTransitions()) {
+			x += t.getRootSpaceX();
+		}
+		x /= signal.getAllTransitions().size();
+		
+		double y = 0.0;
+		for (VisualPlace p: signal.getAllPlaces()) {
+			y += p.getRootSpaceY();
+		}
+		y /= signal.getAllPlaces().size();
+
+		return new Point2D.Double(x, y);
+	}
+
+	public SignalStg generateBasicSignalStg(String signalName, double x, double y, SignalTransition.Type type) throws InvalidConnectionException {
+		VisualPlace zero = stg.createPlace(signalName + _NAME0, null);
+		zero.getReferencedPlace().setTokens(1);
+		zero.setNamePositioning(Positioning.BOTTOM);
+		zero.setLabelPositioning(Positioning.TOP);
+		setPosition(zero, x + 0.0, y + 2.0);
+
+		VisualPlace one = stg.createPlace(signalName + _NAME1, null);
+		one.getReferencedPlace().setTokens(0);
+		one.setNamePositioning(Positioning.TOP);
+		one.setLabelPositioning(Positioning.BOTTOM);
+		setPosition(one, x + 0.0, y - 2.0);
+
+		VisualSignalTransition fall = stg.createSignalTransition(signalName, type, SignalTransition.Direction.MINUS, null);
+		createConsumingArc(one, fall);
+		createProducingArc(fall, zero);
+		setPosition(fall, x + 4.0, y + 0.0);
+		
+		VisualSignalTransition rise = stg.createSignalTransition(signalName, type, SignalTransition.Direction.PLUS, null);
+		createConsumingArc(zero, rise);
+		createProducingArc(rise, one);
+		setPosition(rise, x - 4.0, y - 0.0);
+		
+		return new SignalStg(zero, one, fall, rise);
+	}
+	
+	public SignalStg generateSignalStg(SignalLayoutType layoutType, String signalName, Point2D pos, SignalTransition.Type type, int fallCount, int riseCount) throws InvalidConnectionException {
+		double x = pos.getX();
+		double y = pos.getY();
+		int xSign = 1;
+		if ( (layoutType == SignalLayoutType.RIGHT_TO_LEFT)	|| (layoutType == SignalLayoutType.RIGHT_TO_LEFT_INVERTED) ) {
+			xSign = -1;
+		}
+		int ySign = 1;
+		if ( (layoutType == SignalLayoutType.LEFT_TO_RIGHT_INVERTED) || (layoutType == SignalLayoutType.RIGHT_TO_LEFT_INVERTED) ) {
+			ySign = -1;
+		}
+		
+		VisualPlace zero = stg.createPlace(signalName + _NAME0, null);
+		zero.getReferencedPlace().setTokens(1);
+		zero.setNamePositioning((ySign < 0) ? Positioning.BOTTOM : Positioning.TOP);
+		zero.setLabelPositioning((ySign < 0) ? Positioning.TOP : Positioning.BOTTOM);
+		setPosition(zero, x + xSign * 4.0, y + ySign * 2.0);
+
+		VisualPlace one = stg.createPlace(signalName + _NAME1, null);
+		one.getReferencedPlace().setTokens(0);
+		one.setNamePositioning((ySign < 0) ? Positioning.TOP : Positioning.BOTTOM);
+		one.setLabelPositioning((ySign < 0) ? Positioning.BOTTOM : Positioning.TOP);
+		setPosition(one, x + xSign * 4.0, y - ySign * 2.0);
+
+		ArrayList<VisualSignalTransition> fallList = new ArrayList<>(fallCount);
+		for (int i = fallCount-1; i >= 0; --i) {
+			VisualSignalTransition fall = stg.createSignalTransition(signalName, type, SignalTransition.Direction.MINUS, null);
+			createConsumingArc(one, fall);
+			createProducingArc(fall, zero);
+			setPosition(fall, x + 0.0, y + ySign * (2.0 + i));
+			fallList.add(fall);
+		}
+		
+		ArrayList<VisualSignalTransition> riseList = new ArrayList<>(riseCount);
+		for (int i = riseCount-1; i >= 0; --i) {
+			VisualSignalTransition rise = stg.createSignalTransition(signalName, type, SignalTransition.Direction.PLUS, null);
+			createConsumingArc(zero, rise);
+			createProducingArc(rise, one);
+			setPosition(rise, x + 0.0, y - ySign * (2.0 + i));
+			riseList.add(rise);
+		}
+			
+		return new SignalStg(zero, one, fallList, riseList);
+	}
+
+	public void setSignalInitialState(SignalStg signalStg, boolean initToOne) {
+		if (initToOne) {
+			signalStg.one.getReferencedPlace().setTokens(1);
+			signalStg.zero.getReferencedPlace().setTokens(0);
+		} else {
+			signalStg.one.getReferencedPlace().setTokens(0);
+			signalStg.zero.getReferencedPlace().setTokens(1);
+		}
+	}
+	
+	public Point2D getComponentPosition(VisualComponent component) {
+		AffineTransform transform = TransformHelper.getTransformToRoot(component);
+		double x =	getScale().getX() * (transform.getTranslateX() + component.getX());
+		double y =	getScale().getY() * (transform.getTranslateY() + component.getY());
+		return new Point2D.Double(x, y);
+	}
+
+	public Point2D getScale() {
+		return new Point2D.Double(10.0, 10.0);
+	}
+
+	public void groupComponentStg(NodeStg nodeStg) {
+		stg.select(nodeStg.getAllNodes());
+		stg.groupSelection();
+	}
+
+}

=== modified file 'WorkcraftCore/src/org/workcraft/plugins/shared/CommonVisualSettings.java'
--- WorkcraftCore/src/org/workcraft/plugins/shared/CommonVisualSettings.java	2015-07-22 17:40:16 +0000
+++ WorkcraftCore/src/org/workcraft/plugins/shared/CommonVisualSettings.java	2015-09-25 14:54:20 +0000
@@ -61,7 +61,7 @@
 	private static final Color defaultLabelColor = Color.BLACK;
 	private static final boolean defaultNameVisibility = true;
 	private static final Positioning defaultNamePositioning = Positioning.BOTTOM;
-	private static final Color defaultNameColor = Color.BLUE.darker();
+	private static final Color defaultNameColor = Color.GRAY.darker();
 	private static final Integer defaultRedrawInterval = 20;
 
 	private static double baseSize = defaultBaseSize;

=== removed file 'WorkcraftRunner/.fatjar'
--- WorkcraftRunner/.fatjar	2013-07-11 11:26:55 +0000
+++ WorkcraftRunner/.fatjar	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#Fat Jar Configuration File
-#Wed Jul 25 12:13:21 BST 2012
-onejar.license.required=false
-manifest.classpath=./Workcraft/bin\:./ThirdParty/batik/batik-anim.jar\:./ThirdParty/batik/batik-awt-util.jar\:./ThirdParty/batik/batik-bridge.jar\:./ThirdParty/batik/bati\nk-codec.jar\:./ThirdParty/batik/batik-css.jar\:./ThirdParty/batik/batik-dom.jar\:./ThirdParty/batik/batik-ext.jar\:./ThirdParty/batik/batik-extension.jar\:./Third\nParty/batik/batik-gui-util.jar\:./ThirdParty/batik/batik-gvt.jar\:./ThirdParty/batik/batik-parser.jar\:./ThirdParty/batik/batik-script.jar\:./ThirdParty/batik/ba\ntik-svg-dom.jar\:./ThirdParty/batik/batik-svggen.jar\:./ThirdParty/batik/batik-swing.jar\:./ThirdParty/batik/batik-transcoder.jar\:./ThirdParty/batik/batik-util.\njar\:./ThirdParty/batik/batik-xml.jar\:./ThirdParty/batik/xml-apis-ext.jar\:./ThirdParty/batik/xml-apis.jar\:./ThirdParty/commons-logging-1.1.jar\:./ThirdParty/fl\nexdock-0.5.1.jar\:./ThirdParty/javaparser-1.0.7.jar\:./ThirdParty/jedit.jar\:./ThirdParty/jga-0.8-lgpl.jar\:./ThirdParty/js.jar\:./ThirdParty/junit-4.5.jar\:./Thir\ndParty/pcollections-1.0.0.jar\:./ThirdParty/substance.jar\:./ThirdParty/TableLayout-bin-jdk1.5-2009-08-26.jar\:./ThirdParty/desij.jar\:./CpogsPlugin/bin\:./Circui\ntPlugin/bin\:./STGPlugin/bin\:./PetriNetPlugin/bin\:./GatesPlugin/bin\:./GraphPlugin/bin\:./MpsatPlugin/bin\:./PetrifyPlugin/bin
-manifest.removesigners=true
-onejar.checkbox=false
-jarname=/home/danil/workspace/workcraft/src-danilovesky/Workcraf.jar
-manifest.mergeall=true
-manifest.mainclass=org.workcraft.Console
-manifest.file=<createnew>
-jarname.isextern=true
-onejar.expand=
-excludes=
-includes=

=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/XmasSettings.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/XmasSettings.java	2015-09-03 15:25:56 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/XmasSettings.java	2015-09-25 14:54:20 +0000
@@ -16,19 +16,19 @@
 	private static final String keyShowContacts  = prefix + ".showContacts";
 	private static final String keyBorderWidth = prefix + ".borderWidth";
 	private static final String keyWireWidth  = prefix + ".wireWidth";
-	private static final String keyJasonFileName  = prefix + ".jasonFileName";
+	private static final String keyVxmDirectory  = prefix + ".vxmDirectory";
 
 	private static final boolean defaultShowContacts = false;
 	private static final double defaultBorderWidth = 0.06;
-	private static final double defaultWireWidth = 0.04;
-	private static final String defaultJasonFileName = "";
+	private static final double defaultWireWidth = 0.06;
+	private static final String defaultVxmDirectory = "tools/vxm/";
 
 	private static boolean showContacts = defaultShowContacts;
 	private static double borderWidth = defaultBorderWidth;
 	private static double wireWidth = defaultWireWidth;
-	private static String jasonFileName = defaultJasonFileName;
-			
+	private static String vxmDirectory = defaultVxmDirectory;
 
+	
 	public XmasSettings() {
 		properties.add(new PropertyDeclaration<XmasSettings, Boolean>(
 				this, "Show contacts", Boolean.class, true, false, false) {
@@ -61,12 +61,12 @@
 		});
 
 		properties.add(new PropertyDeclaration<XmasSettings, String>(
-				this, "JSON conversion file", String.class, true, false, false) {
+				this, "VXM working directory", String.class, true, false, false) {
 			protected void setter(XmasSettings object, String value) {
-				XmasSettings.setJasonFileName(value);
+				XmasSettings.setVxmDirectory(value);
 			}
 			protected String getter(XmasSettings object) {
-				return XmasSettings.getJasonFileName();
+				return XmasSettings.getVxmDirectory();
 			}
 		});
 	}
@@ -81,7 +81,7 @@
 		setShowContacts(config.getBoolean(keyShowContacts, defaultShowContacts));
 		setBorderWidth (config.getDouble(keyBorderWidth, defaultBorderWidth));
 		setWireWidth(config.getDouble(keyWireWidth, defaultWireWidth));
-		setJasonFileName(config.getString(keyJasonFileName, defaultJasonFileName));
+		setVxmDirectory(config.getString(keyVxmDirectory, defaultVxmDirectory));
 	}
 
 	@Override
@@ -89,7 +89,7 @@
 		config.setBoolean(keyShowContacts, getShowContacts());
 		config.setDouble(keyBorderWidth, getBorderWidth());
 		config.setDouble(keyWireWidth, getWireWidth());
-		config.set(keyJasonFileName, getJasonFileName());
+		config.set(keyVxmDirectory, getVxmDirectory());
 	}
 
 	@Override
@@ -126,12 +126,12 @@
 		wireWidth = value;
 	}
 
-	public static String getJasonFileName() {
-		return jasonFileName;
+	public static String getVxmDirectory() {
+		return vxmDirectory;
 	}
 
-	public static void setJasonFileName(String value) {
-		jasonFileName = value;
+	public static void setVxmDirectory(String value) {
+		vxmDirectory = value;
 	}
 
 }

=== added file 'XmasPlugin/src/org/workcraft/plugins/xmas/components/StateDecoration.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/components/StateDecoration.java	1970-01-01 00:00:00 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/components/StateDecoration.java	2015-09-25 14:54:20 +0000
@@ -0,0 +1,7 @@
+package org.workcraft.plugins.xmas.components;
+
+import org.workcraft.gui.graph.tools.Decoration;
+
+public interface StateDecoration extends Decoration {
+	public boolean getState();
+}

=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualQueueComponent.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualQueueComponent.java	2015-09-05 22:18:55 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualQueueComponent.java	2015-09-25 14:54:20 +0000
@@ -46,13 +46,13 @@
 	
 	public static final String PROPERTY_FOREGROUND_COLOR = "Foreground color";
 	
-	private final double slotWidth = 0.35 * size;
-	private final double slotHeight = 0.8 * size;
-	private final double contactLength = 0.5 * size - slotWidth;
-	private final double tokenSize = 0.5 * slotWidth;
-	private final double headSize = 0.15 * size;
-	private final double tailSize = 0.15 * size;
-
+	public final double slotWidth = 0.35 * size;
+	public final double slotHeight = 1.0 * size;
+	public final double contactLength = 0.5 * size - slotWidth;
+	public final double tokenSize = 0.5 * slotWidth;
+	public final double headSize = 0.15 * size;
+	public final double tailSize = 0.15 * size;
+	
 	public Color color = new Color(0, 0, 0, 255);
 	
 	public VisualQueueComponent(QueueComponent component) {
@@ -188,18 +188,22 @@
 			g.setColor(getForegroundColor());
 			for (int i = 0; i < capacity; i++) {
 				SlotState slot = ((QueueDecoration)d).getSlotState(i);
-				g.draw(getSlotShape(i));
+				Shape slotShape = transformShape(getSlotShape(i));
+				g.draw(slotShape);
 				if (!slot.isMemExcited && slot.isFull) {
-					g.draw(getTokenShape(i));
-					g.fill(getTokenShape(i));
+					Shape tokenShape = transformShape(getTokenShape(i));
+					g.draw(tokenShape);
+					g.fill(tokenShape);
 				}
 				if (!slot.isHeadExcited && slot.isHead) {
-					g.draw(getHeadShape(i));
-					g.fill(getHeadShape(i));
+					Shape headShape = transformShape(getHeadShape(i));
+					g.draw(headShape);
+					g.fill(headShape);
 				}
 				if (!slot.isTailExcited && slot.isTail) {
-					g.draw(getTailShape(i));
-					g.fill(getTailShape(i));
+					Shape tailShape = transformShape(getTailShape(i));
+					g.draw(tailShape);
+					g.fill(tailShape);
 				}
 			}
 			// Excited elements
@@ -207,21 +211,24 @@
 			for (int i = 0; i < capacity; i++) {
 				SlotState slot = ((QueueDecoration)d).getSlotState(i);
 				if (slot.isMemExcited) {
-					g.draw(getTokenShape(i));
+					Shape tokenShape = transformShape(getTokenShape(i));
+					g.draw(tokenShape);
 					if (slot.isFull) {
-						g.fill(getTokenShape(i));
+						g.fill(tokenShape);
 					}
 				}
 				if (slot.isHeadExcited) {
-					g.draw(getHeadShape(i));
+					Shape headShape = transformShape(getHeadShape(i));
+					g.draw(headShape);
 					if (slot.isHead) {
-						g.fill(getHeadShape(i));
+						g.fill(headShape);
 					}
 				}
 				if (slot.isTailExcited) { 
-					g.draw(getTailShape(i));
+					Shape tailShape = transformShape(getTailShape(i));
+					g.draw(tailShape);
 					if (slot.isTail) {
-						g.fill(getTailShape(i));
+						g.fill(tailShape);
 					}
 				}
 			}

=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSinkComponent.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSinkComponent.java	2015-09-03 15:25:56 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSinkComponent.java	2015-09-25 14:54:20 +0000
@@ -21,20 +21,29 @@
 
 package org.workcraft.plugins.xmas.components;
 
+import java.awt.BasicStroke;
+import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.event.KeyEvent;
+import java.awt.geom.Ellipse2D;
 import java.awt.geom.Path2D;
 
 import org.workcraft.annotations.DisplayName;
 import org.workcraft.annotations.Hotkey;
 import org.workcraft.annotations.SVGIcon;
+import org.workcraft.dom.visual.DrawRequest;
 import org.workcraft.dom.visual.Positioning;
+import org.workcraft.gui.Coloriser;
+import org.workcraft.gui.graph.tools.Decoration;
+import org.workcraft.plugins.xmas.XmasSettings;
 
 @DisplayName("Sink")
 @Hotkey(KeyEvent.VK_O)
 @SVGIcon("images/icons/svg/xmas-sink.svg")
 public class VisualSinkComponent extends VisualXmasComponent {
 	
+	public final double tokenSize = 0.18 * size;
+	
 	public VisualSinkComponent(SinkComponent component) {
 		super(component);
 		if (component.getChildren().isEmpty()) { 
@@ -64,5 +73,24 @@
 
 		return shape;
 	}
+	
+	public Shape getTokenShape() {
+		return new Ellipse2D.Double(+1.4 * tokenSize, +0.6 * tokenSize, tokenSize, tokenSize);
+	}
+	
+	@Override
+	public void draw(DrawRequest r) {
+		super.draw(r);
+		Graphics2D g = r.getGraphics();
+		Decoration d = r.getDecoration();
+		if (d instanceof StateDecoration) {
+			if (((StateDecoration)d).getState()) {
+				g.setStroke(new BasicStroke((float)XmasSettings.getBorderWidth()));
+				g.setColor(Coloriser.colorise(getForegroundColor(), d.getColorisation()));
+				Shape shape = transformShape(getTokenShape());
+				g.draw(shape);
+			}
+		}
+	}
 
 }

=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSourceComponent.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSourceComponent.java	2015-09-03 15:25:56 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSourceComponent.java	2015-09-25 14:54:20 +0000
@@ -21,19 +21,24 @@
 
 package org.workcraft.plugins.xmas.components;
 
+import java.awt.BasicStroke;
 import java.awt.Color;
+import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.event.KeyEvent;
-import java.awt.geom.AffineTransform;
+import java.awt.geom.Ellipse2D;
 import java.awt.geom.Path2D;
 
 import org.workcraft.annotations.DisplayName;
 import org.workcraft.annotations.Hotkey;
 import org.workcraft.annotations.SVGIcon;
+import org.workcraft.dom.visual.DrawRequest;
 import org.workcraft.dom.visual.Positioning;
 import org.workcraft.dom.visual.Stylable;
-import org.workcraft.dom.visual.TransformHelper;
+import org.workcraft.gui.Coloriser;
+import org.workcraft.gui.graph.tools.Decoration;
 import org.workcraft.gui.propertyeditor.PropertyDeclaration;
+import org.workcraft.plugins.xmas.XmasSettings;
 import org.workcraft.plugins.xmas.components.SourceComponent.Mode;
 import org.workcraft.plugins.xmas.components.SourceComponent.Type;
 
@@ -46,6 +51,8 @@
 	
 	public Color color = new Color(0, 255, 0, 255);
 	private VisualXmasContact oContact = null;
+	public final double tokenSize = 0.18 * size;
+
 	
 	public VisualSourceComponent(SourceComponent component) {
 		super(component);
@@ -96,6 +103,26 @@
 		
 		return shape;
 	}
+	
+	public Shape getTokenShape() {
+		return new Ellipse2D.Double(-1.8 * tokenSize, -2.5 * tokenSize, tokenSize, tokenSize);
+	}
+	
+	@Override
+	public void draw(DrawRequest r) {
+		super.draw(r);
+		Graphics2D g = r.getGraphics();
+		Decoration d = r.getDecoration();
+		if (d instanceof StateDecoration) {
+			if (((StateDecoration)d).getState()) {
+				g.setStroke(new BasicStroke((float)XmasSettings.getBorderWidth()));
+				g.setColor(Coloriser.colorise(getForegroundColor(), d.getColorisation()));
+				Shape shape = transformShape(getTokenShape());
+				g.fill(shape);
+				g.draw(shape);
+			}
+		}
+	}
 
 	@Override
 	public void copyStyle(Stylable src) {

=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSwitchComponent.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSwitchComponent.java	2015-09-03 15:25:56 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSwitchComponent.java	2015-09-25 14:54:20 +0000
@@ -21,18 +21,27 @@
 
 package org.workcraft.plugins.xmas.components;
 
+import java.awt.BasicStroke;
+import java.awt.Graphics2D;
 import java.awt.Shape;
+import java.awt.geom.Ellipse2D;
 import java.awt.geom.Path2D;
 
 import org.workcraft.annotations.DisplayName;
 import org.workcraft.annotations.SVGIcon;
+import org.workcraft.dom.visual.DrawRequest;
 import org.workcraft.dom.visual.Positioning;
+import org.workcraft.gui.Coloriser;
+import org.workcraft.gui.graph.tools.Decoration;
+import org.workcraft.plugins.xmas.XmasSettings;
 
 
 @DisplayName("Switch")
 @SVGIcon("images/icons/svg/xmas-switch.svg")
 public class VisualSwitchComponent extends VisualXmasComponent {
 	
+	public final double pointerSize = 0.20 * size;
+
 	public VisualSwitchComponent(SwitchComponent component) {
 		super(component);
 		if (component.getChildren().isEmpty()) { 
@@ -45,6 +54,44 @@
 	public SwitchComponent getReferencedSwitchComponent() {
 		return (SwitchComponent)getReferencedComponent();
 	}
+	
+	public Shape getUpPointerShape() {
+		Path2D shape = new Path2D.Double();
+		shape.moveTo(+0.50 * size, -0.28 * size);
+		shape.lineTo(+0.50 * size + 0.7 * pointerSize, -0.28 * size + pointerSize);
+		shape.lineTo(+0.50 * size - 0.7 * pointerSize, -0.28 * size + pointerSize);
+		shape.closePath();
+		return shape;
+	}
+	
+	public Shape getDownPointerShape() {
+		Path2D shape = new Path2D.Double();
+		shape.moveTo(+0.50 * size, +0.28 * size);
+		shape.lineTo(+0.50 * size + 0.7 * pointerSize, +0.28 * size - pointerSize);
+		shape.lineTo(+0.50 * size - 0.7 * pointerSize, +0.28 * size - pointerSize);
+		shape.closePath();
+		return shape;
+	}
+
+	@Override
+	public void draw(DrawRequest r) {
+		super.draw(r);
+		Graphics2D g = r.getGraphics();
+		Decoration d = r.getDecoration();
+		if (d instanceof StateDecoration) {
+			g.setStroke(new BasicStroke((float)XmasSettings.getBorderWidth()));
+			g.setColor(Coloriser.colorise(getForegroundColor(), d.getColorisation()));
+			if (((StateDecoration)d).getState()) {
+				Shape shape = transformShape(getUpPointerShape());
+				g.fill(shape);
+				g.draw(shape);
+			} else {
+				Shape shape = transformShape(getDownPointerShape());
+				g.fill(shape);
+				g.draw(shape);
+			}
+		}
+	}
 
 	@Override
 	public Shape getShape() {

=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasComponent.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasComponent.java	2015-09-03 15:25:56 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasComponent.java	2015-09-25 14:54:20 +0000
@@ -178,7 +178,7 @@
 	
 	@Override
     public Rectangle2D getInternalBoundingBoxInLocalSpace() {
-		return getTransformedShape().getBounds2D();
+		return transformShape(getShape()).getBounds2D();
     }
 
 	public Rectangle2D getBoundingBoxInLocalSpace() {
@@ -272,12 +272,12 @@
 	
 	abstract public Shape getShape();
 	
-	public Shape getTransformedShape() {
+	public Shape transformShape(Shape shape) {
 		AffineTransform rotateTransform = new AffineTransform();
 		if (orientation != null) {
 			rotateTransform.quadrantRotate(orientation.getQuadrant());
 		}
-		return rotateTransform.createTransformedShape(getShape());
+		return rotateTransform.createTransformedShape(shape);
 	}
 
 	@Override
@@ -287,7 +287,7 @@
 		
 		g.setColor(Coloriser.colorise(getForegroundColor(), d.getColorisation()));
 		g.setStroke(new BasicStroke((float)XmasSettings.getBorderWidth()));
-		g.draw(getTransformedShape());
+		g.draw(transformShape(getShape()));
 
 		drawNameInLocalSpace(r);
 		drawLabelInLocalSpace(r);

=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasConnection.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasConnection.java	2015-09-03 15:25:56 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasConnection.java	2015-09-25 14:54:20 +0000
@@ -16,11 +16,11 @@
 public class VisualXmasConnection extends VisualConnection {
 
 	public VisualXmasConnection() {
-		super();
+		this(null, null, null);
 	}
 	
-	public VisualXmasConnection(MathConnection c) {
-		super();
+	public VisualXmasConnection(MathConnection con) {
+		this(con, null, null);
 	}
 	
 	public VisualXmasConnection(MathConnection con, VisualComponent c1, VisualComponent c2) {

=== added file 'XmasPlugin/src/org/workcraft/plugins/xmas/stg/ContactStg.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/stg/ContactStg.java	1970-01-01 00:00:00 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/stg/ContactStg.java	2015-09-25 14:54:20 +0000
@@ -0,0 +1,36 @@
+package org.workcraft.plugins.xmas.stg;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.workcraft.plugins.petri.VisualPlace;
+import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
+import org.workcraft.plugins.stg.generator.SignalStg;
+
+public class ContactStg extends NodeStg {
+	public final SignalStg rdy;
+	public final SignalStg dn;
+
+	public ContactStg(SignalStg rdy, SignalStg dn) {
+		this.rdy = rdy;
+		this.dn = dn;
+	}
+
+	@Override
+	public Collection<VisualSignalTransition> getAllTransitions() {
+		HashSet<VisualSignalTransition> result = new HashSet<>();
+		result.addAll(rdy.getAllTransitions());
+		result.addAll(dn.getAllTransitions());
+		return result;
+	}
+
+	@Override
+	public Collection<VisualPlace> getAllPlaces() {
+		HashSet<VisualPlace> result = new HashSet<>();
+		result.addAll(rdy.getAllPlaces());
+		result.addAll(dn.getAllPlaces());
+		return result;
+	}
+
+}

=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/stg/ForkStg.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/stg/ForkStg.java	2015-09-03 15:25:56 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/stg/ForkStg.java	2015-09-25 14:54:20 +0000
@@ -5,13 +5,14 @@
 
 import org.workcraft.plugins.petri.VisualPlace;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
 
 public class ForkStg extends NodeStg {
-	public final SignalStg i;
-	public final SignalStg a;
-	public final SignalStg b;
+	public final ContactStg i;
+	public final ContactStg a;
+	public final ContactStg b;
 
-	public ForkStg(SignalStg i, SignalStg a, SignalStg b) {
+	public ForkStg(ContactStg i, ContactStg a, ContactStg b) {
 		this.i = i;
 		this.a = a;
 		this.b = b;

=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/stg/FunctionStg.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/stg/FunctionStg.java	2015-09-03 15:25:56 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/stg/FunctionStg.java	2015-09-25 14:54:20 +0000
@@ -5,12 +5,13 @@
 
 import org.workcraft.plugins.petri.VisualPlace;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
 
 public class FunctionStg extends NodeStg {
-	public final SignalStg i;
-	public final SignalStg o;
+	public final ContactStg i;
+	public final ContactStg o;
 
-	public FunctionStg(SignalStg i, SignalStg o) {
+	public FunctionStg(ContactStg i, ContactStg o) {
 		this.i = i;
 		this.o = o;
 	}

=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/stg/JoinStg.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/stg/JoinStg.java	2015-09-03 15:25:56 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/stg/JoinStg.java	2015-09-25 14:54:20 +0000
@@ -5,13 +5,14 @@
 
 import org.workcraft.plugins.petri.VisualPlace;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
 
 public class JoinStg extends NodeStg {
-	public final SignalStg a;
-	public final SignalStg b;
-	public final SignalStg o;
+	public final ContactStg a;
+	public final ContactStg b;
+	public final ContactStg o;
 
-	public JoinStg(SignalStg a, SignalStg b, SignalStg o) {
+	public JoinStg(ContactStg a, ContactStg b, ContactStg o) {
 		this.a = a;
 		this.b = b;
 		this.o = o;

=== added file 'XmasPlugin/src/org/workcraft/plugins/xmas/stg/MergeStg.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/stg/MergeStg.java	1970-01-01 00:00:00 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/stg/MergeStg.java	2015-09-25 14:54:20 +0000
@@ -0,0 +1,39 @@
+package org.workcraft.plugins.xmas.stg;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.workcraft.plugins.petri.VisualPlace;
+import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
+
+public class MergeStg extends NodeStg {
+	public final ContactStg a;
+	public final ContactStg b;
+	public final ContactStg o;
+
+	public MergeStg(ContactStg a, ContactStg b, ContactStg o) {
+		this.a = a;
+		this.b = b;
+		this.o = o;
+	}
+
+	@Override
+	public Collection<VisualSignalTransition> getAllTransitions() {
+		HashSet<VisualSignalTransition> result = new HashSet<>();
+		result.addAll(a.getAllTransitions());
+		result.addAll(b.getAllTransitions());
+		result.addAll(o.getAllTransitions());
+		return result;
+	}
+
+	@Override
+	public Collection<VisualPlace> getAllPlaces() {
+		HashSet<VisualPlace> result = new HashSet<>();
+		result.addAll(a.getAllPlaces());
+		result.addAll(b.getAllPlaces());
+		result.addAll(o.getAllPlaces());
+		return result;
+	}
+
+}

=== removed file 'XmasPlugin/src/org/workcraft/plugins/xmas/stg/NodeStg.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/stg/NodeStg.java	2015-08-28 17:16:49 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/stg/NodeStg.java	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-package org.workcraft.plugins.xmas.stg;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.workcraft.dom.Node;
-import org.workcraft.plugins.petri.VisualPlace;
-import org.workcraft.plugins.stg.VisualSignalTransition;
-
-public abstract class NodeStg {
-	public abstract Collection<VisualSignalTransition> getAllTransitions();
-	
-	public abstract Collection<VisualPlace> getAllPlaces();
-
-	public Collection<Node> getAllNodes() {
-		HashSet<Node> result = new HashSet<>();
-		result.addAll(getAllPlaces());
-		result.addAll(getAllTransitions());
-		return result;
-	}
-
-	public boolean contains(Node n) {
-		if (n != null) {
-			for (VisualPlace p: getAllPlaces()) {
-				if (n == p || (p != null && n == p.getReferencedPlace())) {
-					return true;
-				}
-			}
-			for (VisualSignalTransition t: getAllTransitions()) {
-				if (n == t || (t != null && n == t.getReferencedTransition())) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-}

=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/stg/QueueStg.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/stg/QueueStg.java	2015-09-05 22:18:55 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/stg/QueueStg.java	2015-09-25 14:54:20 +0000
@@ -1,24 +1,22 @@
 package org.workcraft.plugins.xmas.stg;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import org.workcraft.plugins.petri.VisualPlace;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
 
 public class QueueStg extends NodeStg {
-	public final SignalStg i;
-	public final SignalStg o;
-	public final ArrayList<SignalStg> memList = new ArrayList<>();
-	public final ArrayList<SignalStg> headList = new ArrayList<>();
-	public final ArrayList<SignalStg> tailList = new ArrayList<>();
+	public final ContactStg i;
+	public final ContactStg o;
+	public final ArrayList<SlotStg> slotList = new ArrayList<>();
 
-	public QueueStg(SignalStg i, SignalStg o, ArrayList<SignalStg> memList, ArrayList<SignalStg> headList, ArrayList<SignalStg> tailList) {
+	public QueueStg(ContactStg i, ContactStg o, ArrayList<SlotStg> slotList) {
 		this.i = i;
 		this.o = o;
-		this.memList.addAll(memList);
-		this.headList.addAll(headList);
-		this.tailList.addAll(tailList);
+		this.slotList.addAll(slotList);
 	}
 
 	@Override
@@ -26,68 +24,55 @@
 		List<VisualSignalTransition> result = new ArrayList<>();
 		result.addAll(i.getAllTransitions());
 		result.addAll(o.getAllTransitions());
-		result.addAll(getMemTransitions());
-		result.addAll(getHeadTransitions());
-		result.addAll(getTailTransitions());
-		return result;
-	}
-
-	public List<VisualSignalTransition> getMemTransitions() {
-		List<VisualSignalTransition> result = new ArrayList<>();
-		for (SignalStg mem: memList) {
-			result.addAll(mem.getAllTransitions());
-		}
-		return result;
-	}
-
-	public List<VisualSignalTransition> getHeadTransitions() {
-		List<VisualSignalTransition> result = new ArrayList<>();
-		for (SignalStg head: headList) {
-			result.addAll(head.getAllTransitions());
-		}
-		return result;
-	}
-
-	public List<VisualSignalTransition> getTailTransitions() {
-		List<VisualSignalTransition> result = new ArrayList<>();
-		for (SignalStg tail: tailList) {
-			result.addAll(tail.getAllTransitions());
-		}
-		return result;
-	}
-
+		result.addAll(getSlotTransitions());
+		return result;
+	}
+
+	public List<VisualSignalTransition> getSlotTransitions() {
+		List<VisualSignalTransition> result = new ArrayList<>();
+		for (SlotStg slot: slotList) {
+			result.addAll(slot.getAllTransitions());
+		}
+		return result;
+	}
 	
 	@Override
 	public List<VisualPlace> getAllPlaces() {
 		List<VisualPlace> result = new ArrayList<>();
 		result.addAll(i.getAllPlaces());
 		result.addAll(o.getAllPlaces());
-		result.addAll(getMemPlaces());
-		result.addAll(getHeadPlaces());
-		result.addAll(getTailPlaces());
-		return result;
-	}
-
-	public List<VisualPlace> getMemPlaces() {
-		List<VisualPlace> result = new ArrayList<>();
-		for (SignalStg mem: memList) {
-			result.addAll(mem.getAllPlaces());
-		}
-		return result;
-	}
-
-	public List<VisualPlace> getHeadPlaces() {
-		List<VisualPlace> result = new ArrayList<>();
-		for (SignalStg head: headList) {
-			result.addAll(head.getAllPlaces());
-		}
-		return result;
-	}
-
-	public List<VisualPlace> getTailPlaces() {
-		List<VisualPlace> result = new ArrayList<>();
-		for (SignalStg tail: tailList) {
-			result.addAll(tail.getAllPlaces());
+		result.addAll(getSlotPlaces());
+		return result;
+	}
+
+	public List<VisualPlace> getSlotPlaces() {
+		List<VisualPlace> result = new ArrayList<>();
+		for (SlotStg slot: slotList) {
+			result.addAll(slot.getAllPlaces());
+		}
+		return result;
+	}
+
+	public Collection<VisualSignalTransition> getMemTransitions() {
+		List<VisualSignalTransition> result = new ArrayList<>();
+		for (SlotStg slot: slotList) {
+			result.addAll(slot.mem.getAllTransitions());
+		}
+		return result;
+	}
+
+	public Collection<VisualSignalTransition> getHeadTransitions() {
+		List<VisualSignalTransition> result = new ArrayList<>();
+		for (SlotStg slot: slotList) {
+			result.addAll(slot.hd.getAllTransitions());
+		}
+		return result;
+	}
+
+	public Collection<VisualSignalTransition> getTailTransitions() {
+		List<VisualSignalTransition> result = new ArrayList<>();
+		for (SlotStg slot: slotList) {
+			result.addAll(slot.tl.getAllTransitions());
 		}
 		return result;
 	}

=== removed file 'XmasPlugin/src/org/workcraft/plugins/xmas/stg/SignalStg.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/stg/SignalStg.java	2015-09-03 15:25:56 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/stg/SignalStg.java	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-package org.workcraft.plugins.xmas.stg;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import org.workcraft.plugins.petri.VisualPlace;
-import org.workcraft.plugins.stg.VisualSignalTransition;
-
-public class SignalStg extends NodeStg {
-	public final VisualPlace zero;
-	public final VisualPlace one;
-	public final ArrayList<VisualSignalTransition> fallList = new ArrayList<>();
-	public final ArrayList<VisualSignalTransition> riseList = new ArrayList<>();
-
-	public SignalStg(VisualPlace zero, VisualPlace one, VisualSignalTransition fall, VisualSignalTransition rise) {
-		this.zero = zero;
-		this.one = one;
-		this.fallList.add(fall);
-		this.riseList.add(rise);
-	}
-
-	public SignalStg(VisualPlace zero, VisualPlace one, ArrayList<VisualSignalTransition> fallList, ArrayList<VisualSignalTransition> riseList) {
-		this.zero = zero;
-		this.one = one;
-		this.fallList.addAll(fallList);
-		this.riseList.addAll(riseList);
-	}
-
-	@Override
-	public Collection<VisualSignalTransition> getAllTransitions() {
-		HashSet<VisualSignalTransition> tmp = new HashSet<>();
-		tmp.addAll(fallList);
-		tmp.addAll(riseList);
-		List<VisualSignalTransition> result = new ArrayList<>();
-		result.addAll(tmp);
-		return result;
-	}
-
-	@Override
-	public Collection<VisualPlace> getAllPlaces() {
-		return Arrays.asList(zero, one);
-	}
-
-}

=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/stg/SinkStg.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/stg/SinkStg.java	2015-09-05 22:18:55 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/stg/SinkStg.java	2015-09-25 14:54:20 +0000
@@ -6,12 +6,14 @@
 
 import org.workcraft.plugins.petri.VisualPlace;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
+import org.workcraft.plugins.stg.generator.SignalStg;
 
 public class SinkStg extends NodeStg {
-	public final SignalStg i;
+	public final ContactStg i;
 	public final SignalStg oracle;
 
-	public SinkStg(SignalStg i, SignalStg oracle) {
+	public SinkStg(ContactStg i, SignalStg oracle) {
 		this.i = i;
 		this.oracle = oracle;
 	}

=== added file 'XmasPlugin/src/org/workcraft/plugins/xmas/stg/SlotStg.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/stg/SlotStg.java	1970-01-01 00:00:00 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/stg/SlotStg.java	2015-09-25 14:54:20 +0000
@@ -0,0 +1,40 @@
+package org.workcraft.plugins.xmas.stg;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.workcraft.plugins.petri.VisualPlace;
+import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
+import org.workcraft.plugins.stg.generator.SignalStg;
+
+public class SlotStg extends NodeStg {
+	public final SignalStg mem;
+	public final ContactStg hd;
+	public final ContactStg tl;
+
+	public SlotStg(SignalStg mem, ContactStg hd, ContactStg tl) {
+		this.mem = mem;
+		this.hd = hd;
+		this.tl = tl;
+	}
+
+	@Override
+	public Collection<VisualSignalTransition> getAllTransitions() {
+		HashSet<VisualSignalTransition> result = new HashSet<>();
+		result.addAll(mem.getAllTransitions());
+		result.addAll(hd.getAllTransitions());
+		result.addAll(tl.getAllTransitions());
+		return result;
+	}
+
+	@Override
+	public Collection<VisualPlace> getAllPlaces() {
+		HashSet<VisualPlace> result = new HashSet<>();
+		result.addAll(mem.getAllPlaces());
+		result.addAll(hd.getAllPlaces());
+		result.addAll(tl.getAllPlaces());
+		return result;
+	}
+
+}

=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/stg/SourceStg.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/stg/SourceStg.java	2015-09-05 22:18:55 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/stg/SourceStg.java	2015-09-25 14:54:20 +0000
@@ -6,12 +6,14 @@
 
 import org.workcraft.plugins.petri.VisualPlace;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
+import org.workcraft.plugins.stg.generator.SignalStg;
 
 public class SourceStg extends NodeStg {
-	public final SignalStg o;
+	public final ContactStg o;
 	public final SignalStg oracle;
 
-	public SourceStg(SignalStg o, SignalStg oracle) {
+	public SourceStg(ContactStg o, SignalStg oracle) {
 		this.o = o;
 		this.oracle = oracle;
 	}

=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/stg/StgGenerator.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/stg/StgGenerator.java	2015-09-14 16:35:29 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/stg/StgGenerator.java	2015-09-25 14:54:20 +0000
@@ -1,662 +1,1259 @@
 package org.workcraft.plugins.xmas.stg;
 
-import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
-import org.workcraft.dom.Container;
 import org.workcraft.dom.Node;
-import org.workcraft.dom.visual.Movable;
-import org.workcraft.dom.visual.Positioning;
-import org.workcraft.dom.visual.TransformHelper;
+import org.workcraft.dom.visual.VisualComponent;
 import org.workcraft.exceptions.InvalidConnectionException;
 import org.workcraft.plugins.petri.VisualPlace;
-import org.workcraft.plugins.petri.VisualReplicaPlace;
-import org.workcraft.plugins.stg.STG;
 import org.workcraft.plugins.stg.SignalTransition;
 import org.workcraft.plugins.stg.SignalTransition.Type;
-import org.workcraft.plugins.stg.VisualSTG;
 import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.plugins.stg.generator.NodeStg;
+import org.workcraft.plugins.stg.generator.SignalStg;
 import org.workcraft.plugins.xmas.VisualXmas;
 import org.workcraft.plugins.xmas.XmasUtils;
 import org.workcraft.plugins.xmas.components.VisualForkComponent;
 import org.workcraft.plugins.xmas.components.VisualFunctionComponent;
 import org.workcraft.plugins.xmas.components.VisualJoinComponent;
+import org.workcraft.plugins.xmas.components.VisualMergeComponent;
 import org.workcraft.plugins.xmas.components.VisualQueueComponent;
 import org.workcraft.plugins.xmas.components.VisualSinkComponent;
 import org.workcraft.plugins.xmas.components.VisualSourceComponent;
+import org.workcraft.plugins.xmas.components.VisualSwitchComponent;
 import org.workcraft.plugins.xmas.components.VisualXmasComponent;
 import org.workcraft.plugins.xmas.components.VisualXmasContact;
 import org.workcraft.util.Hierarchy;
 
-public class StgGenerator {
-	public static final String nameOirdy	= "_Oirdy";
-	public static final String nameAirdy	= "_Airdy";
-	public static final String nameBirdy	= "_Birdy";
-	public static final String nameItrdy	= "_Itrdy";
-	public static final String nameAtrdy	= "_Atrdy";
-	public static final String nameBtrdy	= "_Btrdy";
-	public static final String nameOracle	= "_oracle";
-	public static final String nameMem 		= "_mem";
-	public static final String nameHead		= "_hd";
-	public static final String nameTail		= "_tl";
-	public static final String name0	 	= "_0";
-	public static final String name1 		= "_1";
-	private static final double xScaling = 6;
-	private static final double yScaling = 6;
-
-	private Map<VisualXmasContact, SignalStg> contactMap = new HashMap<>(); 
-	private Map<VisualSourceComponent, SourceStg> sourceMap = new HashMap<>(); 
-	private Map<VisualSinkComponent, SinkStg> sinkMap = new HashMap<>(); 
-	private Map<VisualFunctionComponent, FunctionStg> functionMap = new HashMap<>(); 
-	private Map<VisualForkComponent, ForkStg> forkMap = new HashMap<>(); 
-	private Map<VisualJoinComponent, JoinStg> joinMap = new HashMap<>(); 
-	private Map<VisualQueueComponent, QueueStg> queueMap = new HashMap<>(); 
-	private final VisualXmas xmas;
-	private final VisualSTG stg;
+public class StgGenerator extends org.workcraft.plugins.stg.generator.StgGenerator {
+	
+	private enum XmasStgType { IORACLE, TORACLE, IRDY, IDN, TRDY, TDN }
+	
+	private static final String _INITIATOR  = "I";
+	private static final String _TARGET     = "T";
+	private static final String _RDY	    = "Rdy";
+	private static final String _DN	   	    = "Dn";
+	private static final String _ORACLE		= "_oracle";
+	private static final String _MEM 		= "_mem";
+	private static final String _HEAD		= "_hd";
+	private static final String _TAIL		= "_tl";
+	private static final String _PORT_I		= "_i";
+	private static final String _PORT_O		= "_o";
+	private static final String _PORT_A		= "_a";
+	private static final String _PORT_B		= "_b";
+
+	private static final String _O_IRDY	= _PORT_O + _INITIATOR + _RDY;
+	private static final String _O_IDN  = _PORT_O + _INITIATOR + _DN;
+	private static final String _A_IRDY	= _PORT_A + _INITIATOR + _RDY;
+	private static final String _A_IDN  = _PORT_A + _INITIATOR + _DN;
+	private static final String _B_IRDY	= _PORT_B + _INITIATOR + _RDY;
+	private static final String _B_IDN  = _PORT_B + _INITIATOR + _DN;
+
+	private static final String _I_TRDY	= _PORT_I + _TARGET + _RDY;
+	private static final String _I_TDN  = _PORT_I + _TARGET + _DN;
+	private static final String _A_TRDY	= _PORT_A + _TARGET + _RDY;
+	private static final String _A_TDN  = _PORT_A + _TARGET + _DN;
+	private static final String _B_TRDY	= _PORT_B + _TARGET + _RDY;
+	private static final String _B_TDN  = _PORT_B + _TARGET + _DN;
+	
+	private static final double QUEUE_SLOT_SPACING = 20.0;
+
+	private SignalStg clockStg;
+	private Set<SignalStg> clockControlSignals;
+	private Map<VisualXmasContact, ContactStg> contactMap; 
+	private Map<VisualSourceComponent, SourceStg> sourceMap; 
+	private Map<VisualSinkComponent, SinkStg> sinkMap; 
+	private Map<VisualFunctionComponent, FunctionStg> functionMap; 
+	private Map<VisualForkComponent, ForkStg> forkMap; 
+	private Map<VisualJoinComponent, JoinStg> joinMap; 
+	private Map<VisualSwitchComponent, SwitchStg> switchMap; 
+	private Map<VisualMergeComponent, MergeStg> mergeMap; 
+	private Map<VisualQueueComponent, QueueStg> queueMap; 
 
 	public StgGenerator(VisualXmas xmas) {
-		this.xmas = xmas;
-		this.stg = new VisualSTG(new STG());
-		convert();
+		super(xmas);
+	}
+
+	private VisualXmas getXmasModel() {
+		return (VisualXmas)getSrcModel();
 	}
 	
-	private void convert() {
+	@Override
+	public void convert() {
+		HashSet<VisualXmasComponent> remainingComponents = new HashSet<>();
+		remainingComponents.addAll(Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualXmasComponent.class));
 		try {
-			for(VisualSourceComponent component : Hierarchy.getDescendantsOfType(xmas.getRoot(), VisualSourceComponent.class)) {
-				SourceStg sourceStg = generateSourceStg(component);
-				sourceMap.put(component, sourceStg);
-			}
-			for(VisualSinkComponent component : Hierarchy.getDescendantsOfType(xmas.getRoot(), VisualSinkComponent.class)) {
-				SinkStg sinkStg = generateSinkStg(component);
-				sinkMap.put(component, sinkStg);
-			}
-			for(VisualFunctionComponent component : Hierarchy.getDescendantsOfType(xmas.getRoot(), VisualFunctionComponent.class)) {
-				FunctionStg functionStg = generateFunctionStg(component);
-				functionMap.put(component, functionStg);
-			}
-			for(VisualForkComponent component : Hierarchy.getDescendantsOfType(xmas.getRoot(), VisualForkComponent.class)) {
-				ForkStg forkStg = generateForkStg(component);
-				forkMap.put(component, forkStg);
-			}
-			for(VisualJoinComponent component : Hierarchy.getDescendantsOfType(xmas.getRoot(), VisualJoinComponent.class)) {
-				JoinStg joinStg = generateJoinStg(component);
-				joinMap.put(component, joinStg);
-			}
-			for(VisualQueueComponent component : Hierarchy.getDescendantsOfType(xmas.getRoot(), VisualQueueComponent.class)) {
-				QueueStg queueStg = generateQueueStg(component);
-				queueMap.put(component, queueStg);
+			{
+				clockStg = generateClockStg();
+				clockControlSignals = new HashSet<>();
+				groupComponentStg(clockStg);
+			}
+			for(VisualSourceComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualSourceComponent.class)) {
+				SourceStg stg = generateSourceStg(component);
+				groupComponentStg(stg);
+				putSourceStg(component, stg);
+				remainingComponents.remove(component);
+			}
+			for(VisualSinkComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualSinkComponent.class)) {
+				SinkStg stg = generateSinkStg(component);
+				groupComponentStg(stg);
+				putSinkStg(component, stg);
+				remainingComponents.remove(component);
+			}
+			for(VisualFunctionComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualFunctionComponent.class)) {
+				FunctionStg stg = generateFunctionStg(component);
+				groupComponentStg(stg);
+				putFunctionStg(component, stg);
+				remainingComponents.remove(component);
+			}
+			for(VisualForkComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualForkComponent.class)) {
+				ForkStg stg = generateForkStg(component);
+				groupComponentStg(stg);
+				putForkStg(component, stg);
+				remainingComponents.remove(component);
+			}
+			for(VisualJoinComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualJoinComponent.class)) {
+				JoinStg stg = generateJoinStg(component);
+				groupComponentStg(stg);
+				putJoinStg(component, stg);
+				remainingComponents.remove(component);
+			}
+			for(VisualSwitchComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualSwitchComponent.class)) {
+				SwitchStg stg = generateSwitchStg(component);
+				groupComponentStg(stg);
+				putSwitchStg(component, stg);
+				remainingComponents.remove(component);
+			}
+			for(VisualMergeComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualMergeComponent.class)) {
+				MergeStg stg = generateMergeStg(component);
+				groupComponentStg(stg);
+				putMergeStg(component, stg);
+				remainingComponents.remove(component);
+			}
+			for(VisualQueueComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualQueueComponent.class)) {
+				QueueStg stg = generateQueueStg(component);
+				groupComponentStg(stg);
+				putQueueStg(component, stg);
+				remainingComponents.remove(component);
 			}
 
-			for(VisualSourceComponent component : Hierarchy.getDescendantsOfType(xmas.getRoot(), VisualSourceComponent.class)) {
+			connectClockStg();
+			for(VisualSourceComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualSourceComponent.class)) {
 				connectSourceStg(component);
 			}
-			for(VisualSinkComponent component : Hierarchy.getDescendantsOfType(xmas.getRoot(), VisualSinkComponent.class)) {
+			for(VisualSinkComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualSinkComponent.class)) {
 				connectSinkStg(component);
 			}
-			for(VisualFunctionComponent component : Hierarchy.getDescendantsOfType(xmas.getRoot(), VisualFunctionComponent.class)) {
+			for(VisualFunctionComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualFunctionComponent.class)) {
 				connectFunctionStg(component);
 			}
-			for(VisualForkComponent component : Hierarchy.getDescendantsOfType(xmas.getRoot(), VisualForkComponent.class)) {
+			for(VisualForkComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualForkComponent.class)) {
 				connectForkStg(component);
 			}
-			for(VisualJoinComponent component : Hierarchy.getDescendantsOfType(xmas.getRoot(), VisualJoinComponent.class)) {
+			for(VisualJoinComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualJoinComponent.class)) {
 				connectJoinStg(component);
 			}
-			for(VisualQueueComponent component : Hierarchy.getDescendantsOfType(xmas.getRoot(), VisualQueueComponent.class)) {
+			for(VisualSwitchComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualSwitchComponent.class)) {
+				connectSwitchStg(component);
+			}
+			for(VisualMergeComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualMergeComponent.class)) {
+				connectMergeStg(component);
+			}
+			for(VisualQueueComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualQueueComponent.class)) {
 				connectQueueStg(component);
 			}
 		} catch (InvalidConnectionException e) {
 			throw new RuntimeException(e);
 		}
-		stg.selectNone();
-	}
-	
-	public VisualSTG getStg() {
-		return stg;
-	}
-
-	static void setPosition(Movable node, double x, double y) {
-		TransformHelper.applyTransform(node, AffineTransform.getTranslateInstance(x, y));
-	}
-	
-	private void createConsumingArc(VisualPlace p, VisualSignalTransition t) throws InvalidConnectionException {
-		if (p != null && t != null) {
-			stg.connect(p, t);
-		}
-	}
-	
-	private void createProducingArc(VisualSignalTransition t, VisualPlace p) throws InvalidConnectionException {
-		if (p != null && t != null) {
-			stg.connect(t, p);
-		}
-	}
-	
-	private void createReadArc(VisualPlace p, VisualSignalTransition t) throws InvalidConnectionException {
-		if (p != null && t != null) {
-			stg.connectUndirected(p, t);
-		}
-	}
-	
-	private void createReplicaReadArc(VisualPlace p, VisualSignalTransition t, Point2D replicaPosition) throws InvalidConnectionException {
-		if (p != null && t != null) {
-			Container container = Hierarchy.getNearestContainer(t);
-			VisualReplicaPlace replicaPlace = stg.createVisualReplica(p, container, VisualReplicaPlace.class);
-			if (replicaPosition != null) {
-				replicaPlace.setRootSpacePosition(replicaPosition);
-			}
-			stg.connectUndirected(replicaPlace, t);
-		}
-	}
-
-	private SignalStg generateInputContactStg(String signalName, double x, double y) throws InvalidConnectionException {
-		return generateInputContactStg(signalName, x, y, false, Type.INTERNAL, 1, 1);
-	}
-	
-	private SignalStg generateInputContactStg(String signalName, double x, double y, boolean initToOne, 
-			SignalTransition.Type type, int fallCount, int riseCount) throws InvalidConnectionException {
-
-		VisualPlace zero = stg.createPlace(signalName + name0, null);
-		zero.setNamePositioning(Positioning.BOTTOM);
-		zero.setLabelPositioning(Positioning.TOP);
-		setPosition(zero, x - 4.0, y + 1.0);
-
-		VisualPlace one = stg.createPlace(signalName + name1, null);
-		one.setNamePositioning(Positioning.TOP);
-		one.setLabelPositioning(Positioning.BOTTOM);
-		setPosition(one, x - 4.0, y - 1.0);
-
-		if (initToOne) {
-			one.getReferencedPlace().setTokens(1);
-			zero.getReferencedPlace().setTokens(0);
-		} else {
-			one.getReferencedPlace().setTokens(0);
-			zero.getReferencedPlace().setTokens(1);
-		}
-
-		ArrayList<VisualSignalTransition> fallList = new ArrayList<>(fallCount);
-		for (int i = 0; i < fallCount; i++) {
-			VisualSignalTransition fall = stg.createSignalTransition(signalName, type, SignalTransition.Direction.MINUS, null);
-			createConsumingArc(one, fall);
-			createProducingArc(fall, zero);
-			setPosition(fall, x + 0.0, y + 1.0 + i);
-			fallList.add(fall);
-		}
-		
-		ArrayList<VisualSignalTransition> riseList = new ArrayList<>(riseCount);
-		for (int i = 0; i < riseCount; i++) {
-			VisualSignalTransition rise = stg.createSignalTransition(signalName, type, SignalTransition.Direction.PLUS, null);
-			createConsumingArc(zero, rise);
-			createProducingArc(rise, one);
-			setPosition(rise, x + 0.0, y - 1.0 - i);
-			riseList.add(rise);
-		}
-			
-		return new SignalStg(zero, one, fallList, riseList);
-	}
-
-	private SignalStg generateOutputContactStg(String signalName, double x, double y) throws InvalidConnectionException {
-		return generateOutputContactStg(signalName, x, y, false, Type.INTERNAL, 1, 1);
-	}
-	
-	private SignalStg generateOutputContactStg(String signalName, double x, double y, boolean initToOne, 
-			SignalTransition.Type type, int fallCount, int riseCount) throws InvalidConnectionException {
-
-		VisualPlace zero = stg.createPlace(signalName + name0, null);
-		zero.setNamePositioning(Positioning.BOTTOM);
-		zero.setLabelPositioning(Positioning.TOP);
-		setPosition(zero, x + 4.0, y + 1.0);
-
-		VisualPlace one = stg.createPlace(signalName + name1, null);
-		one.setNamePositioning(Positioning.TOP);
-		one.setLabelPositioning(Positioning.BOTTOM);
-		setPosition(one, x + 4.0, y - 1.0);
-
-		if (initToOne) {
-			one.getReferencedPlace().setTokens(1);
-			zero.getReferencedPlace().setTokens(0);
-		} else {
-			one.getReferencedPlace().setTokens(0);
-			zero.getReferencedPlace().setTokens(1);
-		}
-
-		ArrayList<VisualSignalTransition> fallList = new ArrayList<>(fallCount);
-		for (int i = 0; i < fallCount; i++) {
-			VisualSignalTransition fall = stg.createSignalTransition(signalName, type, SignalTransition.Direction.MINUS, null);
-			createConsumingArc(one, fall);
-			createProducingArc(fall, zero);
-			setPosition(fall, x - 0.0, y + 1.0 + i);
-			fallList.add(fall);
-		}
-		
-		ArrayList<VisualSignalTransition> riseList = new ArrayList<>(riseCount);
-		for (int i = 0; i < riseCount; i++) {
-			VisualSignalTransition rise = stg.createSignalTransition(signalName, type, SignalTransition.Direction.PLUS, null);
-			createConsumingArc(zero, rise);
-			createProducingArc(rise, one);
-			setPosition(rise, x - 0.0, y - 1.0 - i);
-			riseList.add(rise);
-		}
-		
-		return new SignalStg(zero, one, fallList, riseList);
-	}
-
-	private SignalStg generateSignalStg(String signalName, double x, double y, boolean initToOne, SignalTransition.Type type) throws InvalidConnectionException {
-		VisualPlace zero = stg.createPlace(signalName + name0, null);
-		zero.setNamePositioning(Positioning.BOTTOM);
-		zero.setLabelPositioning(Positioning.TOP);
-		setPosition(zero, x + 0.0, y + 2.0);
-
-		VisualPlace one = stg.createPlace(signalName + name1, null);
-		one.setNamePositioning(Positioning.TOP);
-		one.setLabelPositioning(Positioning.BOTTOM);
-		setPosition(one, x + 0.0, y - 2.0);
-
-		if (initToOne) {
-			one.getReferencedPlace().setTokens(1);
-			zero.getReferencedPlace().setTokens(0);
-		} else {
-			one.getReferencedPlace().setTokens(0);
-			zero.getReferencedPlace().setTokens(1);
-		}
-
-		VisualSignalTransition fall = stg.createSignalTransition(signalName, type, SignalTransition.Direction.MINUS, null);
-		createConsumingArc(one, fall);
-		createProducingArc(fall, zero);
-		setPosition(fall, x + 3.0, y + 0.0);
-		
-		VisualSignalTransition rise = stg.createSignalTransition(signalName, type, SignalTransition.Direction.PLUS, null);
-		createConsumingArc(zero, rise);
-		createProducingArc(rise, one);
-		setPosition(rise, x - 3.0, y - 0.0);
-		
-		return new SignalStg(zero, one, fall, rise);
-	}
-
-	
-	public SignalStg getContactStg(VisualXmasContact contact) {
-		return contactMap.get(contact);
-	}
-	
-	private Point2D getComponentPosition(VisualXmasComponent component) {
-		AffineTransform transform = TransformHelper.getTransformToRoot(component);
-		double x =	xScaling * (transform.getTranslateX() + component.getX());
-		double y =	yScaling * (transform.getTranslateY() + component.getY());
-		return new Point2D.Double(x, y);
-	}
-
-	private void groupComponentStg(NodeStg nodeStg) {
-		stg.select(nodeStg.getAllNodes());
-		stg.groupSelection();
-	}
-
-	
+		for (VisualComponent component: remainingComponents) {
+			String name = getXmasModel().getNodeMathReference(component);
+			System.out.println("ERROR: Cannot derive an STG for xMAS component '" + name +"' of type " + component.getClass().getName());
+		}
+		getXmasModel().selectNone();
+	}
+
+	private void createReplicaReadArcBetweenDoneSignals(SignalStg from, SignalStg to, double yOffset) throws InvalidConnectionException {
+		double xT = to.fallList.get(0).getRootSpaceX();
+		double xP = to.one.getRootSpaceX();
+		double yZero = to.zero.getRootSpaceY();
+		double yOne = to.one.getRootSpaceY();
+		double xFall = ((xT > xP) ? xT + 6.0 : xT - 6.0);
+		double yFall = yZero;
+		double xRise = ((xT < xP) ? xT + 6.0 : xT - 6.0);
+		double yRise = ((yOne > yZero) ? yOne + 1.0 : yOne - 1.0);
+		createReplicaReadArcs(from.zero, to.fallList, new Point2D.Double(xFall, yFall + yOffset));
+		createReplicaReadArcs(from.one, to.riseList, new Point2D.Double(xRise, yRise + yOffset));
+	}
+
+	
+	private void createReplicaReadArcsFromDoneToClock(SignalStg dn) throws InvalidConnectionException {
+		clockControlSignals.add(dn);
+		int cnt = clockControlSignals.size();
+		double dx = 4.0;
+		int dy = (cnt % 2 == 0 ? 1 : -1) * cnt / 2;
+		for (VisualSignalTransition t: clockStg.fallList) {
+			createReplicaReadArc(dn.zero, t, dx, dy);
+		}
+		for (VisualSignalTransition t: clockStg.riseList) {
+			createReplicaReadArc(dn.one, t, -dx, dy);
+		}
+	}
+
+	private void createReplicaReadArcsFromClockToDone(SignalStg dn) throws InvalidConnectionException {
+		double xt = 0.0;
+		for (VisualSignalTransition t: dn.getAllTransitions()) {
+			xt += t.getRootSpaceX();
+		}
+		xt /= dn.getAllTransitions().size();
+		double xp = 0.0;
+		for (VisualPlace p: dn.getAllPlaces()) {
+			xp += p.getRootSpaceX(); 
+		}
+		xp /=  dn.getAllPlaces().size();
+		Point2D centerPos = getSignalCenterPosition(dn);
+		Point2D clk1Pos = centerPos;
+		if (dn.fallList.size() > 1) {
+			clk1Pos = new Point2D.Double(centerPos.getX() + (xt - xp), centerPos.getY());
+		}
+		Point2D clk0Pos = new Point2D.Double(centerPos.getX() + (xt - xp) / 2.0, centerPos.getY());
+		createReplicaReadArcs(clockStg.one, dn.fallList, clk1Pos);
+		createReplicaReadArcs(clockStg.zero, dn.riseList, clk0Pos);
+	}
+
+	private void createReplicaReadArcFromSignalToOracle(SignalStg signal, SignalStg oracle) throws InvalidConnectionException {
+		double x = oracle.fallList.get(0).getRootSpaceX();
+		double yFall = oracle.fallList.get(0).getRootSpaceY();
+		double yRise = oracle.riseList.get(0).getRootSpaceY();
+		double y = ((yFall > yRise) ? yFall + 2.0 : yFall - 2.0);
+		createReplicaReadArcs(signal.one, oracle.fallList, new Point2D.Double(x, y));
+	}
+
+	private void createReplicaReadArcsFromClockToCombinational(SignalStg rdy) throws InvalidConnectionException {
+		double xt = 0.0;
+		for (VisualSignalTransition t: rdy.getAllTransitions()) {
+			xt += t.getRootSpaceX();
+		}
+		xt /= rdy.getAllTransitions().size();
+		double xp = 0.0;
+		double yp = 0.0;
+		for (VisualPlace p: rdy.getAllPlaces()) {
+			xp += p.getRootSpaceX(); 
+			yp += p.getRootSpaceY(); 
+		}
+		xp /=  rdy.getAllPlaces().size();
+		yp /=  rdy.getAllPlaces().size();
+		Point2D clk0Pos = new Point2D.Double(xt + (xt - xp) / 2.0, yp);
+		createReplicaReadArcs(clockStg.zero, rdy.getAllTransitions(), clk0Pos);
+	}
+
+	private void createReplicaReadArcsFromClockToSequential(SignalStg rdy) throws InvalidConnectionException {
+		createReplicaReadArcs(clockStg.one, rdy.getAllTransitions(), getSignalCenterPosition(rdy));
+	}
+	
+	private SignalStg generateSignalStg(XmasStgType xmasSignalType, String signalName, double x, double y) throws InvalidConnectionException {
+		return generateSignalStg(xmasSignalType, signalName, new Point2D.Double(x, y), 1, 1);
+	}
+	
+	private SignalStg generateSignalStg(XmasStgType xmasSignalType, String signalName, double x, double y, int fallCount, int riseCount) throws InvalidConnectionException {
+		return generateSignalStg(xmasSignalType, signalName, new Point2D.Double(x, y), fallCount, riseCount);
+	}
+	
+	private SignalStg generateSignalStg(XmasStgType xmasSignalType, String signalName, Point2D pos, int fallCount, int riseCount) throws InvalidConnectionException {
+		SignalLayoutType layoutType = SignalLayoutType.LEFT_TO_RIGHT;
+		SignalTransition.Type type = Type.INTERNAL;
+		switch (xmasSignalType) {
+		case IDN:
+			layoutType = SignalLayoutType.LEFT_TO_RIGHT_INVERTED;
+			type = Type.OUTPUT;
+			break;
+		case IORACLE:
+			layoutType = SignalLayoutType.LEFT_TO_RIGHT;
+			type = Type.INPUT;
+			break;
+		case IRDY:
+			layoutType = SignalLayoutType.LEFT_TO_RIGHT;
+			type = Type.INTERNAL;
+			break;
+		case TDN:
+			layoutType = SignalLayoutType.RIGHT_TO_LEFT;
+			type = Type.OUTPUT;
+			break;
+		case TORACLE:
+			layoutType = SignalLayoutType.RIGHT_TO_LEFT_INVERTED;
+			type = Type.INPUT;
+			break;
+		case TRDY:
+			layoutType = SignalLayoutType.RIGHT_TO_LEFT_INVERTED;
+			type = Type.INTERNAL;
+			break;
+		default:
+			layoutType = SignalLayoutType.LEFT_TO_RIGHT;
+			type = Type.INTERNAL;
+			break;
+		}
+		return generateSignalStg(layoutType, signalName, pos, type, fallCount, riseCount);
+	}
+
+	public ContactStg getContactStg(VisualXmasContact contact) {
+		return ((contactMap == null) ? null : contactMap.get(contact));
+	}
+
+	private void putContactStg(VisualXmasContact contact, ContactStg s) {
+		if (contactMap == null) {
+			contactMap = new HashMap<>();
+		}
+		contactMap.put(contact, s);
+	}
+	
+	private SignalStg generateClockStg() throws InvalidConnectionException {
+		String name = "clk";
+		SignalStg clockStg = generateBasicSignalStg(name, 60.0, 25.0, Type.INPUT);
+		setSignalInitialState(clockStg, true);
+		return clockStg;
+	}
+	
+	private void connectClockStg()  throws InvalidConnectionException {
+		for(VisualSourceComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualSourceComponent.class)) {
+			SourceStg sourceStg = getSourceStg(component);
+			if (sourceStg != null) {
+				createReplicaReadArcsFromDoneToClock(sourceStg.o.dn);
+			}
+		}
+		for(VisualSinkComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualSinkComponent.class)) {
+			SinkStg sinkStg = getSinkStg(component);
+			if (sinkStg != null) {
+				createReplicaReadArcsFromDoneToClock(sinkStg.i.dn);
+			}
+		}
+		for(VisualFunctionComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualFunctionComponent.class)) {
+			FunctionStg funcStg = getFunctionStg(component);
+			if (funcStg != null) {
+				createReplicaReadArcsFromDoneToClock(funcStg.i.dn);
+				createReplicaReadArcsFromDoneToClock(funcStg.o.dn);
+			}
+		}
+		for(VisualForkComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualForkComponent.class)) {
+			ForkStg forkStg = getForkStg(component);
+			if (forkStg != null) {
+				createReplicaReadArcsFromDoneToClock(forkStg.i.dn);
+				createReplicaReadArcsFromDoneToClock(forkStg.a.dn);
+				createReplicaReadArcsFromDoneToClock(forkStg.b.dn);
+			}
+		}
+		for(VisualJoinComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualJoinComponent.class)) {
+			JoinStg joinStg = getJoinStg(component);
+			if (joinStg != null) {
+				createReplicaReadArcsFromDoneToClock(joinStg.a.dn);
+				createReplicaReadArcsFromDoneToClock(joinStg.b.dn);
+				createReplicaReadArcsFromDoneToClock(joinStg.o.dn);
+			}
+		}
+		for(VisualSwitchComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualSwitchComponent.class)) {
+			SwitchStg switchStg = getSwitchStg(component);
+			if (switchStg != null) {
+				createReplicaReadArcsFromDoneToClock(switchStg.i.dn);
+				createReplicaReadArcsFromDoneToClock(switchStg.a.dn);
+				createReplicaReadArcsFromDoneToClock(switchStg.b.dn);
+			}
+		}
+		for(VisualMergeComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualMergeComponent.class)) {
+			MergeStg mergeStg = getMergeStg(component);
+			if (mergeStg != null) {
+				createReplicaReadArcsFromDoneToClock(mergeStg.a.dn);
+				createReplicaReadArcsFromDoneToClock(mergeStg.b.dn);
+				createReplicaReadArcsFromDoneToClock(mergeStg.o.dn);
+			}
+		}
+		for(VisualQueueComponent component : Hierarchy.getDescendantsOfType(getXmasModel().getRoot(), VisualQueueComponent.class)) {
+			QueueStg queueStg = getQueueStg(component);
+			if (queueStg != null) {
+				createReplicaReadArcsFromDoneToClock(queueStg.i.dn);
+				createReplicaReadArcsFromDoneToClock(queueStg.o.dn);
+			}
+		}
+	}
+	
+	public SignalStg getClockStg() {
+		return clockStg;
+	}
+	
+
 	private SourceStg generateSourceStg(VisualSourceComponent component) throws InvalidConnectionException {
-		String name = xmas.getMathName(component);
+		String name = getXmasModel().getMathName(component);
 		Point2D pos = getComponentPosition(component);
-		SignalStg oracleStg = generateOutputContactStg(name + nameOracle, pos.getX() - 4.0, pos.getY(), false, Type.INPUT, 1, 1);
-		SignalStg oStg = null;
+		SignalStg oracle = generateSignalStg(XmasStgType.IORACLE, name + _ORACLE, pos.getX() - 10.0, pos.getY());
+		ContactStg o = null;
 		for (VisualXmasContact contact: component.getContacts()) {
 			if (contact.isOutput()) {
-				oStg = generateOutputContactStg(name + nameOirdy, pos.getX() + 4.0, pos.getY());
-				contactMap.put(contact, oStg);
-			}
-		}
-		if ((oStg != null) && (oracleStg != null)) {
-			createReadArc(oracleStg.zero, oStg.fallList.get(0));
-			createReadArc(oracleStg.one, oStg.riseList.get(0));
-		}
-		SourceStg sourceStg = new SourceStg(oStg, oracleStg);
-		groupComponentStg(sourceStg);
-		return sourceStg;
+				SignalStg rdy = generateSignalStg(XmasStgType.IRDY, name + _O_IRDY, pos.getX() + 0.0, pos.getY());
+				SignalStg dn = generateSignalStg(XmasStgType.IDN, name + _O_IDN, pos.getX() + 0.0, pos.getY() - 8.0, 1, 2);
+				o = new ContactStg(rdy, dn);
+				putContactStg(contact, o);
+			}
+		}
+		if (o != null) {
+			if (oracle != null) {
+				createReadArc(oracle.zero, o.rdy.fallList.get(0));
+				createReadArc(oracle.one, o.rdy.riseList.get(0));
+				createReadArc(oracle.zero, o.dn.riseList.get(0));
+				createReadArc(oracle.one, o.dn.riseList.get(1));
+			}
+			createReadArc(o.rdy.zero, o.dn.riseList.get(0));
+			createReadArc(o.rdy.one, o.dn.riseList.get(1));
+		}
+		return new SourceStg(o, oracle);
 	}
 
 	private void connectSourceStg(VisualSourceComponent component) throws InvalidConnectionException {
-		VisualXmasContact oContact = null;
-		for (VisualXmasContact contact: component.getContacts()) {
-			if (contact.isOutput()) {
-				oContact =  XmasUtils.getConnectedContact(xmas, contact);
-			}
-		}
 		SourceStg sourceStg = getSourceStg(component);
-		if ((sourceStg != null) && (oContact != null)) {
-			SignalStg oStg = getContactStg(oContact);
-			createReadArc(oStg.one, sourceStg.oracle.fallList.get(0));
+		if (sourceStg != null) {
+			VisualXmasContact oContact = null;
+			for (VisualXmasContact contact: component.getContacts()) {
+				if (contact.isOutput()) {
+					oContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				}
+			}
+			if (oContact != null) {
+				ContactStg o = getContactStg(oContact);
+				if (o != null) {
+					createReplicaReadArcFromSignalToOracle(o.rdy, sourceStg.oracle);
+				}
+				if (clockStg != null) {
+					createReplicaReadArcsFromClockToSequential(sourceStg.oracle);
+					createReplicaReadArcsFromClockToCombinational(sourceStg.o.rdy);
+					createReplicaReadArcsFromClockToDone(sourceStg.o.dn);
+				}
+			}
 		}
 	}
 
 	public SourceStg getSourceStg(VisualSourceComponent component) {
-		return sourceMap.get(component);
+		return ((sourceMap == null) ? null : sourceMap.get(component));
+	}
+
+	public void putSourceStg(VisualSourceComponent component, SourceStg stg) {
+		if (sourceMap == null) {
+			sourceMap = new HashMap<>();
+		}
+		sourceMap.put(component, stg);
 	}
 
 
 	private SinkStg generateSinkStg(VisualSinkComponent component) throws InvalidConnectionException {
-		String name = xmas.getMathName(component);
+		String name = getXmasModel().getMathName(component);
 		Point2D pos = getComponentPosition(component);
-		SignalStg oracleStg = generateInputContactStg(name + nameOracle, pos.getX() + 4.0, pos.getY(), false, Type.INPUT, 1, 1);
-		SignalStg iStg = null;
+		SignalStg oracle = generateSignalStg(XmasStgType.TORACLE, name + _ORACLE, pos.getX() + 10.0, pos.getY());
+		ContactStg i = null;
 		for (VisualXmasContact contact: component.getContacts()) {
 			if (contact.isInput()) {
-				iStg = generateInputContactStg(name + nameItrdy, pos.getX() - 4.0, pos.getY());
-				contactMap.put(contact, iStg);
-			}
-		}
-		if ((iStg != null) && (oracleStg != null)) {
-			createReadArc(oracleStg.zero, iStg.fallList.get(0));
-			createReadArc(oracleStg.one, iStg.riseList.get(0));
-		}
-		SinkStg sinkStg = new SinkStg(iStg, oracleStg);
-		groupComponentStg(sinkStg);
-		return sinkStg;
+				SignalStg rdy = generateSignalStg(XmasStgType.TRDY, name + _I_TRDY, pos.getX() - 0.0, pos.getY());
+				SignalStg dn = generateSignalStg(XmasStgType.TDN, name + _I_TDN, pos.getX() - 0.0, pos.getY() + 8.0, 1, 2);
+				i = new ContactStg(rdy, dn);
+				putContactStg(contact, i);
+			}
+		}
+		if (i != null) {
+			if (oracle != null) {
+				createReadArc(oracle.zero, i.rdy.fallList.get(0));
+				createReadArc(oracle.one, i.rdy.riseList.get(0));
+				createReadArc(oracle.zero, i.dn.riseList.get(0));
+				createReadArc(oracle.one, i.dn.riseList.get(1));
+			}
+			createReadArc(i.rdy.zero, i.dn.riseList.get(0));
+			createReadArc(i.rdy.one, i.dn.riseList.get(1));
+		}
+		return new SinkStg(i, oracle);
 	}
 
 	private void connectSinkStg(VisualSinkComponent component) throws InvalidConnectionException {
-		VisualXmasContact iContact = null;
-		for (VisualXmasContact contact: component.getContacts()) {
-			if (contact.isInput()) {
-				iContact =  XmasUtils.getConnectedContact(xmas, contact);
-			}
-		}
 		SinkStg sinkStg = getSinkStg(component);
-		if (iContact != null) {
-			SignalStg iStg = getContactStg(iContact);
-			if ((sinkStg != null) && (iStg !=null)) {
-				createReadArc(iStg.one, sinkStg.oracle.fallList.get(0));
+		if (sinkStg != null) {
+			VisualXmasContact iContact = null;
+			for (VisualXmasContact contact: component.getContacts()) {
+				if (contact.isInput()) {
+					iContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				}
+			}
+			if (iContact != null) {
+				ContactStg i = getContactStg(iContact);
+				if (i != null) {
+					createReplicaReadArcFromSignalToOracle(i.rdy, sinkStg.oracle);
+				}
+				if (clockStg != null) {
+					createReplicaReadArcsFromClockToSequential(sinkStg.oracle);
+					createReplicaReadArcsFromClockToCombinational(sinkStg.i.rdy);
+					createReplicaReadArcsFromClockToDone(sinkStg.i.dn);
+				}
 			}
 		}
 	}
 
 	public SinkStg getSinkStg(VisualSinkComponent component) {
-		return sinkMap.get(component);
+		return ((sinkMap == null) ? null : sinkMap.get(component));
+	}
+
+	public void putSinkStg(VisualSinkComponent component, SinkStg stg) {
+		if (sinkMap == null) {
+			sinkMap = new HashMap<>();
+		}
+		sinkMap.put(component, stg);
 	}
 
 	
 	private FunctionStg generateFunctionStg(VisualFunctionComponent component) throws InvalidConnectionException {
-		String name = xmas.getMathName(component);
+		String name = getXmasModel().getMathName(component);
 		Point2D pos = getComponentPosition(component);
-		SignalStg iStg = null;
-		SignalStg oStg = null;
+		ContactStg i = null;
+		ContactStg o = null;
 		for (VisualXmasContact contact: component.getContacts()) {
 			if (contact.isInput()) {
-				iStg = generateInputContactStg(name + nameItrdy, pos.getX(), pos.getY() + 3.0);
-				contactMap.put(contact, iStg);
+				SignalStg rdy = generateSignalStg(XmasStgType.TRDY, name + _I_TRDY, pos.getX(), pos.getY() + 4.0);
+				SignalStg dn = generateSignalStg(XmasStgType.TDN, name + _I_TDN, pos.getX(), pos.getY() + 12.0, 1, 2);
+				i = new ContactStg(rdy, dn);
+				putContactStg(contact, i);
 			} else {
-				oStg = generateOutputContactStg(name + nameOirdy, pos.getX(), pos.getY() - 3.0);
-				contactMap.put(contact, oStg);
+				SignalStg rdy = generateSignalStg(XmasStgType.IRDY, name + _O_IRDY, pos.getX(), pos.getY() - 4.0);
+				SignalStg dn = generateSignalStg(XmasStgType.IDN, name + _O_IDN, pos.getX(), pos.getY() - 12.0, 1, 2);
+				o = new ContactStg(rdy, dn);
+				putContactStg(contact, o);
 			}
 		}
-		FunctionStg functionStg = new FunctionStg(iStg, oStg);
-		groupComponentStg(functionStg);
-		return functionStg;
+		if (i != null) {
+			createReadArc(i.rdy.zero, i.dn.riseList.get(0));
+			createReadArc(i.rdy.one, i.dn.riseList.get(1));
+		}
+		if (o != null) {
+			createReadArc(o.rdy.zero, o.dn.riseList.get(0));
+			createReadArc(o.rdy.one, o.dn.riseList.get(1));
+		}
+		return new FunctionStg(i, o);
 	}
 
 	private void connectFunctionStg(VisualFunctionComponent component) throws InvalidConnectionException {
-		VisualXmasContact iContact = null;
-		VisualXmasContact oContact = null;
-		for (VisualXmasContact contact: component.getContacts()) {
-			if (contact.isInput()) {
-				iContact =  XmasUtils.getConnectedContact(xmas, contact);
-			} else {
-				oContact =  XmasUtils.getConnectedContact(xmas, contact);
-			}
-		}
 		FunctionStg functionStg = getFunctionStg(component);
-		if (iContact != null) {
-			SignalStg iStg = getContactStg(iContact);
-			if ((functionStg != null) && (iStg != null)) {
-				createReadArc(iStg.zero, functionStg.o.fallList.get(0));
-				createReadArc(iStg.one, functionStg.o.riseList.get(0));
-			}
-		}
-		if (oContact != null) {
-			SignalStg oStg = getContactStg(oContact);
-			if ((functionStg != null) && (oStg != null)) {
-				createReadArc(oStg.zero, functionStg.i.fallList.get(0));
-				createReadArc(oStg.one, functionStg.i.riseList.get(0));
-			}
-		}
+		if (functionStg != null) {
+			VisualXmasContact iContact = null;
+			VisualXmasContact oContact = null;
+			for (VisualXmasContact contact: component.getContacts()) {
+				if (contact.isInput()) {
+					iContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				} else {
+					oContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				}
+			}
+			if (iContact != null) {
+				ContactStg i = getContactStg(iContact);
+				if (i != null) {
+					createReplicaReadArcBetweenSignals(i.rdy, functionStg.o.rdy);
+					createReplicaReadArcBetweenDoneSignals(i.dn, functionStg.o.dn, 0.0);
+					createReplicaReadArc(i.rdy.zero, functionStg.o.dn.riseList.get(0));
+					createReplicaReadArc(i.rdy.one, functionStg.o.dn.riseList.get(1));
+				}
+			}
+			if (oContact != null) {
+				ContactStg o = getContactStg(oContact);
+				if (o != null) {
+					createReplicaReadArcBetweenSignals(o.rdy, functionStg.i.rdy);
+					createReplicaReadArcBetweenDoneSignals(o.dn, functionStg.i.dn, 0.0);
+					createReplicaReadArc(o.rdy.zero, functionStg.i.dn.riseList.get(0));
+					createReplicaReadArc(o.rdy.one, functionStg.i.dn.riseList.get(1));
+				}
+			}
+			if (clockStg != null) {
+				createReplicaReadArcsFromClockToDone(functionStg.i.dn);
+				createReplicaReadArcsFromClockToCombinational(functionStg.i.rdy);
+				createReplicaReadArcsFromClockToDone(functionStg.o.dn);
+				createReplicaReadArcsFromClockToCombinational(functionStg.o.rdy);
+			}
+		}
+
 	}
 
 	public FunctionStg getFunctionStg(VisualFunctionComponent component) {
-		return functionMap.get(component);
+		return ((functionMap == null) ? null : functionMap.get(component));
+	}
+
+	public void putFunctionStg(VisualFunctionComponent component, FunctionStg stg) {
+		if (functionMap == null) {
+			functionMap = new HashMap<>();
+		}
+		functionMap.put(component, stg);
 	}
 
 	
 	private ForkStg generateForkStg(VisualForkComponent component) throws InvalidConnectionException {
-		String name = xmas.getMathName(component);
+		String name = getXmasModel().getMathName(component);
 		Point2D pos = getComponentPosition(component);
-		SignalStg iStg = null;
-		SignalStg aStg = null;
-		SignalStg bStg = null;
+		ContactStg i = null;
+		ContactStg a = null;
+		ContactStg b = null;
 		for (VisualXmasContact contact: component.getContacts()) {
 			if (contact.isInput()) {
-				iStg = generateInputContactStg(name + nameItrdy, pos.getX(), pos.getY(), false, Type.INTERNAL, 2, 1);
-				contactMap.put(contact, iStg);
-			} else if (aStg == null) {
-				aStg = generateOutputContactStg(name + nameAirdy, pos.getX(), pos.getY() - 5.0, false, Type.INTERNAL, 2, 1);
-				contactMap.put(contact, aStg);
+				SignalStg rdy = generateSignalStg(XmasStgType.TRDY, name + _I_TRDY, pos.getX(), pos.getY() - 4.0, 2, 1);
+				SignalStg dn = generateSignalStg(XmasStgType.TDN, name + _I_TDN, pos.getX(), pos.getY() + 4.0, 1, 3);
+				i = new ContactStg(rdy, dn);
+				putContactStg(contact, i);
+			} else if (a == null) {
+				SignalStg rdy = generateSignalStg(XmasStgType.IRDY, name + _A_IRDY, pos.getX(), pos.getY() - 12.0, 2, 1);
+				SignalStg dn = generateSignalStg(XmasStgType.IDN, name + _A_IDN, pos.getX(), pos.getY() - 20.0, 1, 3);
+				a = new ContactStg(rdy, dn);
+				putContactStg(contact, a);
 			} else {
-				bStg = generateOutputContactStg(name + nameBirdy, pos.getX(), pos.getY() + 5.0, false, Type.INTERNAL, 2, 1);
-				contactMap.put(contact, bStg);
+				SignalStg rdy = generateSignalStg(XmasStgType.IRDY, name + _B_IRDY, pos.getX(), pos.getY() + 20.0, 2, 1);
+				SignalStg dn = generateSignalStg(XmasStgType.IDN, name + _B_IDN, pos.getX(), pos.getY() + 12.0, 1, 3);
+				b = new ContactStg(rdy, dn);
+				putContactStg(contact, b);
 			}
 		}
-		ForkStg forkStg = new ForkStg(iStg, aStg, bStg);
-		groupComponentStg(forkStg);
-		return forkStg;
+		if (i != null) {
+			createReadArc(i.rdy.zero, i.dn.riseList.get(0));
+			createReadArc(i.rdy.zero, i.dn.riseList.get(1));
+			createReadArc(i.rdy.one, i.dn.riseList.get(2));
+		}
+		if (a != null) {
+			createReadArc(a.rdy.zero, a.dn.riseList.get(0));
+			createReadArc(a.rdy.zero, a.dn.riseList.get(1));
+			createReadArc(a.rdy.one, a.dn.riseList.get(2));
+		}
+		if (b != null) {
+			createReadArc(b.rdy.zero, b.dn.riseList.get(0));
+			createReadArc(b.rdy.zero, b.dn.riseList.get(1));
+			createReadArc(b.rdy.one, b.dn.riseList.get(2));
+		}
+		return new ForkStg(i, a, b);
 	}
 
 	private void connectForkStg(VisualForkComponent component) throws InvalidConnectionException {
-		VisualXmasContact iContact = null;
-		VisualXmasContact aContact = null;
-		VisualXmasContact bContact = null;
-		for (VisualXmasContact contact: component.getContacts()) {
-			if (contact.isInput()) {
-				iContact =  XmasUtils.getConnectedContact(xmas, contact);
-			} else if (aContact == null) {
-				aContact =  XmasUtils.getConnectedContact(xmas, contact);
-			} else {
-				bContact =  XmasUtils.getConnectedContact(xmas, contact);
-			}
-		}
 		ForkStg forkStg = getForkStg(component);
-		if (iContact != null) {
-			SignalStg iStg = getContactStg(iContact);
-			if ((forkStg != null) && (iStg != null)) {
-				createReadArc(iStg.zero, forkStg.a.fallList.get(0));
-				createReadArc(iStg.zero, forkStg.b.fallList.get(0));
-				createReadArc(iStg.one, forkStg.a.riseList.get(0));
-				createReadArc(iStg.one, forkStg.b.riseList.get(0));
-			}
-		}
-		if (aContact != null) {
-			SignalStg aStg = getContactStg(aContact);
-			if ((forkStg != null) && (aStg != null)) {
-				createReadArc(aStg.zero, forkStg.i.fallList.get(0));
-				createReadArc(aStg.zero, forkStg.b.fallList.get(1));
-				createReadArc(aStg.one, forkStg.i.riseList.get(0));
-				createReadArc(aStg.one, forkStg.b.riseList.get(0));
-			}
-		}
-		if (bContact != null) {
-			SignalStg bStg = getContactStg(bContact);
-			if ((forkStg != null) && (bStg != null)) {
-				createReadArc(bStg.zero, forkStg.i.fallList.get(1));
-				createReadArc(bStg.zero, forkStg.a.fallList.get(1));
-				createReadArc(bStg.one, forkStg.i.riseList.get(0));
-				createReadArc(bStg.one, forkStg.a.riseList.get(0));
+		if (forkStg != null) { 
+			VisualXmasContact iContact = null;
+			VisualXmasContact aContact = null;
+			VisualXmasContact bContact = null;
+			for (VisualXmasContact contact: component.getContacts()) {
+				if (contact.isInput()) {
+					iContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				} else if (aContact == null) {
+					aContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				} else {
+					bContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				}
+			}
+			if (iContact != null) {
+				ContactStg i = getContactStg(iContact);
+				if (i != null) {
+					createReplicaReadArc(i.rdy.zero, forkStg.a.rdy.fallList.get(1), -6.0, 0.0);
+					createReplicaReadArc(i.rdy.zero, forkStg.b.rdy.fallList.get(1), -6.0, 0.0);
+					createReplicaReadArc(i.rdy.one, forkStg.a.rdy.riseList.get(0), -6.0, 0.0);
+					createReplicaReadArc(i.rdy.one, forkStg.b.rdy.riseList.get(0), -6.0, 0.0);
+					createReplicaReadArcBetweenDoneSignals(i.dn, forkStg.a.dn, 0.0);
+					createReplicaReadArcBetweenDoneSignals(i.dn, forkStg.b.dn, 0.0);
+					createReplicaReadArc(i.rdy.zero, forkStg.a.dn.riseList.get(1), -6.0, 0.0);
+					createReplicaReadArc(i.rdy.one, forkStg.a.dn.riseList.get(2), -6.0, -1.0);
+					createReplicaReadArc(i.rdy.zero, forkStg.b.dn.riseList.get(1), -6.0, 0.0);
+					createReplicaReadArc(i.rdy.one, forkStg.b.dn.riseList.get(2), -6.0, -1.0);
+				}
+			}
+			if (aContact != null) {
+				ContactStg a = getContactStg(aContact);
+				if (a != null) {
+					createReplicaReadArc(a.rdy.zero, forkStg.i.rdy.fallList.get(0), +6.0, 0.0);
+					createReplicaReadArc(a.rdy.zero, forkStg.b.rdy.fallList.get(0), -6.0, 0.0);
+					createReplicaReadArc(a.rdy.one, forkStg.i.rdy.riseList.get(0), +6.0, -1.0);
+					createReplicaReadArc(a.rdy.one, forkStg.b.rdy.riseList.get(0), -6.0, +1.0);
+					createReplicaReadArcBetweenDoneSignals(a.dn, forkStg.i.dn, -1.0);
+					createReplicaReadArc(a.rdy.zero, forkStg.b.dn.riseList.get(0), -6.0, 0.0);
+					createReplicaReadArc(a.rdy.one, forkStg.b.dn.riseList.get(2), -6.0, 0.0);
+					createReplicaReadArc(a.rdy.zero, forkStg.i.dn.riseList.get(0), +6.0, 0.0);
+					createReplicaReadArc(a.rdy.one, forkStg.i.dn.riseList.get(2), +6.0, 0.0);
+				}
+			}
+			if (bContact != null) {
+				ContactStg b = getContactStg(bContact);
+				if (b != null) {
+					createReplicaReadArc(b.rdy.zero, forkStg.i.rdy.fallList.get(1), +6.0, 0.0);
+					createReplicaReadArc(b.rdy.zero, forkStg.a.rdy.fallList.get(0), -6.0, 0.0);
+					createReplicaReadArc(b.rdy.one, forkStg.i.rdy.riseList.get(0), +6.0, 0.0);
+					createReplicaReadArc(b.rdy.one, forkStg.a.rdy.riseList.get(0), -6.0, +1.0);
+					createReplicaReadArcBetweenDoneSignals(b.dn, forkStg.i.dn, 0.0);
+					createReplicaReadArc(b.rdy.zero, forkStg.a.dn.riseList.get(0), -6.0, 0.0);
+					createReplicaReadArc(b.rdy.one, forkStg.a.dn.riseList.get(2), -6.0, 0.0);
+					createReplicaReadArc(b.rdy.zero, forkStg.i.dn.riseList.get(1), +6.0, 0.0);
+					createReplicaReadArc(b.rdy.one, forkStg.i.dn.riseList.get(2), +6.0, +1.0);
+				}
+			}
+			if (clockStg != null) {
+				createReplicaReadArcsFromClockToDone(forkStg.i.dn);
+				createReplicaReadArcsFromClockToCombinational(forkStg.i.rdy);
+				createReplicaReadArcsFromClockToDone(forkStg.a.dn);
+				createReplicaReadArcsFromClockToCombinational(forkStg.a.rdy);
+				createReplicaReadArcsFromClockToDone(forkStg.b.dn);
+				createReplicaReadArcsFromClockToCombinational(forkStg.b.rdy);
 			}
 		}
 	}
 
 	public ForkStg getForkStg(VisualForkComponent component) {
-		return forkMap.get(component);
+		return ((forkMap == null) ? null : forkMap.get(component));
+	}
+
+	public void putForkStg(VisualForkComponent component, ForkStg stg) {
+		if (forkMap == null) {
+			forkMap = new HashMap<>();
+		}
+		forkMap.put(component, stg);
 	}
 
 	
 	private JoinStg generateJoinStg(VisualJoinComponent component) throws InvalidConnectionException {
-		String name = xmas.getMathName(component);
+		String name = getXmasModel().getMathName(component);
 		Point2D pos = getComponentPosition(component);
-		SignalStg aStg = null;
-		SignalStg bStg = null;
-		SignalStg oStg = null;
+		ContactStg a = null;
+		ContactStg b = null;
+		ContactStg o = null;
 		for (VisualXmasContact contact: component.getContacts()) {
 			if (contact.isOutput()) {
-				oStg = generateOutputContactStg(name + nameOirdy, pos.getX(), pos.getY(), false, Type.INTERNAL, 2, 1);
-				contactMap.put(contact, oStg);
-			} else if (aStg == null) {
-				aStg = generateInputContactStg(name + nameAtrdy, pos.getX(), pos.getY() - 5.0, false, Type.INTERNAL, 2, 1);
-				contactMap.put(contact, aStg);
+				SignalStg rdy = generateSignalStg(XmasStgType.IRDY, name + _O_IRDY, pos.getX(), pos.getY() + 4.0, 2, 1);
+				SignalStg dn = generateSignalStg(XmasStgType.IDN, name + _O_IDN, pos.getX(), pos.getY() - 4.0, 1, 3);
+				o = new ContactStg(rdy, dn);
+				putContactStg(contact, o);
+			} else if (a == null) {
+				SignalStg rdy = generateSignalStg(XmasStgType.TRDY, name + _A_TRDY, pos.getX(), pos.getY() - 20.0, 2, 1);
+				SignalStg dn = generateSignalStg(XmasStgType.TDN, name + _A_TDN, pos.getX(), pos.getY() - 12.0, 1, 3);
+				a = new ContactStg(rdy, dn);
+				putContactStg(contact, a);
 			} else {
-				bStg = generateInputContactStg(name + nameBtrdy, pos.getX(), pos.getY() + 5.0, false, Type.INTERNAL, 2, 1);
-				contactMap.put(contact, bStg);
+				SignalStg rdy = generateSignalStg(XmasStgType.TRDY, name + _B_TRDY, pos.getX(), pos.getY() + 12.0, 2, 1);
+				SignalStg dn = generateSignalStg(XmasStgType.TDN, name + _B_TDN, pos.getX(), pos.getY() + 20.0, 1, 3);
+				b = new ContactStg(rdy, dn);
+				putContactStg(contact, b);
 			}
 		}
-		JoinStg joinStg = new JoinStg(aStg, bStg, oStg);
-		groupComponentStg(joinStg);
-		return joinStg;
+		if (a != null) {
+			createReadArc(a.rdy.zero, a.dn.riseList.get(0));
+			createReadArc(a.rdy.zero, a.dn.riseList.get(1));
+			createReadArc(a.rdy.one, a.dn.riseList.get(2));
+		}
+		if (b != null) {
+			createReadArc(b.rdy.zero, b.dn.riseList.get(0));
+			createReadArc(b.rdy.zero, b.dn.riseList.get(1));
+			createReadArc(b.rdy.one, b.dn.riseList.get(2));
+		}
+		if (o != null) {
+			createReadArc(o.rdy.zero, o.dn.riseList.get(0));
+			createReadArc(o.rdy.zero, o.dn.riseList.get(1));
+			createReadArc(o.rdy.one, o.dn.riseList.get(2));
+		}
+		return new JoinStg(a, b, o);
 	}
 
 	private void connectJoinStg(VisualJoinComponent component) throws InvalidConnectionException {
-		VisualXmasContact aContact = null;
-		VisualXmasContact bContact = null;
-		VisualXmasContact oContact = null;
-		for (VisualXmasContact contact: component.getContacts()) {
-			if (contact.isOutput()) {
-				oContact =  XmasUtils.getConnectedContact(xmas, contact);
-			} else if (aContact == null) {
-				aContact =  XmasUtils.getConnectedContact(xmas, contact);
-			} else {
-				bContact =  XmasUtils.getConnectedContact(xmas, contact);
-			}
-		}
 		JoinStg joinStg = getJoinStg(component);
-		if (aContact != null) {
-			SignalStg aStg = getContactStg(aContact);
-			if ((joinStg != null) && (aStg != null)) {
-				createReadArc(aStg.zero, joinStg.b.fallList.get(1));
-				createReadArc(aStg.zero, joinStg.o.fallList.get(0));
-				createReadArc(aStg.one, joinStg.b.riseList.get(0));
-				createReadArc(aStg.one, joinStg.o.riseList.get(0));
-			}
-		}
-		if (bContact != null) {
-			SignalStg bStg = getContactStg(bContact);
-			if ((joinStg != null) && (bStg != null)) {
-				createReadArc(bStg.zero, joinStg.a.fallList.get(1));
-				createReadArc(bStg.zero, joinStg.o.fallList.get(1));
-				createReadArc(bStg.one, joinStg.a.riseList.get(0));
-				createReadArc(bStg.one, joinStg.o.riseList.get(0));
-			}
-		}
-		if (oContact != null) {
-			SignalStg oStg = getContactStg(oContact);
-			if ((joinStg != null) && (oStg != null)) {
-				createReadArc(oStg.zero, joinStg.a.fallList.get(0));
-				createReadArc(oStg.zero, joinStg.b.fallList.get(0));
-				createReadArc(oStg.one, joinStg.a.riseList.get(0));
-				createReadArc(oStg.one, joinStg.b.riseList.get(0));
+		if (joinStg != null) {
+			VisualXmasContact aContact = null;
+			VisualXmasContact bContact = null;
+			VisualXmasContact oContact = null;
+			for (VisualXmasContact contact: component.getContacts()) {
+				if (contact.isOutput()) {
+					oContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				} else if (aContact == null) {
+					aContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				} else {
+					bContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				}
+			}
+			if (aContact != null) {
+				ContactStg a = getContactStg(aContact);
+				if (a != null) {
+					createReplicaReadArc(a.rdy.zero, joinStg.b.rdy.fallList.get(0), +6.0, 0.0);
+					createReplicaReadArc(a.rdy.zero, joinStg.o.rdy.fallList.get(1), -6.0, 0.0);
+					createReplicaReadArc(a.rdy.one, joinStg.b.rdy.riseList.get(0), +6.0, -1.0);
+					createReplicaReadArc(a.rdy.one, joinStg.o.rdy.riseList.get(0), -6.0, 0.0);
+					createReplicaReadArcBetweenDoneSignals(a.dn, joinStg.o.dn, 0.0);
+					createReplicaReadArc(a.rdy.zero, joinStg.o.dn.riseList.get(1), -6.0, 0.0);
+					createReplicaReadArc(a.rdy.one, joinStg.o.dn.riseList.get(2), -6.0, -1.0);
+					createReplicaReadArc(a.rdy.zero, joinStg.b.dn.riseList.get(0), +6.0, 0.0);
+					createReplicaReadArc(a.rdy.one, joinStg.b.dn.riseList.get(2), +6.0, 0.0);
+				}
+			}
+			if (bContact != null) {
+				ContactStg b = getContactStg(bContact);
+				if (b != null) {
+					createReplicaReadArc(b.rdy.zero, joinStg.a.rdy.fallList.get(1), +6.0, 0.0);
+					createReplicaReadArc(b.rdy.zero, joinStg.o.rdy.fallList.get(0), -6.0, 0.0);
+					createReplicaReadArc(b.rdy.one, joinStg.a.rdy.riseList.get(0), +6.0, 0.0);
+					createReplicaReadArc(b.rdy.one, joinStg.o.rdy.riseList.get(0), -6.0, +1.0);
+					createReplicaReadArcBetweenDoneSignals(b.dn, joinStg.o.dn, +1.0);
+					createReplicaReadArc(b.rdy.zero, joinStg.o.dn.riseList.get(0), -6.0, 0.0);
+					createReplicaReadArc(b.rdy.one, joinStg.o.dn.riseList.get(2), -6.0, 0.0);
+					createReplicaReadArc(b.rdy.zero, joinStg.a.dn.riseList.get(1), +6.0, 0.0);
+					createReplicaReadArc(b.rdy.one, joinStg.a.dn.riseList.get(2), +6.0, +1.0);
+				}
+			}
+			if (oContact != null) {
+				ContactStg o = getContactStg(oContact);
+				if (o != null) {
+					createReplicaReadArc(o.rdy.zero, joinStg.a.rdy.fallList.get(0), +6.0, 0.0);
+					createReplicaReadArc(o.rdy.zero, joinStg.b.rdy.fallList.get(1), +6.0, 0.0);
+					createReplicaReadArc(o.rdy.one, joinStg.a.rdy.riseList.get(0), +6.0, -1.0);
+					createReplicaReadArc(o.rdy.one, joinStg.b.rdy.riseList.get(0), +6.0, 0.0);
+					createReplicaReadArcBetweenDoneSignals(o.dn, joinStg.a.dn, 0.0);
+					createReplicaReadArcBetweenDoneSignals(o.dn, joinStg.b.dn, 0.0);
+					createReplicaReadArc(o.rdy.zero, joinStg.a.dn.riseList.get(0), +6.0, 0.0);
+					createReplicaReadArc(o.rdy.one, joinStg.a.dn.riseList.get(2), +6.0, 0.0);
+					createReplicaReadArc(o.rdy.zero, joinStg.b.dn.riseList.get(1), +6.0, 0.0);
+					createReplicaReadArc(o.rdy.one, joinStg.b.dn.riseList.get(2), +6.0, +1.0);
+				}
 			}
 		}
 	}
 
 	public JoinStg getJoinStg(VisualJoinComponent component) {
-		return joinMap.get(component);
+		return ((joinMap == null) ? null : joinMap.get(component));
+	}
+
+	public void putJoinStg(VisualJoinComponent component, JoinStg stg) {
+		if (joinMap == null) {
+			joinMap = new HashMap<>();
+		}
+		joinMap.put(component, stg);
+	}
+
+	
+	private SwitchStg generateSwitchStg(VisualSwitchComponent component) throws InvalidConnectionException {
+		String name = getXmasModel().getMathName(component);
+		Point2D pos = getComponentPosition(component);
+		ContactStg i = null;
+		ContactStg a = null;
+		ContactStg b = null;
+		SignalStg oracle = generateSignalStg(XmasStgType.IORACLE, name + _ORACLE, pos.getX() + 12.0, pos.getY());
+		for (VisualXmasContact contact: component.getContacts()) {
+			if (contact.isInput()) {
+				SignalStg rdy = generateSignalStg(XmasStgType.TRDY, name + _I_TRDY, pos.getX(), pos.getY() - 4.0, 1, 2);
+				SignalStg dn = generateSignalStg(XmasStgType.TDN, name + _I_TDN, pos.getX(), pos.getY() + 4.0, 1, 3);
+				i = new ContactStg(rdy, dn);
+				putContactStg(contact, i);
+			} else if (a == null) {
+				SignalStg rdy = generateSignalStg(XmasStgType.IRDY, name + _A_IRDY, pos.getX(), pos.getY() - 12.0, 2, 1);
+				SignalStg dn = generateSignalStg(XmasStgType.IDN, name + _A_IDN, pos.getX(), pos.getY() - 20.0, 1, 3);
+				a = new ContactStg(rdy, dn);
+				putContactStg(contact, a);
+			} else {
+				SignalStg rdy = generateSignalStg(XmasStgType.IRDY, name + _B_IRDY, pos.getX(), pos.getY() + 20.0, 2, 1);
+				SignalStg dn = generateSignalStg(XmasStgType.IDN, name + _B_IDN, pos.getX(), pos.getY() + 12.0, 1, 3);
+				b = new ContactStg(rdy, dn);
+				putContactStg(contact, b);
+			}
+		}
+		if (i != null) {
+			createReadArc(i.rdy.zero, i.dn.riseList.get(0));
+			createReadArc(i.rdy.one, i.dn.riseList.get(1));
+			createReadArc(i.rdy.one, i.dn.riseList.get(2));
+		}
+		if (a != null) {
+			createReadArc(a.rdy.zero, a.dn.riseList.get(0));
+			createReadArc(a.rdy.zero, a.dn.riseList.get(1));
+			createReadArc(a.rdy.one, a.dn.riseList.get(2));
+		}
+		if (b != null) {
+			createReadArc(b.rdy.zero, b.dn.riseList.get(0));
+			createReadArc(b.rdy.zero, b.dn.riseList.get(1));
+			createReadArc(b.rdy.one, b.dn.riseList.get(2));
+		}
+		if ((oracle != null) && (a != null) && (b != null)) {
+			createReadArcs(a.rdy.zero, oracle.getAllTransitions());
+			createReadArcs(b.rdy.zero, oracle.getAllTransitions());
+			createReplicaReadArc(oracle.zero, a.rdy.fallList.get(1), -6.0, 0.0);
+			createReplicaReadArc(oracle.zero, a.dn.riseList.get(1), -6.0, 0.0);
+			createReplicaReadArc(oracle.zero, b.rdy.riseList.get(0), -6.0, +1.0);
+			createReplicaReadArc(oracle.zero, b.dn.riseList.get(2), -6.0, -1.0);
+			createReplicaReadArc(oracle.one, a.rdy.riseList.get(0), -6.0, +1.0);
+			createReplicaReadArc(oracle.one, a.dn.riseList.get(2), -6.0, -1.0);
+			createReplicaReadArc(oracle.one, b.rdy.fallList.get(1), -6.0, 0.0);
+			createReplicaReadArc(oracle.one, b.dn.riseList.get(1), -6.0, 0.0);
+		}
+		return new SwitchStg(i, a, b, oracle);
+	}
+
+	private void connectSwitchStg(VisualSwitchComponent component) throws InvalidConnectionException {
+		SwitchStg switchStg = getSwitchStg(component);
+		if (switchStg != null) { 
+			VisualXmasContact iContact = null;
+			VisualXmasContact aContact = null;
+			VisualXmasContact bContact = null;
+			for (VisualXmasContact contact: component.getContacts()) {
+				if (contact.isInput()) {
+					iContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				} else if (aContact == null) {
+					aContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				} else {
+					bContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				}
+			}
+			if (iContact != null) {
+				ContactStg i = getContactStg(iContact);
+				if (i != null) {
+					createReplicaReadArc(i.rdy.zero, switchStg.a.rdy.fallList.get(0), -6.0, 0.0);
+					createReplicaReadArc(i.rdy.one, switchStg.a.rdy.riseList.get(0), -6.0, 0.0);
+					createReplicaReadArc(i.rdy.zero, switchStg.b.rdy.fallList.get(0), -6.0, 0.0);
+					createReplicaReadArc(i.rdy.one, switchStg.b.rdy.riseList.get(0), -6.0, 0.0);
+					createReplicaReadArcBetweenDoneSignals(i.dn, switchStg.a.dn, 0.0);
+					createReplicaReadArcBetweenDoneSignals(i.dn, switchStg.b.dn, 0.0);
+					createReplicaReadArc(i.rdy.zero, switchStg.a.dn.riseList.get(0), -6.0, 0.0);
+					createReplicaReadArc(i.rdy.one, switchStg.a.dn.riseList.get(2), -6.0,  0.0);
+					createReplicaReadArc(i.rdy.zero, switchStg.b.dn.riseList.get(0), -6.0, 0.0);
+					createReplicaReadArc(i.rdy.one, switchStg.b.dn.riseList.get(2), -6.0, 0.0);
+				}
+			}
+			if (aContact != null) {
+				ContactStg a = getContactStg(aContact);
+				if (a != null) {
+					createReplicaReadArc(a.rdy.zero, switchStg.i.rdy.fallList.get(0), +6.0, 0.0);
+					createReplicaReadArc(a.rdy.one, switchStg.i.rdy.riseList.get(1), +6.0, 0.0);
+					createReplicaReadArcBetweenDoneSignals(a.dn, switchStg.i.dn, -1.0);
+					createReplicaReadArc(a.rdy.zero, switchStg.i.dn.riseList.get(0), +6.0, 0.0);
+					createReplicaReadArc(a.rdy.one, switchStg.i.dn.riseList.get(1), +6.0, +1.0);
+				}
+			}
+			if (bContact != null) {
+				ContactStg b = getContactStg(bContact);
+				if (b != null) {
+					createReplicaReadArc(b.rdy.zero, switchStg.i.rdy.fallList.get(0), +6.0, +1.0);
+					createReplicaReadArc(b.rdy.one, switchStg.i.rdy.riseList.get(0), +6.0, 0.0);
+					createReplicaReadArcBetweenDoneSignals(b.dn, switchStg.i.dn, 0.0);
+					createReplicaReadArc(b.rdy.zero, switchStg.i.dn.riseList.get(0), +6.0, +1.0);
+					createReplicaReadArc(b.rdy.one, switchStg.i.dn.riseList.get(2), +6.0, +1.0);
+				}
+			}
+			if (clockStg != null) {
+				createReplicaReadArcsFromClockToDone(switchStg.i.dn);
+				createReplicaReadArcsFromClockToCombinational(switchStg.i.rdy);
+				createReplicaReadArcsFromClockToDone(switchStg.a.dn);
+				createReplicaReadArcsFromClockToCombinational(switchStg.a.rdy);
+				createReplicaReadArcsFromClockToDone(switchStg.b.dn);
+				createReplicaReadArcsFromClockToCombinational(switchStg.b.rdy);
+				createReplicaReadArcsFromClockToSequential(switchStg.oracle);
+			}
+		}
+	}
+
+	public SwitchStg getSwitchStg(VisualSwitchComponent component) {
+		return ((switchMap == null) ? null : switchMap.get(component));
+	}
+
+	public void putSwitchStg(VisualSwitchComponent component, SwitchStg stg) {
+		if (switchMap == null) {
+			switchMap = new HashMap<>();
+		}
+		switchMap.put(component, stg);
+	}
+
+	
+	private MergeStg generateMergeStg(VisualMergeComponent component) throws InvalidConnectionException {
+		String name = getXmasModel().getMathName(component);
+		Point2D pos = getComponentPosition(component);
+		ContactStg a = null;
+		ContactStg b = null;
+		ContactStg o = null;
+		for (VisualXmasContact contact: component.getContacts()) {
+			if (contact.isOutput()) {
+				SignalStg rdy = generateSignalStg(XmasStgType.IRDY, name + _O_IRDY, pos.getX(), pos.getY() + 4.0, 1, 2);
+				SignalStg dn = generateSignalStg(XmasStgType.IDN, name + _O_IDN, pos.getX(), pos.getY() - 4.0, 1, 3);
+				o = new ContactStg(rdy, dn);
+				putContactStg(contact, o);
+			} else if (a == null) {
+				SignalStg rdy = generateSignalStg(XmasStgType.TRDY, name + _A_TRDY, pos.getX(), pos.getY() - 20.0, 2, 1);
+				SignalStg dn = generateSignalStg(XmasStgType.TDN, name + _A_TDN, pos.getX(), pos.getY() - 12.0, 1, 3);
+				a = new ContactStg(rdy, dn);
+				putContactStg(contact, a);
+			} else {
+				SignalStg rdy = generateSignalStg(XmasStgType.TRDY, name + _B_TRDY, pos.getX(), pos.getY() + 12.0, 2, 1);
+				SignalStg dn = generateSignalStg(XmasStgType.TDN, name + _B_TDN, pos.getX(), pos.getY() + 20.0, 1, 3);
+				b = new ContactStg(rdy, dn);
+				putContactStg(contact, b);
+			}
+		}
+		if (a != null) {
+			createReadArc(a.rdy.zero, a.dn.riseList.get(0));
+			createReadArc(a.rdy.zero, a.dn.riseList.get(1));
+			createReadArc(a.rdy.one, a.dn.riseList.get(2));
+		}
+		if (b != null) {
+			createReadArc(b.rdy.zero, b.dn.riseList.get(0));
+			createReadArc(b.rdy.zero, b.dn.riseList.get(1));
+			createReadArc(b.rdy.one, b.dn.riseList.get(2));
+		}
+		if (o != null) {
+			createReadArc(o.rdy.zero, o.dn.riseList.get(0));
+			createReadArc(o.rdy.one, o.dn.riseList.get(1));
+			createReadArc(o.rdy.one, o.dn.riseList.get(2));
+		}
+		return new MergeStg(a, b, o);
+	}
+
+	private void connectMergeStg(VisualMergeComponent component) throws InvalidConnectionException {
+		MergeStg mergeStg = getMergeStg(component);
+		if (mergeStg != null) {
+			VisualXmasContact aContact = null;
+			VisualXmasContact bContact = null;
+			VisualXmasContact oContact = null;
+			for (VisualXmasContact contact: component.getContacts()) {
+				if (contact.isOutput()) {
+					oContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				} else if (aContact == null) {
+					aContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				} else {
+					bContact =  XmasUtils.getConnectedContact(getXmasModel(), contact);
+				}
+			}
+			if (aContact != null) {
+				ContactStg a = getContactStg(aContact);
+				if (a != null) {
+					createReplicaReadArc(a.rdy.zero, mergeStg.a.rdy.fallList.get(1), +6.0, 0.0);
+					createReplicaReadArc(a.rdy.zero, mergeStg.o.rdy.fallList.get(0), -6.0, -1.0);
+					createReplicaReadArc(a.rdy.one, mergeStg.a.rdy.riseList.get(0), +6.0, 0.0);
+					createReplicaReadArc(a.rdy.one, mergeStg.o.rdy.riseList.get(0), -6.0, 0.0);
+					createReplicaReadArcBetweenDoneSignals(a.dn, mergeStg.a.dn, -1.0);
+					createReplicaReadArcBetweenDoneSignals(a.dn, mergeStg.o.dn, 0.0);
+					createReplicaReadArc(a.rdy.zero, mergeStg.a.dn.riseList.get(1), +6.0, 0.0);
+					createReplicaReadArc(a.rdy.zero, mergeStg.o.dn.riseList.get(0), -6.0, -1.0);
+					createReplicaReadArc(a.rdy.one, mergeStg.a.dn.riseList.get(2), +6.0, +1.0);
+					createReplicaReadArc(a.rdy.one, mergeStg.o.dn.riseList.get(2), -6.0, -1.0);
+				}
+			}
+			if (bContact != null) {
+				ContactStg b = getContactStg(bContact);
+				if (b != null) {
+					createReplicaReadArc(b.rdy.zero, mergeStg.b.rdy.fallList.get(1), +6.0, 0.0);
+					createReplicaReadArc(b.rdy.zero, mergeStg.o.rdy.fallList.get(0), -6.0, 0.0);
+					createReplicaReadArc(b.rdy.one, mergeStg.b.rdy.riseList.get(0), +6.0, 0.0);
+					createReplicaReadArc(b.rdy.one, mergeStg.o.rdy.riseList.get(1), -6.0, 0.0);
+					createReplicaReadArcBetweenDoneSignals(b.dn, mergeStg.b.dn, -1.0);
+					createReplicaReadArcBetweenDoneSignals(b.dn, mergeStg.o.dn, +1.0);
+					createReplicaReadArc(b.rdy.zero, mergeStg.b.dn.riseList.get(1), +6.0, 0.0);
+					createReplicaReadArc(b.rdy.zero, mergeStg.o.dn.riseList.get(0), -6.0, 0.0);
+					createReplicaReadArc(b.rdy.one, mergeStg.b.dn.riseList.get(2), +6.0, +1.0);
+					createReplicaReadArc(b.rdy.one, mergeStg.o.dn.riseList.get(1), -6.0, -1.0);
+				}
+			}
+			if (oContact != null) {
+				ContactStg o = getContactStg(oContact);
+				if (o != null) {
+					createReplicaReadArc(o.rdy.zero, mergeStg.a.rdy.fallList.get(0), +6.0, 0.0);
+					createReplicaReadArc(o.rdy.zero, mergeStg.b.rdy.fallList.get(0), +6.0, 0.0);
+					createReplicaReadArc(o.rdy.one, mergeStg.a.rdy.riseList.get(0), +6.0, -1.0);
+					createReplicaReadArc(o.rdy.one, mergeStg.b.rdy.riseList.get(0), +6.0, -1.0);
+					createReplicaReadArcBetweenDoneSignals(o.dn, mergeStg.a.dn, 0.0);
+					createReplicaReadArcBetweenDoneSignals(o.dn, mergeStg.b.dn, 0.0);
+					createReplicaReadArc(o.rdy.zero, mergeStg.a.dn.riseList.get(0), +6.0, 0.0);
+					createReplicaReadArc(o.rdy.zero, mergeStg.b.dn.riseList.get(0), +6.0, 0.0);
+					createReplicaReadArc(o.rdy.one, mergeStg.a.dn.riseList.get(2), +6.0, 0.0);
+					createReplicaReadArc(o.rdy.one, mergeStg.b.dn.riseList.get(2), +6.0, 0.0);
+				}
+			}
+		}
+	}
+
+	public MergeStg getMergeStg(VisualMergeComponent component) {
+		return ((mergeMap == null) ? null : mergeMap.get(component));
+	}
+
+	public void putMergeStg(VisualMergeComponent component, MergeStg stg) {
+		if (mergeMap == null) {
+			mergeMap = new HashMap<>();
+		}
+		mergeMap.put(component, stg);
 	}
 
 	
 	private QueueStg generateQueueStg(VisualQueueComponent component) throws InvalidConnectionException {
-		String name = xmas.getMathName(component);
+		String name = getXmasModel().getMathName(component);
 		Point2D pos = getComponentPosition(component);
 		int capacity = component.getReferencedQueueComponent().getCapacity();
-		SignalStg iStg = null;
-		SignalStg oStg = null;
-		ArrayList<SignalStg> memList = new ArrayList<>(capacity);
-		ArrayList<SignalStg> headList = new ArrayList<>(capacity);
-		ArrayList<SignalStg> tailList = new ArrayList<>(capacity);
-		double xContact = 5.0 * capacity + 5.0;
+		ContactStg i = null;
+		ContactStg o = null;
+		ArrayList<SlotStg> slotList = new ArrayList<>(capacity);
+		double xContact = 0.5 * QUEUE_SLOT_SPACING * (capacity + 1);
 		for (VisualXmasContact contact: component.getContacts()) {
 			if (contact.isOutput()) {
-				oStg = generateOutputContactStg(name + nameOirdy, pos.getX() + xContact, pos.getY() - 5.0, false, Type.INTERNAL, 1, capacity);
-				contactMap.put(contact, oStg);
+				SignalStg rdy = generateSignalStg(XmasStgType.IRDY, name + _O_IRDY, pos.getX() + xContact, pos.getY(), 1, capacity);
+				SignalStg dn = generateSignalStg(XmasStgType.IDN, name + _O_IDN, pos.getX() + xContact, pos.getY() - 12.0, 1, capacity + 1);
+				o = new ContactStg(rdy, dn);
+				putContactStg(contact, o);
 			} else {
-				iStg = generateInputContactStg(name + nameItrdy, pos.getX() - xContact, pos.getY() + 5.0, true, Type.INTERNAL, 1, capacity);
-				contactMap.put(contact, iStg);
-			}
-		}
-		for (int i = 0; i < capacity; i++) {
-			double xSlot = 10.0 * (i - 0.5 * (capacity - 1));
-			char c = (char)i;
-			c += 'A';
-			SignalStg memStg = generateSignalStg(name + nameMem + c, pos.getX() + xSlot, pos.getY(), false, SignalTransition.Type.INPUT);
-			SignalStg headStg = generateSignalStg(name + nameHead + c, pos.getX() + xSlot, pos.getY() - 8.0, (i == 0), SignalTransition.Type.INTERNAL);
-			SignalStg tailStg = generateSignalStg(name + nameTail + c, pos.getX() + xSlot, pos.getY() + 8.0, false, SignalTransition.Type.INTERNAL);
-			memList.add(memStg);
-			headList.add(headStg);
-			tailList.add(tailStg);
-		}
-		// Internal connections
-		for (int i = 0; i < capacity; i++) {
-			SignalStg mem = memList.get(i);
-			createReadArc(iStg.one, mem.riseList.get(0));
-			createReadArc(oStg.one, mem.fallList.get(0));
-			createReadArc(mem.one, iStg.fallList.get(0));
-			createReadArc(mem.one, oStg.riseList.get(i));
-			createReadArc(mem.zero, iStg.riseList.get(i));
-			createReadArc(mem.zero, oStg.fallList.get(0));
-			for (int j = 0; j < capacity; j++) {
-				SignalStg head = headList.get(j);
-				SignalStg tail = tailList.get(j);
-				if (i == j) {
-					createReadArc(mem.one, head.fallList.get(0));
-					createReadArc(mem.one, tail.riseList.get(0));
-					createReadArc(mem.zero, head.riseList.get(0));
-					createReadArc(mem.zero, tail.fallList.get(0));
-					createReadArc(head.one, mem.riseList.get(0));
-					createReadArc(tail.one, mem.fallList.get(0));
-				} else {
-					createReadArc(mem.one, head.riseList.get(0));
-					createReadArc(mem.zero, tail.riseList.get(0));
-				}
-			}
-		}
-		QueueStg queueStg = new QueueStg(iStg, oStg, memList, headList, tailList);
-		groupComponentStg(queueStg);
-		return queueStg;
+				SignalStg rdy = generateSignalStg(XmasStgType.TRDY, name + _I_TRDY, pos.getX() - xContact, pos.getY(), 1, capacity);
+				setSignalInitialState(rdy, true);
+				SignalStg dn = generateSignalStg(XmasStgType.TDN, name + _I_TDN, pos.getX() - xContact, pos.getY() + 12.0, 1, capacity + 1);
+				i = new ContactStg(rdy, dn);
+				putContactStg(contact, i);
+			}
+		}
+		for (int idx = 0; idx < capacity; idx++) {
+			double xSlot = QUEUE_SLOT_SPACING * (idx - 0.5 * (capacity - 1));
+			char suffix = (char)idx;
+			suffix += 'A';
+			SignalStg mem = generateBasicSignalStg(name + _MEM + suffix, pos.getX() + xSlot, pos.getY(), SignalTransition.Type.INPUT);
+			ContactStg hd = null;
+			{
+				SignalStg rdy = generateSignalStg(XmasStgType.IRDY, name + _HEAD + suffix +_RDY, pos.getX() + xSlot, pos.getY() - 8.0);
+				SignalStg dn = generateSignalStg(XmasStgType.IDN, name + _HEAD + suffix + _DN, pos.getX() + xSlot, pos.getY() - 16.0, 4, 3);
+				hd = new ContactStg(rdy, dn);
+			}
+			ContactStg tl = null;
+			{
+				SignalStg rdy = generateSignalStg(XmasStgType.TRDY, name + _TAIL + suffix +_RDY, pos.getX() + xSlot, pos.getY() + 8.0);
+				SignalStg dn = generateSignalStg(XmasStgType.TDN, name + _TAIL + suffix + _DN, pos.getX() + xSlot, pos.getY() + 16.0, 4, 3);
+				setSignalInitialState(rdy, (idx == 0));
+				tl = new ContactStg(rdy, dn);
+			}
+			SlotStg slot = new SlotStg(mem, hd, tl);
+			slotList.add(slot);
+			// Connections of head within slot
+			createReplicaReadArc(slot.hd.rdy.one, slot.mem.fallList.get(0), 0.0, -2.0);
+			createReplicaReadArc(slot.mem.zero, slot.hd.rdy.fallList.get(0), -6.0, 0.0);
+			createReplicaReadArc(slot.mem.one, slot.hd.rdy.riseList.get(0), -6.0, 0.0);
+			createReplicaReadArc(slot.mem.zero, slot.hd.dn.fallList.get(1), +6.0, -1.0);
+			createReplicaReadArc(slot.mem.zero, slot.hd.dn.riseList.get(0), -6.0, 0.0);
+			createReplicaReadArcs(slot.mem.one, Arrays.asList(slot.hd.dn.riseList.get(2), slot.hd.dn.riseList.get(1)), -6.0, 0.0);
+			createReplicaReadArc(slot.mem.one, slot.hd.dn.fallList.get(0), -6.0, 0.0);
+			createReplicaReadArc(slot.mem.one, slot.hd.dn.fallList.get(2), -6.0, 0.0);
+			createReadArc(slot.hd.rdy.zero, slot.hd.dn.riseList.get(0));
+			createReadArc(slot.hd.rdy.zero, slot.hd.dn.fallList.get(3));
+			createReadArc(slot.hd.rdy.one, slot.hd.dn.riseList.get(2));
+			createReadArc(slot.hd.rdy.one, slot.hd.dn.fallList.get(2));
+			createReadArc(slot.hd.rdy.one, slot.hd.dn.fallList.get(1));
+			createReadArc(slot.hd.rdy.one, slot.hd.dn.fallList.get(0));
+			// Connection of tail within slot
+			createReplicaReadArc(slot.tl.rdy.one, slot.mem.riseList.get(0), 0.0, +2.0);
+			createReplicaReadArc(slot.mem.zero, slot.tl.rdy.riseList.get(0), +6.0, 0.0);
+			createReplicaReadArc(slot.mem.one, slot.tl.rdy.fallList.get(0), +6.0, 0.0);
+			createReplicaReadArc(slot.mem.one, slot.tl.dn.fallList.get(1), -6.0, +1.0);
+			createReplicaReadArc(slot.mem.one, slot.tl.dn.riseList.get(0), +6.0, 0.0);
+			createReplicaReadArcs(slot.mem.zero, Arrays.asList(slot.tl.dn.riseList.get(2), slot.tl.dn.riseList.get(1)), +6.0, 0.0);
+			createReplicaReadArc(slot.mem.zero, slot.tl.dn.fallList.get(0), +6.0, 0.0);
+			createReplicaReadArc(slot.mem.zero, slot.tl.dn.fallList.get(2), +6.0, 0.0);
+			createReadArc(slot.tl.rdy.zero, slot.tl.dn.riseList.get(0));
+			createReadArc(slot.tl.rdy.zero, slot.tl.dn.fallList.get(3));
+			createReadArc(slot.tl.rdy.one, slot.tl.dn.riseList.get(2));
+			createReadArc(slot.tl.rdy.one, slot.tl.dn.fallList.get(2));
+			createReadArc(slot.tl.rdy.one, slot.tl.dn.fallList.get(1));
+			createReadArc(slot.tl.rdy.one, slot.tl.dn.fallList.get(0));
+		}
+		for (int idx = 0; idx < capacity; idx++) {
+			SlotStg slot = slotList.get(idx);
+			// Connections with input port
+			createReplicaReadArc(i.rdy.one, slot.mem.riseList.get(0), -6.0, -1.0);
+			createReplicaReadArc(i.rdy.one, slot.tl.dn.fallList.get(1), -6.0, 0.0);
+			createReplicaReadArc(i.rdy.zero, slot.tl.dn.fallList.get(2), +6.0, -1.0);