[jboss-svn-commits] JBL Code SVN: r15530 - in labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main: rules/org/drools/examples and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Oct 2 20:20:35 EDT 2007


Author: KrisVerlaenen
Date: 2007-10-02 20:20:35 -0400 (Tue, 02 Oct 2007)
New Revision: 15530

Modified:
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/cdss/CDSSExample.java
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/cdss/Terminology.java
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/NumberGuess.rf
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/NumberGuess.rfm
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/ClinicalPathwayX.rf
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/ClinicalPathwayX.rfm
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/GenericRules.drl
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentX.rf
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentX.rfm
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentY.rf
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentY.rfm
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/generation.rf
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/generation.rfm
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/killAll.rf
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/killAll.rfm
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/registerNeighbor.rf
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/registerNeighbor.rfm
Log:
JBRULES-1244: Ruleflows should have a package name
 - Process now has a packageName

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/cdss/CDSSExample.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/cdss/CDSSExample.java	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/cdss/CDSSExample.java	2007-10-03 00:20:35 UTC (rev 15530)
@@ -39,7 +39,7 @@
             workingMemory.insert(patient);
             
             // Go!
-            Diagnose diagnose = new Diagnose(Terminology.DIAGNOSE_X_TYPE_UNKNOWN);
+            Diagnose diagnose = new Diagnose(Terminology.DIAGNOSE_X);
             workingMemory.insert(diagnose);
             workingMemory.fireAllRules();
             

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/cdss/Terminology.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/cdss/Terminology.java	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/cdss/Terminology.java	2007-10-03 00:20:35 UTC (rev 15530)
@@ -4,6 +4,7 @@
 	
 	String DIAGNOSE_HEALTHY = "Diagnose healthy";
 	
+	String DIAGNOSE_X = "Diagnose disease X";
 	String DIAGNOSE_X_TYPE_UNKNOWN = "Diagnose disease X: Type unknown";
 	String DIAGNOSE_X_TYPE1 = "Diagnose disease X: Type 1";
 	String DIAGNOSE_X_TYPE2 = "Diagnose disease X: Type 2";

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/NumberGuess.rf
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/NumberGuess.rf	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/NumberGuess.rf	2007-10-03 00:20:35 UTC (rev 15530)
@@ -3,261 +3,261 @@
     <default>
       <elements id="2">
         <entry>
-          <string>5-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper id="3" serialization="custom">
+          <string>20-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper id="3" serialization="custom">
             <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
               <default>
                 <constraint id="4">
-                  <x>466</x>
-                  <y>338</y>
+                  <x>8</x>
+                  <y>296</y>
                   <width>80</width>
                   <height>40</height>
                 </constraint>
-                <element class="org.drools.ruleflow.core.impl.EndNodeImpl" id="5">
-                  <id>5</id>
-                  <name>End</name>
-                  <incomingConnections id="6">
-                    <org.drools.ruleflow.core.impl.ConnectionImpl id="7">
+                <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="5">
+                  <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="6">
+                    <consequence>System.out.println( &quot;Your guess was too high&quot; );</consequence>
+                  </action>
+                  <id>20</id>
+                  <name>Too High</name>
+                  <incomingConnections id="7">
+                    <org.drools.ruleflow.core.impl.ConnectionImpl id="8">
                       <type>1</type>
-                      <from class="org.drools.ruleflow.core.impl.JoinImpl" id="8">
+                      <from class="org.drools.ruleflow.core.impl.SplitImpl" id="9">
                         <type>2</type>
-                        <id>11</id>
-                        <name>No more guesses Join</name>
-                        <incomingConnections id="9">
-                          <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
-                            <type>1</type>
-                            <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="11">
-                              <ruleFlowGroup>No more Guesses</ruleFlowGroup>
-                              <id>13</id>
-                              <name>No more Guesses</name>
-                              <incomingConnections id="12">
-                                <org.drools.ruleflow.core.impl.ConnectionImpl id="13">
-                                  <type>1</type>
-                                  <from class="org.drools.ruleflow.core.impl.SplitImpl" id="14">
-                                    <type>2</type>
-                                    <constraints id="15">
-                                      <entry>
-                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="16">
+                        <constraints id="10">
+                          <entry>
+                            <org.drools.ruleflow.core.impl.ConnectionImpl id="11">
+                              <type>1</type>
+                              <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="9"/>
+                              <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="12">
+                                <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="13">
+                                  <consequence>System.out.println( &quot;You guessed correctly&quot; );</consequence>
+                                </action>
+                                <id>18</id>
+                                <name>Guess Correct</name>
+                                <incomingConnections id="14">
+                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="11"/>
+                                </incomingConnections>
+                                <outgoingConnections id="15">
+                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="16">
+                                    <type>1</type>
+                                    <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="12"/>
+                                    <to class="org.drools.ruleflow.core.impl.JoinImpl" id="17">
+                                      <type>2</type>
+                                      <id>11</id>
+                                      <name>No more guesses Join</name>
+                                      <incomingConnections id="18">
+                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="19">
                                           <type>1</type>
-                                          <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="14"/>
-                                          <to class="org.drools.ruleflow.core.impl.JoinImpl" id="17">
-                                            <type>2</type>
-                                            <id>10</id>
-                                            <name>More guesses Join</name>
-                                            <incomingConnections id="18">
-                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="19">
+                                          <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="20">
+                                            <ruleFlowGroup>No more Guesses</ruleFlowGroup>
+                                            <id>13</id>
+                                            <name>No more Guesses</name>
+                                            <incomingConnections id="21">
+                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="22">
                                                 <type>1</type>
-                                                <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="20">
-                                                  <id>1</id>
-                                                  <name>Start</name>
-                                                  <incomingConnections id="21"/>
-                                                  <outgoingConnections id="22">
-                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="19"/>
-                                                  </outgoingConnections>
-                                                </from>
-                                                <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="17"/>
-                                              </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="16"/>
-                                            </incomingConnections>
-                                            <outgoingConnections id="23">
-                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="24">
-                                                <type>1</type>
-                                                <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="17"/>
-                                                <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="25">
-                                                  <ruleFlowGroup>Guess</ruleFlowGroup>
-                                                  <id>2</id>
-                                                  <name>Guess</name>
-                                                  <incomingConnections id="26">
-                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="24"/>
-                                                  </incomingConnections>
-                                                  <outgoingConnections id="27">
-                                                    <org.drools.ruleflow.core.impl.ConnectionImpl id="28">
-                                                      <type>1</type>
-                                                      <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="25"/>
-                                                      <to class="org.drools.ruleflow.core.impl.SplitImpl" id="29">
-                                                        <type>2</type>
-                                                        <constraints id="30">
-                                                          <entry>
-                                                            <org.drools.ruleflow.core.impl.ConnectionImpl id="31">
+                                                <from class="org.drools.ruleflow.core.impl.SplitImpl" id="23">
+                                                  <type>2</type>
+                                                  <constraints id="24">
+                                                    <entry>
+                                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="22"/>
+                                                      <org.drools.ruleflow.core.impl.ConstraintImpl id="25">
+                                                        <name>No More Guesses</name>
+                                                        <constraint>GameRules( allowed : allowedGuesses  )&#x0D;
+Game(  guessCount &gt;= allowed )</constraint>
+                                                        <priority>1</priority>
+                                                      </org.drools.ruleflow.core.impl.ConstraintImpl>
+                                                    </entry>
+                                                    <entry>
+                                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="26">
+                                                        <type>1</type>
+                                                        <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="23"/>
+                                                        <to class="org.drools.ruleflow.core.impl.JoinImpl" id="27">
+                                                          <type>2</type>
+                                                          <id>10</id>
+                                                          <name>More guesses Join</name>
+                                                          <incomingConnections id="28">
+                                                            <org.drools.ruleflow.core.impl.ConnectionImpl id="29">
                                                               <type>1</type>
-                                                              <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="29"/>
-                                                              <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="32">
-                                                                <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="33">
-                                                                  <consequence>System.out.println( &quot;Your guess was too low&quot; );</consequence>
-                                                                </action>
-                                                                <id>19</id>
-                                                                <name>Too Low</name>
-                                                                <incomingConnections id="34">
-                                                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="31"/>
-                                                                </incomingConnections>
-                                                                <outgoingConnections id="35">
-                                                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="36">
-                                                                    <type>1</type>
-                                                                    <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="32"/>
-                                                                    <to class="org.drools.ruleflow.core.impl.JoinImpl" id="37">
-                                                                      <type>2</type>
-                                                                      <id>8</id>
-                                                                      <name>incorrect guess</name>
-                                                                      <incomingConnections id="38">
-                                                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="39">
-                                                                          <type>1</type>
-                                                                          <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="40">
-                                                                            <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="41">
-                                                                              <consequence>System.out.println( &quot;Your guess was too high&quot; );</consequence>
-                                                                            </action>
-                                                                            <id>20</id>
-                                                                            <name>Too High</name>
-                                                                            <incomingConnections id="42">
-                                                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="43">
-                                                                                <type>1</type>
-                                                                                <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="29"/>
-                                                                                <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="40"/>
-                                                                              </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                                            </incomingConnections>
-                                                                            <outgoingConnections id="44">
-                                                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="39"/>
-                                                                            </outgoingConnections>
-                                                                          </from>
-                                                                          <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="37"/>
-                                                                        </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="36"/>
-                                                                      </incomingConnections>
-                                                                      <outgoingConnections id="45">
-                                                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="46">
-                                                                          <type>1</type>
-                                                                          <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="37"/>
-                                                                          <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="47">
-                                                                            <ruleFlowGroup>Guess incorrect</ruleFlowGroup>
-                                                                            <id>7</id>
-                                                                            <name>Guess incorrect</name>
-                                                                            <incomingConnections id="48">
-                                                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="46"/>
-                                                                            </incomingConnections>
-                                                                            <outgoingConnections id="49">
-                                                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="50">
-                                                                                <type>1</type>
-                                                                                <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="47"/>
-                                                                                <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="14"/>
-                                                                              </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                                            </outgoingConnections>
-                                                                          </to>
-                                                                        </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                                      </outgoingConnections>
-                                                                    </to>
-                                                                  </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                              <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="30">
+                                                                <id>1</id>
+                                                                <name>Start</name>
+                                                                <incomingConnections id="31"/>
+                                                                <outgoingConnections id="32">
+                                                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="29"/>
                                                                 </outgoingConnections>
-                                                              </to>
+                                                              </from>
+                                                              <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="27"/>
                                                             </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                            <org.drools.ruleflow.core.impl.ConstraintImpl id="51">
-                                                              <name>too low</name>
-                                                              <constraint>RandomNumber( randomValue : value ) &amp;&amp;&#x0D;
-Guess( value &lt; randomValue )</constraint>
-                                                              <priority>1</priority>
-                                                            </org.drools.ruleflow.core.impl.ConstraintImpl>
-                                                          </entry>
-                                                          <entry>
-                                                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="43"/>
-                                                            <org.drools.ruleflow.core.impl.ConstraintImpl id="52">
-                                                              <name>too high</name>
-                                                              <constraint>RandomNumber( randomValue : value ) &amp;&amp;&#x0D;
-Guess( value &gt; randomValue )</constraint>
-                                                              <priority>1</priority>
-                                                            </org.drools.ruleflow.core.impl.ConstraintImpl>
-                                                          </entry>
-                                                          <entry>
-                                                            <org.drools.ruleflow.core.impl.ConnectionImpl id="53">
+                                                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="26"/>
+                                                          </incomingConnections>
+                                                          <outgoingConnections id="33">
+                                                            <org.drools.ruleflow.core.impl.ConnectionImpl id="34">
                                                               <type>1</type>
-                                                              <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="29"/>
-                                                              <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="54">
-                                                                <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="55">
-                                                                  <consequence>System.out.println( &quot;You guessed correctly&quot; );</consequence>
-                                                                </action>
-                                                                <id>18</id>
-                                                                <name>Guess Correct</name>
-                                                                <incomingConnections id="56">
-                                                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="53"/>
+                                                              <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="27"/>
+                                                              <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="35">
+                                                                <ruleFlowGroup>Guess</ruleFlowGroup>
+                                                                <id>2</id>
+                                                                <name>Guess</name>
+                                                                <incomingConnections id="36">
+                                                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="34"/>
                                                                 </incomingConnections>
-                                                                <outgoingConnections id="57">
-                                                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="58">
+                                                                <outgoingConnections id="37">
+                                                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="38">
                                                                     <type>1</type>
-                                                                    <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="54"/>
-                                                                    <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="8"/>
+                                                                    <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="35"/>
+                                                                    <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="9"/>
                                                                   </org.drools.ruleflow.core.impl.ConnectionImpl>
                                                                 </outgoingConnections>
                                                               </to>
                                                             </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                            <org.drools.ruleflow.core.impl.ConstraintImpl id="59">
-                                                              <name>correct</name>
-                                                              <constraint>RandomNumber( randomValue : value ) &amp;&amp;&#x0D;
-Guess( value == randomValue )</constraint>
-                                                              <priority>1</priority>
-                                                            </org.drools.ruleflow.core.impl.ConstraintImpl>
-                                                          </entry>
-                                                        </constraints>
-                                                        <id>6</id>
-                                                        <name>Guess  correct?</name>
-                                                        <incomingConnections id="60">
-                                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="28"/>
+                                                          </outgoingConnections>
+                                                        </to>
+                                                      </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                      <org.drools.ruleflow.core.impl.ConstraintImpl id="39">
+                                                        <name>More guesses</name>
+                                                        <constraint>GameRules( allowed : allowedGuesses  )&#x0D;
+Game(  guessCount &lt; allowed )</constraint>
+                                                        <priority>1</priority>
+                                                      </org.drools.ruleflow.core.impl.ConstraintImpl>
+                                                    </entry>
+                                                  </constraints>
+                                                  <id>9</id>
+                                                  <name>More Guesses?</name>
+                                                  <incomingConnections id="40">
+                                                    <org.drools.ruleflow.core.impl.ConnectionImpl id="41">
+                                                      <type>1</type>
+                                                      <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="42">
+                                                        <ruleFlowGroup>Guess incorrect</ruleFlowGroup>
+                                                        <id>7</id>
+                                                        <name>Guess incorrect</name>
+                                                        <incomingConnections id="43">
+                                                          <org.drools.ruleflow.core.impl.ConnectionImpl id="44">
+                                                            <type>1</type>
+                                                            <from class="org.drools.ruleflow.core.impl.JoinImpl" id="45">
+                                                              <type>2</type>
+                                                              <id>8</id>
+                                                              <name>incorrect guess</name>
+                                                              <incomingConnections id="46">
+                                                                <org.drools.ruleflow.core.impl.ConnectionImpl id="47">
+                                                                  <type>1</type>
+                                                                  <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
+                                                                  <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="45"/>
+                                                                </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                                <org.drools.ruleflow.core.impl.ConnectionImpl id="48">
+                                                                  <type>1</type>
+                                                                  <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="49">
+                                                                    <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="50">
+                                                                      <consequence>System.out.println( &quot;Your guess was too low&quot; );</consequence>
+                                                                    </action>
+                                                                    <id>19</id>
+                                                                    <name>Too Low</name>
+                                                                    <incomingConnections id="51">
+                                                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="52">
+                                                                        <type>1</type>
+                                                                        <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="9"/>
+                                                                        <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="49"/>
+                                                                      </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                                    </incomingConnections>
+                                                                    <outgoingConnections id="53">
+                                                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="48"/>
+                                                                    </outgoingConnections>
+                                                                  </from>
+                                                                  <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="45"/>
+                                                                </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                              </incomingConnections>
+                                                              <outgoingConnections id="54">
+                                                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="44"/>
+                                                              </outgoingConnections>
+                                                            </from>
+                                                            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="42"/>
+                                                          </org.drools.ruleflow.core.impl.ConnectionImpl>
                                                         </incomingConnections>
-                                                        <outgoingConnections id="61">
-                                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="53"/>
-                                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="31"/>
-                                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="43"/>
+                                                        <outgoingConnections id="55">
+                                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="41"/>
                                                         </outgoingConnections>
-                                                      </to>
+                                                      </from>
+                                                      <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="23"/>
                                                     </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                  </incomingConnections>
+                                                  <outgoingConnections id="56">
+                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="26"/>
+                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="22"/>
                                                   </outgoingConnections>
-                                                </to>
+                                                </from>
+                                                <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="20"/>
                                               </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                            </incomingConnections>
+                                            <outgoingConnections id="57">
+                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="19"/>
                                             </outgoingConnections>
+                                          </from>
+                                          <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="17"/>
+                                        </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="16"/>
+                                      </incomingConnections>
+                                      <outgoingConnections id="58">
+                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="59">
+                                          <type>1</type>
+                                          <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="17"/>
+                                          <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="60">
+                                            <id>5</id>
+                                            <name>End</name>
+                                            <incomingConnections id="61">
+                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="59"/>
+                                            </incomingConnections>
+                                            <outgoingConnections id="62"/>
                                           </to>
                                         </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                        <org.drools.ruleflow.core.impl.ConstraintImpl id="62">
-                                          <name>More guesses</name>
-                                          <constraint>GameRules( allowed : allowedGuesses  )&#x0D;
-Game(  guessCount &lt; allowed )</constraint>
-                                          <priority>1</priority>
-                                        </org.drools.ruleflow.core.impl.ConstraintImpl>
-                                      </entry>
-                                      <entry>
-                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="13"/>
-                                        <org.drools.ruleflow.core.impl.ConstraintImpl id="63">
-                                          <name>No More Guesses</name>
-                                          <constraint>GameRules( allowed : allowedGuesses  )&#x0D;
-Game(  guessCount &gt;= allowed )</constraint>
-                                          <priority>1</priority>
-                                        </org.drools.ruleflow.core.impl.ConstraintImpl>
-                                      </entry>
-                                    </constraints>
-                                    <id>9</id>
-                                    <name>More Guesses?</name>
-                                    <incomingConnections id="64">
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="50"/>
-                                    </incomingConnections>
-                                    <outgoingConnections id="65">
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="16"/>
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="13"/>
-                                    </outgoingConnections>
-                                  </from>
-                                  <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="11"/>
-                                </org.drools.ruleflow.core.impl.ConnectionImpl>
-                              </incomingConnections>
-                              <outgoingConnections id="66">
-                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
-                              </outgoingConnections>
-                            </from>
-                            <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="8"/>
-                          </org.drools.ruleflow.core.impl.ConnectionImpl>
-                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="58"/>
+                                      </outgoingConnections>
+                                    </to>
+                                  </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                </outgoingConnections>
+                              </to>
+                            </org.drools.ruleflow.core.impl.ConnectionImpl>
+                            <org.drools.ruleflow.core.impl.ConstraintImpl id="63">
+                              <name>correct</name>
+                              <constraint>RandomNumber( randomValue : value ) &amp;&amp;&#x0D;
+Guess( value == randomValue )</constraint>
+                              <priority>1</priority>
+                            </org.drools.ruleflow.core.impl.ConstraintImpl>
+                          </entry>
+                          <entry>
+                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="52"/>
+                            <org.drools.ruleflow.core.impl.ConstraintImpl id="64">
+                              <name>too low</name>
+                              <constraint>RandomNumber( randomValue : value ) &amp;&amp;&#x0D;
+Guess( value &lt; randomValue )</constraint>
+                              <priority>1</priority>
+                            </org.drools.ruleflow.core.impl.ConstraintImpl>
+                          </entry>
+                          <entry>
+                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="8"/>
+                            <org.drools.ruleflow.core.impl.ConstraintImpl id="65">
+                              <name>too high</name>
+                              <constraint>RandomNumber( randomValue : value ) &amp;&amp;&#x0D;
+Guess( value &gt; randomValue )</constraint>
+                              <priority>1</priority>
+                            </org.drools.ruleflow.core.impl.ConstraintImpl>
+                          </entry>
+                        </constraints>
+                        <id>6</id>
+                        <name>Guess  correct?</name>
+                        <incomingConnections id="66">
+                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="38"/>
                         </incomingConnections>
                         <outgoingConnections id="67">
-                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
+                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="11"/>
+                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="52"/>
+                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="8"/>
                         </outgoingConnections>
                       </from>
-                      <to class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="5"/>
+                      <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
                     </org.drools.ruleflow.core.impl.ConnectionImpl>
                   </incomingConnections>
-                  <outgoingConnections id="68"/>
+                  <outgoingConnections id="68">
+                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="47"/>
+                  </outgoingConnections>
                 </element>
                 <incomingConnections id="69">
                   <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="70" serialization="custom">
@@ -265,16 +265,16 @@
                       <default>
                         <type>1</type>
                         <bendpoints id="71"/>
-                        <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="72" serialization="custom">
+                        <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" id="72" serialization="custom">
                           <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                             <default>
                               <constraint id="73">
-                                <x>436</x>
+                                <x>95</x>
                                 <y>234</y>
-                                <width>142</width>
+                                <width>103</width>
                                 <height>40</height>
                               </constraint>
-                              <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="8"/>
+                              <element class="org.drools.ruleflow.core.impl.SplitImpl" reference="9"/>
                               <incomingConnections id="74">
                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="75" serialization="custom">
                                   <org.drools.eclipse.flow.common.editor.core.ElementConnection>
@@ -285,607 +285,608 @@
                                         <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                           <default>
                                             <constraint id="78">
-                                              <x>627</x>
-                                              <y>234</y>
-                                              <width>102</width>
+                                              <x>106</x>
+                                              <y>150</y>
+                                              <width>80</width>
                                               <height>40</height>
                                             </constraint>
-                                            <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="11"/>
+                                            <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="35"/>
                                             <incomingConnections id="79">
                                               <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="80" serialization="custom">
                                                 <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                   <default>
                                                     <type>1</type>
                                                     <bendpoints id="81"/>
-                                                    <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" id="82" serialization="custom">
+                                                    <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="82" serialization="custom">
                                                       <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                         <default>
                                                           <constraint id="83">
-                                                            <x>770</x>
-                                                            <y>234</y>
-                                                            <width>93</width>
+                                                            <x>84</x>
+                                                            <y>84</y>
+                                                            <width>125</width>
                                                             <height>40</height>
                                                           </constraint>
-                                                          <element class="org.drools.ruleflow.core.impl.SplitImpl" reference="14"/>
+                                                          <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="27"/>
                                                           <incomingConnections id="84">
                                                             <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="85" serialization="custom">
                                                               <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                 <default>
                                                                   <type>1</type>
-                                                                  <bendpoints id="86">
-                                                                    <org.eclipse.draw2d.geometry.Point id="87">
-                                                                      <x>816</x>
-                                                                      <y>480</y>
+                                                                  <bendpoints id="86"/>
+                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="87" serialization="custom">
+                                                                    <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                      <default>
+                                                                        <constraint id="88">
+                                                                          <x>106</x>
+                                                                          <y>6</y>
+                                                                          <width>80</width>
+                                                                          <height>40</height>
+                                                                        </constraint>
+                                                                        <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="30"/>
+                                                                        <incomingConnections id="89"/>
+                                                                        <outgoingConnections id="90">
+                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="85"/>
+                                                                        </outgoingConnections>
+                                                                      </default>
+                                                                    </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                  </source>
+                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="82"/>
+                                                                </default>
+                                                              </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                <default>
+                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="29"/>
+                                                                </default>
+                                                              </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                            </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="91" serialization="custom">
+                                                              <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                <default>
+                                                                  <type>1</type>
+                                                                  <bendpoints id="92">
+                                                                    <org.eclipse.draw2d.geometry.Point id="93">
+                                                                      <x>815</x>
+                                                                      <y>102</y>
                                                                     </org.eclipse.draw2d.geometry.Point>
                                                                   </bendpoints>
-                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="88" serialization="custom">
+                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" id="94" serialization="custom">
                                                                     <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                                       <default>
-                                                                        <constraint id="89">
-                                                                          <x>105</x>
-                                                                          <y>460</y>
-                                                                          <width>80</width>
+                                                                        <constraint id="95">
+                                                                          <x>770</x>
+                                                                          <y>234</y>
+                                                                          <width>93</width>
                                                                           <height>40</height>
                                                                         </constraint>
-                                                                        <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="47"/>
-                                                                        <incomingConnections id="90">
-                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="91" serialization="custom">
+                                                                        <element class="org.drools.ruleflow.core.impl.SplitImpl" reference="23"/>
+                                                                        <incomingConnections id="96">
+                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="97" serialization="custom">
                                                                             <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                               <default>
                                                                                 <type>1</type>
-                                                                                <bendpoints id="92"/>
-                                                                                <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="93" serialization="custom">
+                                                                                <bendpoints id="98">
+                                                                                  <org.eclipse.draw2d.geometry.Point id="99">
+                                                                                    <x>816</x>
+                                                                                    <y>480</y>
+                                                                                  </org.eclipse.draw2d.geometry.Point>
+                                                                                </bendpoints>
+                                                                                <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="100" serialization="custom">
                                                                                   <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                                                     <default>
-                                                                                      <constraint id="94">
-                                                                                        <x>98</x>
-                                                                                        <y>368</y>
-                                                                                        <width>95</width>
+                                                                                      <constraint id="101">
+                                                                                        <x>105</x>
+                                                                                        <y>460</y>
+                                                                                        <width>80</width>
                                                                                         <height>40</height>
                                                                                       </constraint>
-                                                                                      <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="37"/>
-                                                                                      <incomingConnections id="95">
-                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="96" serialization="custom">
+                                                                                      <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="42"/>
+                                                                                      <incomingConnections id="102">
+                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="103" serialization="custom">
                                                                                           <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                                             <default>
                                                                                               <type>1</type>
-                                                                                              <bendpoints id="97"/>
-                                                                                              <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="98" serialization="custom">
+                                                                                              <bendpoints id="104"/>
+                                                                                              <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="105" serialization="custom">
                                                                                                 <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                                                                   <default>
-                                                                                                    <constraint id="99">
-                                                                                                      <x>8</x>
-                                                                                                      <y>296</y>
-                                                                                                      <width>80</width>
+                                                                                                    <constraint id="106">
+                                                                                                      <x>98</x>
+                                                                                                      <y>368</y>
+                                                                                                      <width>95</width>
                                                                                                       <height>40</height>
                                                                                                     </constraint>
-                                                                                                    <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="40"/>
-                                                                                                    <incomingConnections id="100">
-                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="101" serialization="custom">
+                                                                                                    <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="45"/>
+                                                                                                    <incomingConnections id="107">
+                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="108" serialization="custom">
                                                                                                         <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                                                           <default>
                                                                                                             <type>1</type>
-                                                                                                            <bendpoints id="102"/>
-                                                                                                            <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" id="103" serialization="custom">
+                                                                                                            <bendpoints id="109"/>
+                                                                                                            <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="3"/>
+                                                                                                            <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="105"/>
+                                                                                                          </default>
+                                                                                                        </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                          <default>
+                                                                                                            <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="47"/>
+                                                                                                          </default>
+                                                                                                        </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                      </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="110" serialization="custom">
+                                                                                                        <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                                          <default>
+                                                                                                            <type>1</type>
+                                                                                                            <bendpoints id="111"/>
+                                                                                                            <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="112" serialization="custom">
                                                                                                               <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                                                                                 <default>
-                                                                                                                  <constraint id="104">
-                                                                                                                    <x>95</x>
-                                                                                                                    <y>234</y>
-                                                                                                                    <width>103</width>
+                                                                                                                  <constraint id="113">
+                                                                                                                    <x>210</x>
+                                                                                                                    <y>295</y>
+                                                                                                                    <width>80</width>
                                                                                                                     <height>40</height>
                                                                                                                   </constraint>
-                                                                                                                  <element class="org.drools.ruleflow.core.impl.SplitImpl" reference="29"/>
-                                                                                                                  <incomingConnections id="105">
-                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="106" serialization="custom">
+                                                                                                                  <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="49"/>
+                                                                                                                  <incomingConnections id="114">
+                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="115" serialization="custom">
                                                                                                                       <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                                                                         <default>
                                                                                                                           <type>1</type>
-                                                                                                                          <bendpoints id="107"/>
-                                                                                                                          <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="108" serialization="custom">
-                                                                                                                            <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                                              <default>
-                                                                                                                                <constraint id="109">
-                                                                                                                                  <x>106</x>
-                                                                                                                                  <y>150</y>
-                                                                                                                                  <width>80</width>
-                                                                                                                                  <height>40</height>
-                                                                                                                                </constraint>
-                                                                                                                                <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="25"/>
-                                                                                                                                <incomingConnections id="110">
-                                                                                                                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="111" serialization="custom">
-                                                                                                                                    <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                                                                      <default>
-                                                                                                                                        <type>1</type>
-                                                                                                                                        <bendpoints id="112"/>
-                                                                                                                                        <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="113" serialization="custom">
-                                                                                                                                          <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                                                            <default>
-                                                                                                                                              <constraint id="114">
-                                                                                                                                                <x>84</x>
-                                                                                                                                                <y>84</y>
-                                                                                                                                                <width>125</width>
-                                                                                                                                                <height>40</height>
-                                                                                                                                              </constraint>
-                                                                                                                                              <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="17"/>
-                                                                                                                                              <incomingConnections id="115">
-                                                                                                                                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="116" serialization="custom">
-                                                                                                                                                  <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                                                                                    <default>
-                                                                                                                                                      <type>1</type>
-                                                                                                                                                      <bendpoints id="117"/>
-                                                                                                                                                      <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="118" serialization="custom">
-                                                                                                                                                        <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                                                                          <default>
-                                                                                                                                                            <constraint id="119">
-                                                                                                                                                              <x>106</x>
-                                                                                                                                                              <y>6</y>
-                                                                                                                                                              <width>80</width>
-                                                                                                                                                              <height>40</height>
-                                                                                                                                                            </constraint>
-                                                                                                                                                            <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="20"/>
-                                                                                                                                                            <incomingConnections id="120"/>
-                                                                                                                                                            <outgoingConnections id="121">
-                                                                                                                                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="116"/>
-                                                                                                                                                            </outgoingConnections>
-                                                                                                                                                          </default>
-                                                                                                                                                        </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                                                                      </source>
-                                                                                                                                                      <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="113"/>
-                                                                                                                                                    </default>
-                                                                                                                                                  </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                                                                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                                    <default>
-                                                                                                                                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="19"/>
-                                                                                                                                                    </default>
-                                                                                                                                                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                                </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="122" serialization="custom">
-                                                                                                                                                  <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                                                                                    <default>
-                                                                                                                                                      <type>1</type>
-                                                                                                                                                      <bendpoints id="123">
-                                                                                                                                                        <org.eclipse.draw2d.geometry.Point id="124">
-                                                                                                                                                          <x>815</x>
-                                                                                                                                                          <y>102</y>
-                                                                                                                                                        </org.eclipse.draw2d.geometry.Point>
-                                                                                                                                                      </bendpoints>
-                                                                                                                                                      <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="82"/>
-                                                                                                                                                      <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="113"/>
-                                                                                                                                                    </default>
-                                                                                                                                                  </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                                                                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                                    <default>
-                                                                                                                                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="16"/>
-                                                                                                                                                    </default>
-                                                                                                                                                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                                </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                              </incomingConnections>
-                                                                                                                                              <outgoingConnections id="125">
-                                                                                                                                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="111"/>
-                                                                                                                                              </outgoingConnections>
-                                                                                                                                              <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
-                                                                                                                                            </default>
-                                                                                                                                          </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                                                        </source>
-                                                                                                                                        <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="108"/>
-                                                                                                                                      </default>
-                                                                                                                                    </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                      <default>
-                                                                                                                                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="24"/>
-                                                                                                                                      </default>
-                                                                                                                                    </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                </incomingConnections>
-                                                                                                                                <outgoingConnections id="126">
-                                                                                                                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="106"/>
-                                                                                                                                </outgoingConnections>
-                                                                                                                                <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
-                                                                                                                              </default>
-                                                                                                                            </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                                          </source>
-                                                                                                                          <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="103"/>
+                                                                                                                          <bendpoints id="116"/>
+                                                                                                                          <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="72"/>
+                                                                                                                          <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="112"/>
                                                                                                                         </default>
                                                                                                                       </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                                                                       <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                                                         <default>
-                                                                                                                          <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="28"/>
+                                                                                                                          <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="52"/>
                                                                                                                         </default>
                                                                                                                       </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                                                     </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                                                   </incomingConnections>
-                                                                                                                  <outgoingConnections id="127">
-                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="128" serialization="custom">
+                                                                                                                  <outgoingConnections id="117">
+                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="110"/>
+                                                                                                                  </outgoingConnections>
+                                                                                                                  <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+                                                                                                                </default>
+                                                                                                              </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                                              <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+                                                                                                                <default>
+                                                                                                                  <descriptors id="118">
+                                                                                                                    <org.eclipse.ui.views.properties.TextPropertyDescriptor id="119">
+                                                                                                                      <id class="string">Name</id>
+                                                                                                                      <display>Name</display>
+                                                                                                                      <incompatible>false</incompatible>
+                                                                                                                    </org.eclipse.ui.views.properties.TextPropertyDescriptor>
+                                                                                                                    <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="120">
+                                                                                                                      <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="121">
+                                                                                                                        <nodes id="122">
+                                                                                                                          <entry>
+                                                                                                                            <long>1</long>
+                                                                                                                            <org.drools.ruleflow.core.impl.StartNodeImpl reference="30"/>
+                                                                                                                          </entry>
+                                                                                                                          <entry>
+                                                                                                                            <long>2</long>
+                                                                                                                            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="35"/>
+                                                                                                                          </entry>
+                                                                                                                          <entry>
+                                                                                                                            <long>5</long>
+                                                                                                                            <org.drools.ruleflow.core.impl.EndNodeImpl reference="60"/>
+                                                                                                                          </entry>
+                                                                                                                          <entry>
+                                                                                                                            <long>6</long>
+                                                                                                                            <org.drools.ruleflow.core.impl.SplitImpl reference="9"/>
+                                                                                                                          </entry>
+                                                                                                                          <entry>
+                                                                                                                            <long>7</long>
+                                                                                                                            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="42"/>
+                                                                                                                          </entry>
+                                                                                                                          <entry>
+                                                                                                                            <long>8</long>
+                                                                                                                            <org.drools.ruleflow.core.impl.JoinImpl reference="45"/>
+                                                                                                                          </entry>
+                                                                                                                          <entry>
+                                                                                                                            <long>9</long>
+                                                                                                                            <org.drools.ruleflow.core.impl.SplitImpl reference="23"/>
+                                                                                                                          </entry>
+                                                                                                                          <entry>
+                                                                                                                            <long>10</long>
+                                                                                                                            <org.drools.ruleflow.core.impl.JoinImpl reference="27"/>
+                                                                                                                          </entry>
+                                                                                                                          <entry>
+                                                                                                                            <long>11</long>
+                                                                                                                            <org.drools.ruleflow.core.impl.JoinImpl reference="17"/>
+                                                                                                                          </entry>
+                                                                                                                          <entry>
+                                                                                                                            <long>13</long>
+                                                                                                                            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="20"/>
+                                                                                                                          </entry>
+                                                                                                                          <entry>
+                                                                                                                            <long>19</long>
+                                                                                                                            <org.drools.ruleflow.core.impl.ActionNodeImpl reference="49"/>
+                                                                                                                          </entry>
+                                                                                                                          <entry>
+                                                                                                                            <long>18</long>
+                                                                                                                            <org.drools.ruleflow.core.impl.ActionNodeImpl reference="12"/>
+                                                                                                                          </entry>
+                                                                                                                          <entry>
+                                                                                                                            <long>20</long>
+                                                                                                                            <org.drools.ruleflow.core.impl.ActionNodeImpl reference="5"/>
+                                                                                                                          </entry>
+                                                                                                                        </nodes>
+                                                                                                                        <variables id="123"/>
+                                                                                                                        <lastNodeId>22</lastNodeId>
+                                                                                                                        <imports id="124">
+                                                                                                                          <string>org.drools.examples.NumberGuessExample.Game</string>
+                                                                                                                          <string>org.drools.examples.NumberGuessExample.GameRules</string>
+                                                                                                                          <string>org.drools.examples.NumberGuessExample.RandomNumber</string>
+                                                                                                                        </imports>
+                                                                                                                        <id>Number Guess</id>
+                                                                                                                        <name>Number Guess</name>
+                                                                                                                        <type>RuleFlow</type>
+                                                                                                                        <packageName>org.drools.examples</packageName>
+                                                                                                                      </process>
+                                                                                                                      <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="49"/>
+                                                                                                                      <id class="string">Action</id>
+                                                                                                                      <display>Action</display>
+                                                                                                                      <incompatible>false</incompatible>
+                                                                                                                    </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
+                                                                                                                  </descriptors>
+                                                                                                                </default>
+                                                                                                              </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+                                                                                                            </source>
+                                                                                                            <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="105"/>
+                                                                                                          </default>
+                                                                                                        </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                          <default>
+                                                                                                            <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="48"/>
+                                                                                                          </default>
+                                                                                                        </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                      </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                    </incomingConnections>
+                                                                                                    <outgoingConnections id="125">
+                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="103"/>
+                                                                                                    </outgoingConnections>
+                                                                                                    <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+                                                                                                  </default>
+                                                                                                </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                              </source>
+                                                                                              <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="100"/>
+                                                                                            </default>
+                                                                                          </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                            <default>
+                                                                                              <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="44"/>
+                                                                                            </default>
+                                                                                          </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                        </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                      </incomingConnections>
+                                                                                      <outgoingConnections id="126">
+                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="97"/>
+                                                                                      </outgoingConnections>
+                                                                                      <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+                                                                                    </default>
+                                                                                  </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                </source>
+                                                                                <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="94"/>
+                                                                              </default>
+                                                                            </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                              <default>
+                                                                                <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="41"/>
+                                                                              </default>
+                                                                            </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                          </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                        </incomingConnections>
+                                                                        <outgoingConnections id="127">
+                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="91"/>
+                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="128" serialization="custom">
+                                                                            <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                              <default>
+                                                                                <type>1</type>
+                                                                                <bendpoints id="129"/>
+                                                                                <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="94"/>
+                                                                                <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="130" serialization="custom">
+                                                                                  <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                    <default>
+                                                                                      <constraint id="131">
+                                                                                        <x>627</x>
+                                                                                        <y>234</y>
+                                                                                        <width>102</width>
+                                                                                        <height>40</height>
+                                                                                      </constraint>
+                                                                                      <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="20"/>
+                                                                                      <incomingConnections id="132">
+                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="128"/>
+                                                                                      </incomingConnections>
+                                                                                      <outgoingConnections id="133">
+                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="134" serialization="custom">
+                                                                                          <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                            <default>
+                                                                                              <type>1</type>
+                                                                                              <bendpoints id="135"/>
+                                                                                              <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="130"/>
+                                                                                              <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="136" serialization="custom">
+                                                                                                <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                                  <default>
+                                                                                                    <constraint id="137">
+                                                                                                      <x>436</x>
+                                                                                                      <y>234</y>
+                                                                                                      <width>142</width>
+                                                                                                      <height>40</height>
+                                                                                                    </constraint>
+                                                                                                    <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="17"/>
+                                                                                                    <incomingConnections id="138">
+                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="134"/>
+                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="139" serialization="custom">
+                                                                                                        <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                                          <default>
+                                                                                                            <type>1</type>
+                                                                                                            <bendpoints id="140"/>
+                                                                                                            <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="141" serialization="custom">
+                                                                                                              <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                                                <default>
+                                                                                                                  <constraint id="142">
+                                                                                                                    <x>259</x>
+                                                                                                                    <y>233</y>
+                                                                                                                    <width>107</width>
+                                                                                                                    <height>40</height>
+                                                                                                                  </constraint>
+                                                                                                                  <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="12"/>
+                                                                                                                  <incomingConnections id="143">
+                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="144" serialization="custom">
                                                                                                                       <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                                                                         <default>
                                                                                                                           <type>1</type>
-                                                                                                                          <bendpoints id="129"/>
-                                                                                                                          <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="103"/>
-                                                                                                                          <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="130" serialization="custom">
-                                                                                                                            <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                                              <default>
-                                                                                                                                <constraint id="131">
-                                                                                                                                  <x>259</x>
-                                                                                                                                  <y>233</y>
-                                                                                                                                  <width>107</width>
-                                                                                                                                  <height>40</height>
-                                                                                                                                </constraint>
-                                                                                                                                <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="54"/>
-                                                                                                                                <incomingConnections id="132">
-                                                                                                                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="128"/>
-                                                                                                                                </incomingConnections>
-                                                                                                                                <outgoingConnections id="133">
-                                                                                                                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="134" serialization="custom">
-                                                                                                                                    <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                                                                      <default>
-                                                                                                                                        <type>1</type>
-                                                                                                                                        <bendpoints id="135"/>
-                                                                                                                                        <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="130"/>
-                                                                                                                                        <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="72"/>
-                                                                                                                                      </default>
-                                                                                                                                    </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                      <default>
-                                                                                                                                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="58"/>
-                                                                                                                                      </default>
-                                                                                                                                    </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                </outgoingConnections>
-                                                                                                                                <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
-                                                                                                                              </default>
-                                                                                                                            </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                                            <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
-                                                                                                                              <default>
-                                                                                                                                <descriptors id="136">
-                                                                                                                                  <org.eclipse.ui.views.properties.TextPropertyDescriptor id="137">
-                                                                                                                                    <id class="string">Name</id>
-                                                                                                                                    <display>Name</display>
-                                                                                                                                    <incompatible>false</incompatible>
-                                                                                                                                  </org.eclipse.ui.views.properties.TextPropertyDescriptor>
-                                                                                                                                  <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="138">
-                                                                                                                                    <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="139">
-                                                                                                                                      <nodes id="140">
-                                                                                                                                        <entry>
-                                                                                                                                          <long>19</long>
-                                                                                                                                          <org.drools.ruleflow.core.impl.ActionNodeImpl reference="32"/>
-                                                                                                                                        </entry>
-                                                                                                                                        <entry>
-                                                                                                                                          <long>8</long>
-                                                                                                                                          <org.drools.ruleflow.core.impl.JoinImpl reference="37"/>
-                                                                                                                                        </entry>
-                                                                                                                                        <entry>
-                                                                                                                                          <long>11</long>
-                                                                                                                                          <org.drools.ruleflow.core.impl.JoinImpl reference="8"/>
-                                                                                                                                        </entry>
-                                                                                                                                        <entry>
-                                                                                                                                          <long>18</long>
-                                                                                                                                          <org.drools.ruleflow.core.impl.ActionNodeImpl reference="54"/>
-                                                                                                                                        </entry>
-                                                                                                                                        <entry>
-                                                                                                                                          <long>7</long>
-                                                                                                                                          <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="47"/>
-                                                                                                                                        </entry>
-                                                                                                                                        <entry>
-                                                                                                                                          <long>2</long>
-                                                                                                                                          <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="25"/>
-                                                                                                                                        </entry>
-                                                                                                                                        <entry>
-                                                                                                                                          <long>13</long>
-                                                                                                                                          <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="11"/>
-                                                                                                                                        </entry>
-                                                                                                                                        <entry>
-                                                                                                                                          <long>9</long>
-                                                                                                                                          <org.drools.ruleflow.core.impl.SplitImpl reference="14"/>
-                                                                                                                                        </entry>
-                                                                                                                                        <entry>
-                                                                                                                                          <long>6</long>
-                                                                                                                                          <org.drools.ruleflow.core.impl.SplitImpl reference="29"/>
-                                                                                                                                        </entry>
-                                                                                                                                        <entry>
-                                                                                                                                          <long>1</long>
-                                                                                                                                          <org.drools.ruleflow.core.impl.StartNodeImpl reference="20"/>
-                                                                                                                                        </entry>
-                                                                                                                                        <entry>
-                                                                                                                                          <long>20</long>
-                                                                                                                                          <org.drools.ruleflow.core.impl.ActionNodeImpl reference="40"/>
-                                                                                                                                        </entry>
-                                                                                                                                        <entry>
-                                                                                                                                          <long>10</long>
-                                                                                                                                          <org.drools.ruleflow.core.impl.JoinImpl reference="17"/>
-                                                                                                                                        </entry>
-                                                                                                                                        <entry>
-                                                                                                                                          <long>5</long>
-                                                                                                                                          <org.drools.ruleflow.core.impl.EndNodeImpl reference="5"/>
-                                                                                                                                        </entry>
-                                                                                                                                      </nodes>
-                                                                                                                                      <variables id="141"/>
-                                                                                                                                      <lastNodeId>22</lastNodeId>
-                                                                                                                                      <imports id="142">
-                                                                                                                                        <string>org.drools.examples.NumberGuessExample.Game</string>
-                                                                                                                                        <string>org.drools.examples.NumberGuessExample.GameRules</string>
-                                                                                                                                        <string>org.drools.examples.NumberGuessExample.RandomNumber</string>
-                                                                                                                                      </imports>
-                                                                                                                                      <id>Number Guess</id>
-                                                                                                                                      <name>Number Guess</name>
-                                                                                                                                      <type>RuleFlow</type>
-                                                                                                                                    </process>
-                                                                                                                                    <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="54"/>
-                                                                                                                                    <id class="string">Action</id>
-                                                                                                                                    <display>Action</display>
-                                                                                                                                    <incompatible>false</incompatible>
-                                                                                                                                  </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
-                                                                                                                                </descriptors>
-                                                                                                                              </default>
-                                                                                                                            </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
-                                                                                                                          </target>
+                                                                                                                          <bendpoints id="145"/>
+                                                                                                                          <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="72"/>
+                                                                                                                          <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="141"/>
                                                                                                                         </default>
                                                                                                                       </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                                                                       <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                                                         <default>
-                                                                                                                          <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="53"/>
+                                                                                                                          <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="11"/>
                                                                                                                         </default>
                                                                                                                       </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                                                     </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="143" serialization="custom">
-                                                                                                                      <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                                                        <default>
-                                                                                                                          <type>1</type>
-                                                                                                                          <bendpoints id="144"/>
-                                                                                                                          <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="103"/>
-                                                                                                                          <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="145" serialization="custom">
-                                                                                                                            <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                                              <default>
-                                                                                                                                <constraint id="146">
-                                                                                                                                  <x>210</x>
-                                                                                                                                  <y>295</y>
-                                                                                                                                  <width>80</width>
-                                                                                                                                  <height>40</height>
-                                                                                                                                </constraint>
-                                                                                                                                <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="32"/>
-                                                                                                                                <incomingConnections id="147">
-                                                                                                                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="143"/>
-                                                                                                                                </incomingConnections>
-                                                                                                                                <outgoingConnections id="148">
-                                                                                                                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="149" serialization="custom">
-                                                                                                                                    <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                                                                      <default>
-                                                                                                                                        <type>1</type>
-                                                                                                                                        <bendpoints id="150"/>
-                                                                                                                                        <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="145"/>
-                                                                                                                                        <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="93"/>
-                                                                                                                                      </default>
-                                                                                                                                    </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                      <default>
-                                                                                                                                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="36"/>
-                                                                                                                                      </default>
-                                                                                                                                    </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                                </outgoingConnections>
-                                                                                                                                <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
-                                                                                                                              </default>
-                                                                                                                            </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                                            <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
-                                                                                                                              <default>
-                                                                                                                                <descriptors id="151">
-                                                                                                                                  <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="137"/>
-                                                                                                                                  <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="152">
-                                                                                                                                    <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="139"/>
-                                                                                                                                    <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="32"/>
-                                                                                                                                    <id class="string">Action</id>
-                                                                                                                                    <display>Action</display>
-                                                                                                                                    <incompatible>false</incompatible>
-                                                                                                                                  </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
-                                                                                                                                </descriptors>
-                                                                                                                              </default>
-                                                                                                                            </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
-                                                                                                                          </target>
-                                                                                                                        </default>
-                                                                                                                      </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                        <default>
-                                                                                                                          <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="31"/>
-                                                                                                                        </default>
-                                                                                                                      </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                    </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="101"/>
+                                                                                                                  </incomingConnections>
+                                                                                                                  <outgoingConnections id="146">
+                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="139"/>
                                                                                                                   </outgoingConnections>
                                                                                                                   <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                                                                                 </default>
                                                                                                               </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                              <org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
-                                                                                                                <default/>
-                                                                                                              </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
+                                                                                                              <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+                                                                                                                <default>
+                                                                                                                  <descriptors id="147">
+                                                                                                                    <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="119"/>
+                                                                                                                    <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="148">
+                                                                                                                      <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="121"/>
+                                                                                                                      <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="12"/>
+                                                                                                                      <id class="string">Action</id>
+                                                                                                                      <display>Action</display>
+                                                                                                                      <incompatible>false</incompatible>
+                                                                                                                    </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
+                                                                                                                  </descriptors>
+                                                                                                                </default>
+                                                                                                              </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
                                                                                                             </source>
-                                                                                                            <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="98"/>
+                                                                                                            <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="136"/>
                                                                                                           </default>
                                                                                                         </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                                                         <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                                           <default>
-                                                                                                            <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="43"/>
+                                                                                                            <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="16"/>
                                                                                                           </default>
                                                                                                         </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                                       </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                                     </incomingConnections>
-                                                                                                    <outgoingConnections id="153">
-                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="96"/>
+                                                                                                    <outgoingConnections id="149">
+                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="150" serialization="custom">
+                                                                                                        <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                                          <default>
+                                                                                                            <type>1</type>
+                                                                                                            <bendpoints id="151"/>
+                                                                                                            <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="136"/>
+                                                                                                            <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="152" serialization="custom">
+                                                                                                              <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                                                <default>
+                                                                                                                  <constraint id="153">
+                                                                                                                    <x>466</x>
+                                                                                                                    <y>338</y>
+                                                                                                                    <width>80</width>
+                                                                                                                    <height>40</height>
+                                                                                                                  </constraint>
+                                                                                                                  <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="60"/>
+                                                                                                                  <incomingConnections id="154">
+                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="150"/>
+                                                                                                                  </incomingConnections>
+                                                                                                                  <outgoingConnections id="155"/>
+                                                                                                                  <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+                                                                                                                </default>
+                                                                                                              </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                                            </target>
+                                                                                                          </default>
+                                                                                                        </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                          <default>
+                                                                                                            <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="59"/>
+                                                                                                          </default>
+                                                                                                        </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                      </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                                     </outgoingConnections>
                                                                                                     <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                                                                   </default>
                                                                                                 </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
-                                                                                                  <default>
-                                                                                                    <descriptors id="154">
-                                                                                                      <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="137"/>
-                                                                                                      <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="155">
-                                                                                                        <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="139"/>
-                                                                                                        <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="40"/>
-                                                                                                        <id class="string">Action</id>
-                                                                                                        <display>Action</display>
-                                                                                                        <incompatible>false</incompatible>
-                                                                                                      </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
-                                                                                                    </descriptors>
-                                                                                                  </default>
-                                                                                                </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
-                                                                                              </source>
-                                                                                              <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="93"/>
+                                                                                              </target>
                                                                                             </default>
                                                                                           </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                                           <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                             <default>
-                                                                                              <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="39"/>
+                                                                                              <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="19"/>
                                                                                             </default>
                                                                                           </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                         </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="149"/>
-                                                                                      </incomingConnections>
-                                                                                      <outgoingConnections id="156">
-                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="91"/>
                                                                                       </outgoingConnections>
                                                                                       <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                                                     </default>
                                                                                   </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                </source>
-                                                                                <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="88"/>
+                                                                                </target>
                                                                               </default>
                                                                             </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                             <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                               <default>
-                                                                                <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="46"/>
+                                                                                <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="22"/>
                                                                               </default>
                                                                             </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                           </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                        </incomingConnections>
-                                                                        <outgoingConnections id="157">
-                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="85"/>
                                                                         </outgoingConnections>
                                                                         <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                                       </default>
                                                                     </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                    <org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
+                                                                      <default/>
+                                                                    </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
                                                                   </source>
-                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="82"/>
+                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="82"/>
                                                                 </default>
                                                               </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                               <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                 <default>
-                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="50"/>
+                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="26"/>
                                                                 </default>
                                                               </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                             </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                           </incomingConnections>
-                                                          <outgoingConnections id="158">
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="122"/>
+                                                          <outgoingConnections id="156">
                                                             <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="80"/>
                                                           </outgoingConnections>
                                                           <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                         </default>
                                                       </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                      <org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
-                                                        <default/>
-                                                      </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
                                                     </source>
                                                     <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="77"/>
                                                   </default>
                                                 </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                   <default>
-                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="13"/>
+                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="34"/>
                                                   </default>
                                                 </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                               </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                             </incomingConnections>
-                                            <outgoingConnections id="159">
+                                            <outgoingConnections id="157">
                                               <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="75"/>
                                             </outgoingConnections>
                                             <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                           </default>
                                         </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                       </source>
-                                      <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="72"/>
+                                      <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="72"/>
                                     </default>
                                   </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                   <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                     <default>
-                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="10"/>
+                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="38"/>
                                     </default>
                                   </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                 </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="134"/>
                               </incomingConnections>
-                              <outgoingConnections id="160">
+                              <outgoingConnections id="158">
+                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="144"/>
+                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="115"/>
                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="70"/>
                               </outgoingConnections>
                               <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                             </default>
                           </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
+                            <default/>
+                          </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
                         </source>
-                        <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" reference="3"/>
+                        <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="3"/>
                       </default>
                     </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                     <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                       <default>
-                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="7"/>
+                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="8"/>
                       </default>
                     </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                   </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                 </incomingConnections>
-                <outgoingConnections id="161"/>
+                <outgoingConnections id="159">
+                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="108"/>
+                </outgoingConnections>
                 <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
               </default>
             </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-          </org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper>
+            <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+              <default>
+                <descriptors id="160">
+                  <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="119"/>
+                  <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="161">
+                    <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="121"/>
+                    <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
+                    <id class="string">Action</id>
+                    <display>Action</display>
+                    <incompatible>false</incompatible>
+                  </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
+                </descriptors>
+              </default>
+            </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+          </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
         </entry>
         <entry>
           <string>9-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper reference="82"/>
+          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper reference="94"/>
         </entry>
         <entry>
-          <string>2-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="108"/>
+          <string>19-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="112"/>
         </entry>
         <entry>
-          <string>18-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="130"/>
+          <string>10-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="82"/>
         </entry>
         <entry>
-          <string>13-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="77"/>
+          <string>1-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="87"/>
         </entry>
         <entry>
-          <string>11-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="72"/>
+          <string>7-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="100"/>
         </entry>
         <entry>
-          <string>19-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="145"/>
+          <string>2-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="77"/>
         </entry>
         <entry>
-          <string>7-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="88"/>
+          <string>13-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="130"/>
         </entry>
         <entry>
-          <string>6-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper reference="103"/>
+          <string>8-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="105"/>
         </entry>
         <entry>
-          <string>10-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="113"/>
+          <string>11-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="136"/>
         </entry>
         <entry>
-          <string>1-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="118"/>
+          <string>5-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="152"/>
         </entry>
         <entry>
-          <string>8-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="93"/>
+          <string>18-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="141"/>
         </entry>
         <entry>
-          <string>20-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="98"/>
+          <string>6-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper reference="72"/>
         </entry>
       </elements>
-      <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="139"/>
+      <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="121"/>
       <routerLayout>2</routerLayout>
     </default>
   </org.drools.eclipse.flow.common.editor.core.ProcessWrapper>

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/NumberGuess.rfm
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/NumberGuess.rfm	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/NumberGuess.rfm	2007-10-03 00:20:35 UTC (rev 15530)
@@ -1,207 +1,208 @@
 <org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
   <nodes id="2">
     <entry>
-      <long>19</long>
-      <org.drools.ruleflow.core.impl.ActionNodeImpl id="3">
-        <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="4">
-          <consequence>System.out.println( &quot;Your guess was too low&quot; );</consequence>
-        </action>
-        <id>19</id>
-        <name>Too Low</name>
-        <incomingConnections id="5">
+      <long>1</long>
+      <org.drools.ruleflow.core.impl.StartNodeImpl id="3">
+        <id>1</id>
+        <name>Start</name>
+        <incomingConnections id="4"/>
+        <outgoingConnections id="5">
           <org.drools.ruleflow.core.impl.ConnectionImpl id="6">
             <type>1</type>
-            <from class="org.drools.ruleflow.core.impl.SplitImpl" id="7">
+            <from class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="3"/>
+            <to class="org.drools.ruleflow.core.impl.JoinImpl" id="7">
               <type>2</type>
-              <constraints id="8">
-                <entry>
-                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
-                  <org.drools.ruleflow.core.impl.ConstraintImpl id="9">
-                    <name>too low</name>
-                    <constraint>RandomNumber( randomValue : value ) &amp;&amp;&#x0D;
-Guess( value &lt; randomValue )</constraint>
-                    <priority>1</priority>
-                  </org.drools.ruleflow.core.impl.ConstraintImpl>
-                </entry>
-                <entry>
-                  <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
-                    <type>1</type>
-                    <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="7"/>
-                    <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="11">
-                      <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="12">
-                        <consequence>System.out.println( &quot;Your guess was too high&quot; );</consequence>
-                      </action>
-                      <id>20</id>
-                      <name>Too High</name>
-                      <incomingConnections id="13">
-                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
-                      </incomingConnections>
-                      <outgoingConnections id="14">
-                        <org.drools.ruleflow.core.impl.ConnectionImpl id="15">
+              <id>10</id>
+              <name>More guesses Join</name>
+              <incomingConnections id="8">
+                <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
+                <org.drools.ruleflow.core.impl.ConnectionImpl id="9">
+                  <type>1</type>
+                  <from class="org.drools.ruleflow.core.impl.SplitImpl" id="10">
+                    <type>2</type>
+                    <constraints id="11">
+                      <entry>
+                        <org.drools.ruleflow.core.impl.ConnectionImpl id="12">
                           <type>1</type>
-                          <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="11"/>
-                          <to class="org.drools.ruleflow.core.impl.JoinImpl" id="16">
-                            <type>2</type>
-                            <id>8</id>
-                            <name>incorrect guess</name>
-                            <incomingConnections id="17">
-                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="15"/>
-                              <org.drools.ruleflow.core.impl.ConnectionImpl id="18">
-                                <type>1</type>
-                                <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="3"/>
-                                <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="16"/>
-                              </org.drools.ruleflow.core.impl.ConnectionImpl>
+                          <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="10"/>
+                          <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="13">
+                            <ruleFlowGroup>No more Guesses</ruleFlowGroup>
+                            <id>13</id>
+                            <name>No more Guesses</name>
+                            <incomingConnections id="14">
+                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
                             </incomingConnections>
-                            <outgoingConnections id="19">
-                              <org.drools.ruleflow.core.impl.ConnectionImpl id="20">
+                            <outgoingConnections id="15">
+                              <org.drools.ruleflow.core.impl.ConnectionImpl id="16">
                                 <type>1</type>
-                                <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="16"/>
-                                <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="21">
-                                  <ruleFlowGroup>Guess incorrect</ruleFlowGroup>
-                                  <id>7</id>
-                                  <name>Guess incorrect</name>
-                                  <incomingConnections id="22">
-                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="20"/>
-                                  </incomingConnections>
-                                  <outgoingConnections id="23">
-                                    <org.drools.ruleflow.core.impl.ConnectionImpl id="24">
+                                <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="13"/>
+                                <to class="org.drools.ruleflow.core.impl.JoinImpl" id="17">
+                                  <type>2</type>
+                                  <id>11</id>
+                                  <name>No more guesses Join</name>
+                                  <incomingConnections id="18">
+                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="16"/>
+                                    <org.drools.ruleflow.core.impl.ConnectionImpl id="19">
                                       <type>1</type>
-                                      <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="21"/>
-                                      <to class="org.drools.ruleflow.core.impl.SplitImpl" id="25">
-                                        <type>2</type>
-                                        <constraints id="26">
-                                          <entry>
-                                            <org.drools.ruleflow.core.impl.ConnectionImpl id="27">
-                                              <type>1</type>
-                                              <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="25"/>
-                                              <to class="org.drools.ruleflow.core.impl.JoinImpl" id="28">
-                                                <type>2</type>
-                                                <id>10</id>
-                                                <name>More guesses Join</name>
-                                                <incomingConnections id="29">
-                                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="30">
+                                      <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="20">
+                                        <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="21">
+                                          <consequence>System.out.println( &quot;You guessed correctly&quot; );</consequence>
+                                        </action>
+                                        <id>18</id>
+                                        <name>Guess Correct</name>
+                                        <incomingConnections id="22">
+                                          <org.drools.ruleflow.core.impl.ConnectionImpl id="23">
+                                            <type>1</type>
+                                            <from class="org.drools.ruleflow.core.impl.SplitImpl" id="24">
+                                              <type>2</type>
+                                              <constraints id="25">
+                                                <entry>
+                                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="23"/>
+                                                  <org.drools.ruleflow.core.impl.ConstraintImpl id="26">
+                                                    <name>correct</name>
+                                                    <constraint>RandomNumber( randomValue : value ) &amp;&amp;&#x0D;
+Guess( value == randomValue )</constraint>
+                                                    <priority>1</priority>
+                                                  </org.drools.ruleflow.core.impl.ConstraintImpl>
+                                                </entry>
+                                                <entry>
+                                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="27">
                                                     <type>1</type>
-                                                    <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="31">
-                                                      <id>1</id>
-                                                      <name>Start</name>
-                                                      <incomingConnections id="32"/>
-                                                      <outgoingConnections id="33">
-                                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="30"/>
-                                                      </outgoingConnections>
-                                                    </from>
-                                                    <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="28"/>
-                                                  </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="27"/>
-                                                </incomingConnections>
-                                                <outgoingConnections id="34">
-                                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="35">
-                                                    <type>1</type>
-                                                    <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="28"/>
-                                                    <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="36">
-                                                      <ruleFlowGroup>Guess</ruleFlowGroup>
-                                                      <id>2</id>
-                                                      <name>Guess</name>
-                                                      <incomingConnections id="37">
-                                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="35"/>
+                                                    <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="24"/>
+                                                    <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="28">
+                                                      <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="29">
+                                                        <consequence>System.out.println( &quot;Your guess was too low&quot; );</consequence>
+                                                      </action>
+                                                      <id>19</id>
+                                                      <name>Too Low</name>
+                                                      <incomingConnections id="30">
+                                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="27"/>
                                                       </incomingConnections>
-                                                      <outgoingConnections id="38">
-                                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="39">
+                                                      <outgoingConnections id="31">
+                                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="32">
                                                           <type>1</type>
-                                                          <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="36"/>
-                                                          <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="7"/>
-                                                        </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                      </outgoingConnections>
-                                                    </to>
-                                                  </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                </outgoingConnections>
-                                              </to>
-                                            </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                            <org.drools.ruleflow.core.impl.ConstraintImpl id="40">
-                                              <name>More guesses</name>
-                                              <constraint>GameRules( allowed : allowedGuesses  )&#x0D;
-Game(  guessCount &lt; allowed )</constraint>
-                                              <priority>1</priority>
-                                            </org.drools.ruleflow.core.impl.ConstraintImpl>
-                                          </entry>
-                                          <entry>
-                                            <org.drools.ruleflow.core.impl.ConnectionImpl id="41">
-                                              <type>1</type>
-                                              <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="25"/>
-                                              <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="42">
-                                                <ruleFlowGroup>No more Guesses</ruleFlowGroup>
-                                                <id>13</id>
-                                                <name>No more Guesses</name>
-                                                <incomingConnections id="43">
-                                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="41"/>
-                                                </incomingConnections>
-                                                <outgoingConnections id="44">
-                                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="45">
-                                                    <type>1</type>
-                                                    <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="42"/>
-                                                    <to class="org.drools.ruleflow.core.impl.JoinImpl" id="46">
-                                                      <type>2</type>
-                                                      <id>11</id>
-                                                      <name>No more guesses Join</name>
-                                                      <incomingConnections id="47">
-                                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="45"/>
-                                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="48">
-                                                          <type>1</type>
-                                                          <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="49">
-                                                            <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="50">
-                                                              <consequence>System.out.println( &quot;You guessed correctly&quot; );</consequence>
-                                                            </action>
-                                                            <id>18</id>
-                                                            <name>Guess Correct</name>
-                                                            <incomingConnections id="51">
-                                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="52">
+                                                          <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="28"/>
+                                                          <to class="org.drools.ruleflow.core.impl.JoinImpl" id="33">
+                                                            <type>2</type>
+                                                            <id>8</id>
+                                                            <name>incorrect guess</name>
+                                                            <incomingConnections id="34">
+                                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="35">
                                                                 <type>1</type>
-                                                                <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="7"/>
-                                                                <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="49"/>
+                                                                <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="36">
+                                                                  <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="37">
+                                                                    <consequence>System.out.println( &quot;Your guess was too high&quot; );</consequence>
+                                                                  </action>
+                                                                  <id>20</id>
+                                                                  <name>Too High</name>
+                                                                  <incomingConnections id="38">
+                                                                    <org.drools.ruleflow.core.impl.ConnectionImpl id="39">
+                                                                      <type>1</type>
+                                                                      <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="24"/>
+                                                                      <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="36"/>
+                                                                    </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                                  </incomingConnections>
+                                                                  <outgoingConnections id="40">
+                                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="35"/>
+                                                                  </outgoingConnections>
+                                                                </from>
+                                                                <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="33"/>
                                                               </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="32"/>
                                                             </incomingConnections>
-                                                            <outgoingConnections id="53">
-                                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="48"/>
+                                                            <outgoingConnections id="41">
+                                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="42">
+                                                                <type>1</type>
+                                                                <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="33"/>
+                                                                <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="43">
+                                                                  <ruleFlowGroup>Guess incorrect</ruleFlowGroup>
+                                                                  <id>7</id>
+                                                                  <name>Guess incorrect</name>
+                                                                  <incomingConnections id="44">
+                                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="42"/>
+                                                                  </incomingConnections>
+                                                                  <outgoingConnections id="45">
+                                                                    <org.drools.ruleflow.core.impl.ConnectionImpl id="46">
+                                                                      <type>1</type>
+                                                                      <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="43"/>
+                                                                      <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="10"/>
+                                                                    </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                                  </outgoingConnections>
+                                                                </to>
+                                                              </org.drools.ruleflow.core.impl.ConnectionImpl>
                                                             </outgoingConnections>
-                                                          </from>
-                                                          <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="46"/>
-                                                        </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                      </incomingConnections>
-                                                      <outgoingConnections id="54">
-                                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="55">
-                                                          <type>1</type>
-                                                          <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="46"/>
-                                                          <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="56">
-                                                            <id>5</id>
-                                                            <name>End</name>
-                                                            <incomingConnections id="57">
-                                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="55"/>
-                                                            </incomingConnections>
-                                                            <outgoingConnections id="58"/>
                                                           </to>
                                                         </org.drools.ruleflow.core.impl.ConnectionImpl>
                                                       </outgoingConnections>
                                                     </to>
                                                   </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                </outgoingConnections>
-                                              </to>
-                                            </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                            <org.drools.ruleflow.core.impl.ConstraintImpl id="59">
-                                              <name>No More Guesses</name>
-                                              <constraint>GameRules( allowed : allowedGuesses  )&#x0D;
-Game(  guessCount &gt;= allowed )</constraint>
-                                              <priority>1</priority>
-                                            </org.drools.ruleflow.core.impl.ConstraintImpl>
-                                          </entry>
-                                        </constraints>
-                                        <id>9</id>
-                                        <name>More Guesses?</name>
+                                                  <org.drools.ruleflow.core.impl.ConstraintImpl id="47">
+                                                    <name>too low</name>
+                                                    <constraint>RandomNumber( randomValue : value ) &amp;&amp;&#x0D;
+Guess( value &lt; randomValue )</constraint>
+                                                    <priority>1</priority>
+                                                  </org.drools.ruleflow.core.impl.ConstraintImpl>
+                                                </entry>
+                                                <entry>
+                                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="39"/>
+                                                  <org.drools.ruleflow.core.impl.ConstraintImpl id="48">
+                                                    <name>too high</name>
+                                                    <constraint>RandomNumber( randomValue : value ) &amp;&amp;&#x0D;
+Guess( value &gt; randomValue )</constraint>
+                                                    <priority>1</priority>
+                                                  </org.drools.ruleflow.core.impl.ConstraintImpl>
+                                                </entry>
+                                              </constraints>
+                                              <id>6</id>
+                                              <name>Guess  correct?</name>
+                                              <incomingConnections id="49">
+                                                <org.drools.ruleflow.core.impl.ConnectionImpl id="50">
+                                                  <type>1</type>
+                                                  <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="51">
+                                                    <ruleFlowGroup>Guess</ruleFlowGroup>
+                                                    <id>2</id>
+                                                    <name>Guess</name>
+                                                    <incomingConnections id="52">
+                                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="53">
+                                                        <type>1</type>
+                                                        <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="7"/>
+                                                        <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="51"/>
+                                                      </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                    </incomingConnections>
+                                                    <outgoingConnections id="54">
+                                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="50"/>
+                                                    </outgoingConnections>
+                                                  </from>
+                                                  <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="24"/>
+                                                </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                              </incomingConnections>
+                                              <outgoingConnections id="55">
+                                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="23"/>
+                                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="27"/>
+                                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="39"/>
+                                              </outgoingConnections>
+                                            </from>
+                                            <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="20"/>
+                                          </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                        </incomingConnections>
+                                        <outgoingConnections id="56">
+                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="19"/>
+                                        </outgoingConnections>
+                                      </from>
+                                      <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="17"/>
+                                    </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                  </incomingConnections>
+                                  <outgoingConnections id="57">
+                                    <org.drools.ruleflow.core.impl.ConnectionImpl id="58">
+                                      <type>1</type>
+                                      <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="17"/>
+                                      <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="59">
+                                        <id>5</id>
+                                        <name>End</name>
                                         <incomingConnections id="60">
-                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="24"/>
+                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="58"/>
                                         </incomingConnections>
-                                        <outgoingConnections id="61">
-                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="27"/>
-                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="41"/>
-                                        </outgoingConnections>
+                                        <outgoingConnections id="61"/>
                                       </to>
                                     </org.drools.ruleflow.core.impl.ConnectionImpl>
                                   </outgoingConnections>
@@ -210,92 +211,91 @@
                             </outgoingConnections>
                           </to>
                         </org.drools.ruleflow.core.impl.ConnectionImpl>
-                      </outgoingConnections>
-                    </to>
-                  </org.drools.ruleflow.core.impl.ConnectionImpl>
-                  <org.drools.ruleflow.core.impl.ConstraintImpl id="62">
-                    <name>too high</name>
-                    <constraint>RandomNumber( randomValue : value ) &amp;&amp;&#x0D;
-Guess( value &gt; randomValue )</constraint>
-                    <priority>1</priority>
-                  </org.drools.ruleflow.core.impl.ConstraintImpl>
-                </entry>
-                <entry>
-                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="52"/>
-                  <org.drools.ruleflow.core.impl.ConstraintImpl id="63">
-                    <name>correct</name>
-                    <constraint>RandomNumber( randomValue : value ) &amp;&amp;&#x0D;
-Guess( value == randomValue )</constraint>
-                    <priority>1</priority>
-                  </org.drools.ruleflow.core.impl.ConstraintImpl>
-                </entry>
-              </constraints>
-              <id>6</id>
-              <name>Guess  correct?</name>
-              <incomingConnections id="64">
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="39"/>
+                        <org.drools.ruleflow.core.impl.ConstraintImpl id="62">
+                          <name>No More Guesses</name>
+                          <constraint>GameRules( allowed : allowedGuesses  )&#x0D;
+Game(  guessCount &gt;= allowed )</constraint>
+                          <priority>1</priority>
+                        </org.drools.ruleflow.core.impl.ConstraintImpl>
+                      </entry>
+                      <entry>
+                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="9"/>
+                        <org.drools.ruleflow.core.impl.ConstraintImpl id="63">
+                          <name>More guesses</name>
+                          <constraint>GameRules( allowed : allowedGuesses  )&#x0D;
+Game(  guessCount &lt; allowed )</constraint>
+                          <priority>1</priority>
+                        </org.drools.ruleflow.core.impl.ConstraintImpl>
+                      </entry>
+                    </constraints>
+                    <id>9</id>
+                    <name>More Guesses?</name>
+                    <incomingConnections id="64">
+                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="46"/>
+                    </incomingConnections>
+                    <outgoingConnections id="65">
+                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="9"/>
+                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
+                    </outgoingConnections>
+                  </from>
+                  <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="7"/>
+                </org.drools.ruleflow.core.impl.ConnectionImpl>
               </incomingConnections>
-              <outgoingConnections id="65">
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="52"/>
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
+              <outgoingConnections id="66">
+                <org.drools.ruleflow.core.impl.ConnectionImpl reference="53"/>
               </outgoingConnections>
-            </from>
-            <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="3"/>
+            </to>
           </org.drools.ruleflow.core.impl.ConnectionImpl>
-        </incomingConnections>
-        <outgoingConnections id="66">
-          <org.drools.ruleflow.core.impl.ConnectionImpl reference="18"/>
         </outgoingConnections>
-      </org.drools.ruleflow.core.impl.ActionNodeImpl>
+      </org.drools.ruleflow.core.impl.StartNodeImpl>
     </entry>
     <entry>
-      <long>8</long>
-      <org.drools.ruleflow.core.impl.JoinImpl reference="16"/>
+      <long>2</long>
+      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="51"/>
     </entry>
     <entry>
-      <long>11</long>
-      <org.drools.ruleflow.core.impl.JoinImpl reference="46"/>
+      <long>5</long>
+      <org.drools.ruleflow.core.impl.EndNodeImpl reference="59"/>
     </entry>
     <entry>
-      <long>18</long>
-      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="49"/>
+      <long>6</long>
+      <org.drools.ruleflow.core.impl.SplitImpl reference="24"/>
     </entry>
     <entry>
       <long>7</long>
-      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="21"/>
+      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="43"/>
     </entry>
     <entry>
-      <long>2</long>
-      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="36"/>
+      <long>8</long>
+      <org.drools.ruleflow.core.impl.JoinImpl reference="33"/>
     </entry>
     <entry>
-      <long>13</long>
-      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="42"/>
+      <long>9</long>
+      <org.drools.ruleflow.core.impl.SplitImpl reference="10"/>
     </entry>
     <entry>
-      <long>9</long>
-      <org.drools.ruleflow.core.impl.SplitImpl reference="25"/>
+      <long>10</long>
+      <org.drools.ruleflow.core.impl.JoinImpl reference="7"/>
     </entry>
     <entry>
-      <long>6</long>
-      <org.drools.ruleflow.core.impl.SplitImpl reference="7"/>
+      <long>11</long>
+      <org.drools.ruleflow.core.impl.JoinImpl reference="17"/>
     </entry>
     <entry>
-      <long>1</long>
-      <org.drools.ruleflow.core.impl.StartNodeImpl reference="31"/>
+      <long>13</long>
+      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="13"/>
     </entry>
     <entry>
-      <long>20</long>
-      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="11"/>
+      <long>19</long>
+      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="28"/>
     </entry>
     <entry>
-      <long>10</long>
-      <org.drools.ruleflow.core.impl.JoinImpl reference="28"/>
+      <long>18</long>
+      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="20"/>
     </entry>
     <entry>
-      <long>5</long>
-      <org.drools.ruleflow.core.impl.EndNodeImpl reference="56"/>
+      <long>20</long>
+      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="36"/>
     </entry>
   </nodes>
   <variables id="67"/>
@@ -308,4 +308,5 @@
   <id>Number Guess</id>
   <name>Number Guess</name>
   <type>RuleFlow</type>
+  <packageName>org.drools.examples</packageName>
 </org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/ClinicalPathwayX.rf
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/ClinicalPathwayX.rf	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/ClinicalPathwayX.rf	2007-10-03 00:20:35 UTC (rev 15530)
@@ -3,259 +3,259 @@
     <default>
       <elements id="2">
         <entry>
-          <string>26-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.SubFlowWrapper id="3" serialization="custom">
+          <string>12-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.MilestoneWrapper id="3" serialization="custom">
             <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
               <default>
                 <constraint id="4">
-                  <x>230</x>
-                  <y>437</y>
-                  <width>90</width>
+                  <x>214</x>
+                  <y>167</y>
+                  <width>121</width>
                   <height>40</height>
                 </constraint>
-                <element class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" id="5">
-                  <processId>org.drools.examples.cdss.TreatmentY</processId>
-                  <id>26</id>
-                  <name>Treatment Y</name>
+                <element class="org.drools.ruleflow.core.impl.MilestoneNodeImpl" id="5">
+                  <constraint>Diagnose(  )</constraint>
+                  <id>12</id>
+                  <name>Wait for Diagnose</name>
                   <incomingConnections id="6">
                     <org.drools.ruleflow.core.impl.ConnectionImpl id="7">
                       <type>1</type>
-                      <from class="org.drools.ruleflow.core.impl.SplitImpl" id="8">
+                      <from class="org.drools.ruleflow.core.impl.JoinImpl" id="8">
                         <type>2</type>
-                        <constraints id="9">
-                          <entry>
-                            <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
-                              <type>1</type>
-                              <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="8"/>
-                              <to class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" id="11">
-                                <processId>org.drools.examples.cdss.TreatmentX</processId>
-                                <id>25</id>
-                                <name>Treatment X</name>
-                                <incomingConnections id="12">
-                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
-                                </incomingConnections>
-                                <outgoingConnections id="13">
-                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="14">
-                                    <type>1</type>
-                                    <from class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" reference="11"/>
-                                    <to class="org.drools.ruleflow.core.impl.JoinImpl" id="15">
-                                      <type>2</type>
-                                      <id>23</id>
-                                      <name></name>
-                                      <incomingConnections id="16">
-                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="17">
-                                          <type>1</type>
-                                          <from class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" reference="5"/>
-                                          <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="15"/>
-                                        </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="14"/>
-                                      </incomingConnections>
-                                      <outgoingConnections id="18">
-                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="19">
-                                          <type>1</type>
-                                          <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="15"/>
-                                          <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="20">
-                                            <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="21">
-                                              <consequence>System.out.println(&quot;Scheduling follow-up of patient.&quot;);</consequence>
-                                            </action>
-                                            <id>29</id>
-                                            <name>Schedule Follow-up</name>
-                                            <incomingConnections id="22">
-                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="19"/>
-                                            </incomingConnections>
-                                            <outgoingConnections id="23">
-                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="24">
-                                                <type>1</type>
-                                                <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="20"/>
-                                                <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="25">
-                                                  <id>8</id>
-                                                  <name>End</name>
-                                                  <incomingConnections id="26">
-                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="24"/>
-                                                  </incomingConnections>
-                                                  <outgoingConnections id="27"/>
-                                                </to>
-                                              </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                            </outgoingConnections>
-                                          </to>
-                                        </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                      </outgoingConnections>
-                                    </to>
-                                  </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                </outgoingConnections>
-                              </to>
-                            </org.drools.ruleflow.core.impl.ConnectionImpl>
-                            <org.drools.ruleflow.core.impl.ConstraintImpl id="28">
-                              <name>Diagnosed type 1</name>
-                              <constraint>Diagnose( type == Terminology.DIAGNOSE_X_TYPE1 )</constraint>
-                              <priority>1</priority>
-                            </org.drools.ruleflow.core.impl.ConstraintImpl>
-                          </entry>
-                          <entry>
-                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
-                            <org.drools.ruleflow.core.impl.ConstraintImpl id="29">
-                              <name>Diagnosed type 2</name>
-                              <constraint>Diagnose( type == Terminology.DIAGNOSE_X_TYPE2 )</constraint>
-                              <priority>2</priority>
-                            </org.drools.ruleflow.core.impl.ConstraintImpl>
-                          </entry>
-                          <entry>
-                            <org.drools.ruleflow.core.impl.ConnectionImpl id="30">
-                              <type>1</type>
-                              <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="8"/>
-                              <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="31">
-                                <id>27</id>
-                                <name>End</name>
-                                <incomingConnections id="32">
-                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="30"/>
-                                </incomingConnections>
-                                <outgoingConnections id="33"/>
-                              </to>
-                            </org.drools.ruleflow.core.impl.ConnectionImpl>
-                            <org.drools.ruleflow.core.impl.ConstraintImpl id="34">
-                              <name>Else</name>
-                              <constraint>eval(true)</constraint>
-                              <priority>3</priority>
-                            </org.drools.ruleflow.core.impl.ConstraintImpl>
-                          </entry>
-                        </constraints>
-                        <id>19</id>
-                        <name>Select Treatment</name>
-                        <incomingConnections id="35">
-                          <org.drools.ruleflow.core.impl.ConnectionImpl id="36">
+                        <id>15</id>
+                        <name></name>
+                        <incomingConnections id="9">
+                          <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
                             <type>1</type>
-                            <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="37">
-                              <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="38">
-                                <consequence>System.out.println(&quot;Notifying GP of patient of the diagnose.&quot;);</consequence>
-                              </action>
-                              <id>28</id>
-                              <name>Notify GP</name>
-                              <incomingConnections id="39">
-                                <org.drools.ruleflow.core.impl.ConnectionImpl id="40">
+                            <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="11">
+                              <ruleFlowGroup>AdditionalExaminations</ruleFlowGroup>
+                              <id>17</id>
+                              <name>Additional Examinations</name>
+                              <incomingConnections id="12">
+                                <org.drools.ruleflow.core.impl.ConnectionImpl id="13">
                                   <type>1</type>
-                                  <from class="org.drools.ruleflow.core.impl.SplitImpl" id="41">
+                                  <from class="org.drools.ruleflow.core.impl.SplitImpl" id="14">
                                     <type>2</type>
-                                    <constraints id="42">
+                                    <constraints id="15">
                                       <entry>
-                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="43">
+                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="16">
                                           <type>1</type>
-                                          <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="41"/>
-                                          <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="44">
-                                            <ruleFlowGroup>AdditionalExaminations</ruleFlowGroup>
-                                            <id>17</id>
-                                            <name>Additional Examinations</name>
-                                            <incomingConnections id="45">
-                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="43"/>
+                                          <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="14"/>
+                                          <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="17">
+                                            <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="18">
+                                              <consequence>System.out.println(&quot;Notifying GP of patient of the diagnose.&quot;);</consequence>
+                                            </action>
+                                            <id>28</id>
+                                            <name>Notify GP</name>
+                                            <incomingConnections id="19">
+                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="16"/>
                                             </incomingConnections>
-                                            <outgoingConnections id="46">
-                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="47">
+                                            <outgoingConnections id="20">
+                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="21">
                                                 <type>1</type>
-                                                <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="44"/>
-                                                <to class="org.drools.ruleflow.core.impl.JoinImpl" id="48">
+                                                <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="17"/>
+                                                <to class="org.drools.ruleflow.core.impl.SplitImpl" id="22">
                                                   <type>2</type>
-                                                  <id>15</id>
-                                                  <name></name>
-                                                  <incomingConnections id="49">
-                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="47"/>
-                                                    <org.drools.ruleflow.core.impl.ConnectionImpl id="50">
-                                                      <type>1</type>
-                                                      <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="51">
-                                                        <ruleFlowGroup>Examinations</ruleFlowGroup>
-                                                        <id>11</id>
-                                                        <name>Examinations</name>
-                                                        <incomingConnections id="52">
-                                                          <org.drools.ruleflow.core.impl.ConnectionImpl id="53">
-                                                            <type>1</type>
-                                                            <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="54">
-                                                              <id>7</id>
-                                                              <name>Start</name>
-                                                              <incomingConnections id="55"/>
-                                                              <outgoingConnections id="56">
-                                                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="53"/>
-                                                              </outgoingConnections>
-                                                            </from>
-                                                            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="51"/>
-                                                          </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                        </incomingConnections>
-                                                        <outgoingConnections id="57">
-                                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="50"/>
-                                                        </outgoingConnections>
-                                                      </from>
-                                                      <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="48"/>
-                                                    </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                  <constraints id="23">
+                                                    <entry>
+                                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="24">
+                                                        <type>1</type>
+                                                        <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="22"/>
+                                                        <to class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" id="25">
+                                                          <processId>org.drools.examples.cdss.TreatmentX</processId>
+                                                          <id>25</id>
+                                                          <name>Treatment X</name>
+                                                          <incomingConnections id="26">
+                                                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="24"/>
+                                                          </incomingConnections>
+                                                          <outgoingConnections id="27">
+                                                            <org.drools.ruleflow.core.impl.ConnectionImpl id="28">
+                                                              <type>1</type>
+                                                              <from class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" reference="25"/>
+                                                              <to class="org.drools.ruleflow.core.impl.JoinImpl" id="29">
+                                                                <type>2</type>
+                                                                <id>23</id>
+                                                                <name></name>
+                                                                <incomingConnections id="30">
+                                                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="31">
+                                                                    <type>1</type>
+                                                                    <from class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" id="32">
+                                                                      <processId>org.drools.examples.cdss.TreatmentY</processId>
+                                                                      <id>26</id>
+                                                                      <name>Treatment Y</name>
+                                                                      <incomingConnections id="33">
+                                                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="34">
+                                                                          <type>1</type>
+                                                                          <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="22"/>
+                                                                          <to class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" reference="32"/>
+                                                                        </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                                      </incomingConnections>
+                                                                      <outgoingConnections id="35">
+                                                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="31"/>
+                                                                      </outgoingConnections>
+                                                                    </from>
+                                                                    <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="29"/>
+                                                                  </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="28"/>
+                                                                </incomingConnections>
+                                                                <outgoingConnections id="36">
+                                                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="37">
+                                                                    <type>1</type>
+                                                                    <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="29"/>
+                                                                    <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="38">
+                                                                      <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="39">
+                                                                        <consequence>System.out.println(&quot;Scheduling follow-up of patient.&quot;);</consequence>
+                                                                      </action>
+                                                                      <id>29</id>
+                                                                      <name>Schedule Follow-up</name>
+                                                                      <incomingConnections id="40">
+                                                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="37"/>
+                                                                      </incomingConnections>
+                                                                      <outgoingConnections id="41">
+                                                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="42">
+                                                                          <type>1</type>
+                                                                          <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="38"/>
+                                                                          <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="43">
+                                                                            <id>8</id>
+                                                                            <name>End</name>
+                                                                            <incomingConnections id="44">
+                                                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="42"/>
+                                                                            </incomingConnections>
+                                                                            <outgoingConnections id="45"/>
+                                                                          </to>
+                                                                        </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                                      </outgoingConnections>
+                                                                    </to>
+                                                                  </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                                </outgoingConnections>
+                                                              </to>
+                                                            </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                          </outgoingConnections>
+                                                        </to>
+                                                      </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                      <org.drools.ruleflow.core.impl.ConstraintImpl id="46">
+                                                        <name>Diagnosed type 1</name>
+                                                        <constraint>Diagnose( type == Terminology.DIAGNOSE_X_TYPE1 )</constraint>
+                                                        <priority>1</priority>
+                                                      </org.drools.ruleflow.core.impl.ConstraintImpl>
+                                                    </entry>
+                                                    <entry>
+                                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="34"/>
+                                                      <org.drools.ruleflow.core.impl.ConstraintImpl id="47">
+                                                        <name>Diagnosed type 2</name>
+                                                        <constraint>Diagnose( type == Terminology.DIAGNOSE_X_TYPE2 )</constraint>
+                                                        <priority>2</priority>
+                                                      </org.drools.ruleflow.core.impl.ConstraintImpl>
+                                                    </entry>
+                                                    <entry>
+                                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="48">
+                                                        <type>1</type>
+                                                        <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="22"/>
+                                                        <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="49">
+                                                          <id>27</id>
+                                                          <name>End</name>
+                                                          <incomingConnections id="50">
+                                                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="48"/>
+                                                          </incomingConnections>
+                                                          <outgoingConnections id="51"/>
+                                                        </to>
+                                                      </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                      <org.drools.ruleflow.core.impl.ConstraintImpl id="52">
+                                                        <name>Else</name>
+                                                        <constraint>eval(true)</constraint>
+                                                        <priority>3</priority>
+                                                      </org.drools.ruleflow.core.impl.ConstraintImpl>
+                                                    </entry>
+                                                  </constraints>
+                                                  <id>19</id>
+                                                  <name>Select Treatment</name>
+                                                  <incomingConnections id="53">
+                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="21"/>
                                                   </incomingConnections>
-                                                  <outgoingConnections id="58">
-                                                    <org.drools.ruleflow.core.impl.ConnectionImpl id="59">
-                                                      <type>1</type>
-                                                      <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="48"/>
-                                                      <to class="org.drools.ruleflow.core.impl.MilestoneNodeImpl" id="60">
-                                                        <constraint>Diagnose(  )</constraint>
-                                                        <id>12</id>
-                                                        <name>Wait for Diagnose</name>
-                                                        <incomingConnections id="61">
-                                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="59"/>
-                                                        </incomingConnections>
-                                                        <outgoingConnections id="62">
-                                                          <org.drools.ruleflow.core.impl.ConnectionImpl id="63">
-                                                            <type>1</type>
-                                                            <from class="org.drools.ruleflow.core.impl.MilestoneNodeImpl" reference="60"/>
-                                                            <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="41"/>
-                                                          </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                        </outgoingConnections>
-                                                      </to>
-                                                    </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                  <outgoingConnections id="54">
+                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="24"/>
+                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="34"/>
+                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="48"/>
                                                   </outgoingConnections>
                                                 </to>
                                               </org.drools.ruleflow.core.impl.ConnectionImpl>
                                             </outgoingConnections>
                                           </to>
                                         </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                        <org.drools.ruleflow.core.impl.ConstraintImpl id="64">
+                                        <org.drools.ruleflow.core.impl.ConstraintImpl id="55">
+                                          <name>Diagnose complete</name>
+                                          <constraint>eval(true)</constraint>
+                                          <priority>2</priority>
+                                        </org.drools.ruleflow.core.impl.ConstraintImpl>
+                                      </entry>
+                                      <entry>
+                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="13"/>
+                                        <org.drools.ruleflow.core.impl.ConstraintImpl id="56">
                                           <name>Diagnose inconclusive</name>
                                           <constraint>Diagnose( type == Terminology.DIAGNOSE_X_TYPE_UNKNOWN )</constraint>
                                           <priority>1</priority>
                                         </org.drools.ruleflow.core.impl.ConstraintImpl>
                                       </entry>
-                                      <entry>
-                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="40"/>
-                                        <org.drools.ruleflow.core.impl.ConstraintImpl id="65">
-                                          <name>Diagnose complete</name>
-                                          <constraint>eval(true)</constraint>
-                                          <priority>2</priority>
-                                        </org.drools.ruleflow.core.impl.ConstraintImpl>
-                                      </entry>
                                     </constraints>
                                     <id>16</id>
                                     <name>Diagnose complete?</name>
-                                    <incomingConnections id="66">
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="63"/>
+                                    <incomingConnections id="57">
+                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="58">
+                                        <type>1</type>
+                                        <from class="org.drools.ruleflow.core.impl.MilestoneNodeImpl" reference="5"/>
+                                        <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="14"/>
+                                      </org.drools.ruleflow.core.impl.ConnectionImpl>
                                     </incomingConnections>
+                                    <outgoingConnections id="59">
+                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="13"/>
+                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="16"/>
+                                    </outgoingConnections>
+                                  </from>
+                                  <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="11"/>
+                                </org.drools.ruleflow.core.impl.ConnectionImpl>
+                              </incomingConnections>
+                              <outgoingConnections id="60">
+                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
+                              </outgoingConnections>
+                            </from>
+                            <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="8"/>
+                          </org.drools.ruleflow.core.impl.ConnectionImpl>
+                          <org.drools.ruleflow.core.impl.ConnectionImpl id="61">
+                            <type>1</type>
+                            <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="62">
+                              <ruleFlowGroup>Examinations</ruleFlowGroup>
+                              <id>11</id>
+                              <name>Examinations</name>
+                              <incomingConnections id="63">
+                                <org.drools.ruleflow.core.impl.ConnectionImpl id="64">
+                                  <type>1</type>
+                                  <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="65">
+                                    <id>7</id>
+                                    <name>Start</name>
+                                    <incomingConnections id="66"/>
                                     <outgoingConnections id="67">
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="43"/>
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="40"/>
+                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="64"/>
                                     </outgoingConnections>
                                   </from>
-                                  <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="37"/>
+                                  <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="62"/>
                                 </org.drools.ruleflow.core.impl.ConnectionImpl>
                               </incomingConnections>
                               <outgoingConnections id="68">
-                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="36"/>
+                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="61"/>
                               </outgoingConnections>
                             </from>
-                            <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="8"/>
+                            <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="8"/>
                           </org.drools.ruleflow.core.impl.ConnectionImpl>
                         </incomingConnections>
                         <outgoingConnections id="69">
-                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
                           <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
-                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="30"/>
                         </outgoingConnections>
                       </from>
-                      <to class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" reference="5"/>
+                      <to class="org.drools.ruleflow.core.impl.MilestoneNodeImpl" reference="5"/>
                     </org.drools.ruleflow.core.impl.ConnectionImpl>
                   </incomingConnections>
                   <outgoingConnections id="70">
-                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="17"/>
+                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="58"/>
                   </outgoingConnections>
                 </element>
                 <incomingConnections id="71">
@@ -264,329 +264,460 @@
                       <default>
                         <type>1</type>
                         <bendpoints id="73"/>
-                        <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" id="74" serialization="custom">
+                        <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="74" serialization="custom">
                           <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                             <default>
                               <constraint id="75">
-                                <x>218</x>
-                                <y>364</y>
-                                <width>115</width>
-                                <height>40</height>
+                                <x>269</x>
+                                <y>128</y>
+                                <width>11</width>
+                                <height>14</height>
                               </constraint>
-                              <element class="org.drools.ruleflow.core.impl.SplitImpl" reference="8"/>
+                              <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="8"/>
                               <incomingConnections id="76">
                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="77" serialization="custom">
                                   <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                     <default>
                                       <type>1</type>
-                                      <bendpoints id="78"/>
-                                      <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="79" serialization="custom">
+                                      <bendpoints id="78">
+                                        <org.eclipse.draw2d.geometry.Point id="79">
+                                          <x>433</x>
+                                          <y>134</y>
+                                        </org.eclipse.draw2d.geometry.Point>
+                                      </bendpoints>
+                                      <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="80" serialization="custom">
                                         <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                           <default>
-                                            <constraint id="80">
-                                              <x>237</x>
-                                              <y>293</y>
-                                              <width>77</width>
+                                            <constraint id="81">
+                                              <x>360</x>
+                                              <y>165</y>
+                                              <width>147</width>
                                               <height>40</height>
                                             </constraint>
-                                            <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="37"/>
-                                            <incomingConnections id="81">
-                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="82" serialization="custom">
+                                            <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="11"/>
+                                            <incomingConnections id="82">
+                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="83" serialization="custom">
                                                 <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                   <default>
                                                     <type>1</type>
-                                                    <bendpoints id="83"/>
-                                                    <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" id="84" serialization="custom">
+                                                    <bendpoints id="84">
+                                                      <org.eclipse.draw2d.geometry.Point id="85">
+                                                        <x>433</x>
+                                                        <y>240</y>
+                                                      </org.eclipse.draw2d.geometry.Point>
+                                                    </bendpoints>
+                                                    <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" id="86" serialization="custom">
                                                       <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                         <default>
-                                                          <constraint id="85">
+                                                          <constraint id="87">
                                                             <x>214</x>
                                                             <y>225</y>
                                                             <width>124</width>
                                                             <height>32</height>
                                                           </constraint>
-                                                          <element class="org.drools.ruleflow.core.impl.SplitImpl" reference="41"/>
-                                                          <incomingConnections id="86">
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="87" serialization="custom">
+                                                          <element class="org.drools.ruleflow.core.impl.SplitImpl" reference="14"/>
+                                                          <incomingConnections id="88">
+                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="89" serialization="custom">
                                                               <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                 <default>
                                                                   <type>1</type>
-                                                                  <bendpoints id="88"/>
-                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.MilestoneWrapper" id="89" serialization="custom">
+                                                                  <bendpoints id="90"/>
+                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.MilestoneWrapper" reference="3"/>
+                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="86"/>
+                                                                </default>
+                                                              </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                <default>
+                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="58"/>
+                                                                </default>
+                                                              </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                            </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                          </incomingConnections>
+                                                          <outgoingConnections id="91">
+                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="83"/>
+                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="92" serialization="custom">
+                                                              <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                <default>
+                                                                  <type>1</type>
+                                                                  <bendpoints id="93"/>
+                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="86"/>
+                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="94" serialization="custom">
                                                                     <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                                       <default>
-                                                                        <constraint id="90">
-                                                                          <x>214</x>
-                                                                          <y>167</y>
-                                                                          <width>121</width>
+                                                                        <constraint id="95">
+                                                                          <x>237</x>
+                                                                          <y>293</y>
+                                                                          <width>77</width>
                                                                           <height>40</height>
                                                                         </constraint>
-                                                                        <element class="org.drools.ruleflow.core.impl.MilestoneNodeImpl" reference="60"/>
-                                                                        <incomingConnections id="91">
-                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="92" serialization="custom">
+                                                                        <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="17"/>
+                                                                        <incomingConnections id="96">
+                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="92"/>
+                                                                        </incomingConnections>
+                                                                        <outgoingConnections id="97">
+                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="98" serialization="custom">
                                                                             <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                               <default>
                                                                                 <type>1</type>
-                                                                                <bendpoints id="93"/>
-                                                                                <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="94" serialization="custom">
+                                                                                <bendpoints id="99"/>
+                                                                                <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="94"/>
+                                                                                <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" id="100" serialization="custom">
                                                                                   <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                                                     <default>
-                                                                                      <constraint id="95">
-                                                                                        <x>269</x>
-                                                                                        <y>128</y>
-                                                                                        <width>11</width>
-                                                                                        <height>14</height>
+                                                                                      <constraint id="101">
+                                                                                        <x>218</x>
+                                                                                        <y>364</y>
+                                                                                        <width>115</width>
+                                                                                        <height>40</height>
                                                                                       </constraint>
-                                                                                      <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="48"/>
-                                                                                      <incomingConnections id="96">
-                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="97" serialization="custom">
+                                                                                      <element class="org.drools.ruleflow.core.impl.SplitImpl" reference="22"/>
+                                                                                      <incomingConnections id="102">
+                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="98"/>
+                                                                                      </incomingConnections>
+                                                                                      <outgoingConnections id="103">
+                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="104" serialization="custom">
                                                                                           <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                                             <default>
                                                                                               <type>1</type>
-                                                                                              <bendpoints id="98">
-                                                                                                <org.eclipse.draw2d.geometry.Point id="99">
-                                                                                                  <x>433</x>
-                                                                                                  <y>134</y>
-                                                                                                </org.eclipse.draw2d.geometry.Point>
-                                                                                              </bendpoints>
-                                                                                              <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="100" serialization="custom">
+                                                                                              <bendpoints id="105"/>
+                                                                                              <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="100"/>
+                                                                                              <target class="org.drools.eclipse.flow.ruleflow.core.SubFlowWrapper" id="106" serialization="custom">
                                                                                                 <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                                                                   <default>
-                                                                                                    <constraint id="101">
-                                                                                                      <x>360</x>
-                                                                                                      <y>165</y>
-                                                                                                      <width>147</width>
+                                                                                                    <constraint id="107">
+                                                                                                      <x>131</x>
+                                                                                                      <y>437</y>
+                                                                                                      <width>89</width>
                                                                                                       <height>40</height>
                                                                                                     </constraint>
-                                                                                                    <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="44"/>
-                                                                                                    <incomingConnections id="102">
-                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="103" serialization="custom">
+                                                                                                    <element class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" reference="25"/>
+                                                                                                    <incomingConnections id="108">
+                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="104"/>
+                                                                                                    </incomingConnections>
+                                                                                                    <outgoingConnections id="109">
+                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="110" serialization="custom">
                                                                                                         <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                                                           <default>
                                                                                                             <type>1</type>
-                                                                                                            <bendpoints id="104">
-                                                                                                              <org.eclipse.draw2d.geometry.Point id="105">
-                                                                                                                <x>433</x>
-                                                                                                                <y>240</y>
-                                                                                                              </org.eclipse.draw2d.geometry.Point>
-                                                                                                            </bendpoints>
-                                                                                                            <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="84"/>
-                                                                                                            <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="100"/>
+                                                                                                            <bendpoints id="111"/>
+                                                                                                            <source class="org.drools.eclipse.flow.ruleflow.core.SubFlowWrapper" reference="106"/>
+                                                                                                            <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="112" serialization="custom">
+                                                                                                              <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                                                <default>
+                                                                                                                  <constraint id="113">
+                                                                                                                    <x>218</x>
+                                                                                                                    <y>501</y>
+                                                                                                                    <width>13</width>
+                                                                                                                    <height>14</height>
+                                                                                                                  </constraint>
+                                                                                                                  <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="29"/>
+                                                                                                                  <incomingConnections id="114">
+                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="115" serialization="custom">
+                                                                                                                      <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                                                        <default>
+                                                                                                                          <type>1</type>
+                                                                                                                          <bendpoints id="116"/>
+                                                                                                                          <source class="org.drools.eclipse.flow.ruleflow.core.SubFlowWrapper" id="117" serialization="custom">
+                                                                                                                            <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                                                              <default>
+                                                                                                                                <constraint id="118">
+                                                                                                                                  <x>230</x>
+                                                                                                                                  <y>437</y>
+                                                                                                                                  <width>90</width>
+                                                                                                                                  <height>40</height>
+                                                                                                                                </constraint>
+                                                                                                                                <element class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" reference="32"/>
+                                                                                                                                <incomingConnections id="119">
+                                                                                                                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="120" serialization="custom">
+                                                                                                                                    <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                                                                      <default>
+                                                                                                                                        <type>1</type>
+                                                                                                                                        <bendpoints id="121"/>
+                                                                                                                                        <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="100"/>
+                                                                                                                                        <target class="org.drools.eclipse.flow.ruleflow.core.SubFlowWrapper" reference="117"/>
+                                                                                                                                      </default>
+                                                                                                                                    </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                                                      <default>
+                                                                                                                                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="34"/>
+                                                                                                                                      </default>
+                                                                                                                                    </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                                                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                                                </incomingConnections>
+                                                                                                                                <outgoingConnections id="122">
+                                                                                                                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="115"/>
+                                                                                                                                </outgoingConnections>
+                                                                                                                                <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+                                                                                                                              </default>
+                                                                                                                            </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                                                          </source>
+                                                                                                                          <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="112"/>
+                                                                                                                        </default>
+                                                                                                                      </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                                        <default>
+                                                                                                                          <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="31"/>
+                                                                                                                        </default>
+                                                                                                                      </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                                    </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="110"/>
+                                                                                                                  </incomingConnections>
+                                                                                                                  <outgoingConnections id="123">
+                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="124" serialization="custom">
+                                                                                                                      <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                                                        <default>
+                                                                                                                          <type>1</type>
+                                                                                                                          <bendpoints id="125"/>
+                                                                                                                          <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="112"/>
+                                                                                                                          <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="126" serialization="custom">
+                                                                                                                            <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                                                              <default>
+                                                                                                                                <constraint id="127">
+                                                                                                                                  <x>158</x>
+                                                                                                                                  <y>533</y>
+                                                                                                                                  <width>134</width>
+                                                                                                                                  <height>40</height>
+                                                                                                                                </constraint>
+                                                                                                                                <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="38"/>
+                                                                                                                                <incomingConnections id="128">
+                                                                                                                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="124"/>
+                                                                                                                                </incomingConnections>
+                                                                                                                                <outgoingConnections id="129">
+                                                                                                                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="130" serialization="custom">
+                                                                                                                                    <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                                                                      <default>
+                                                                                                                                        <type>1</type>
+                                                                                                                                        <bendpoints id="131"/>
+                                                                                                                                        <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="126"/>
+                                                                                                                                        <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="132" serialization="custom">
+                                                                                                                                          <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                                                                            <default>
+                                                                                                                                              <constraint id="133">
+                                                                                                                                                <x>185</x>
+                                                                                                                                                <y>595</y>
+                                                                                                                                                <width>80</width>
+                                                                                                                                                <height>40</height>
+                                                                                                                                              </constraint>
+                                                                                                                                              <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="43"/>
+                                                                                                                                              <incomingConnections id="134">
+                                                                                                                                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="130"/>
+                                                                                                                                              </incomingConnections>
+                                                                                                                                              <outgoingConnections id="135"/>
+                                                                                                                                              <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+                                                                                                                                            </default>
+                                                                                                                                          </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                                                                        </target>
+                                                                                                                                      </default>
+                                                                                                                                    </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                                                      <default>
+                                                                                                                                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="42"/>
+                                                                                                                                      </default>
+                                                                                                                                    </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                                                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                                                </outgoingConnections>
+                                                                                                                                <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+                                                                                                                              </default>
+                                                                                                                            </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                                                            <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+                                                                                                                              <default>
+                                                                                                                                <descriptors id="136">
+                                                                                                                                  <org.eclipse.ui.views.properties.TextPropertyDescriptor id="137">
+                                                                                                                                    <id class="string">Name</id>
+                                                                                                                                    <display>Name</display>
+                                                                                                                                    <incompatible>false</incompatible>
+                                                                                                                                  </org.eclipse.ui.views.properties.TextPropertyDescriptor>
+                                                                                                                                  <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="138">
+                                                                                                                                    <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="139">
+                                                                                                                                      <nodes id="140">
+                                                                                                                                        <entry>
+                                                                                                                                          <long>7</long>
+                                                                                                                                          <org.drools.ruleflow.core.impl.StartNodeImpl reference="65"/>
+                                                                                                                                        </entry>
+                                                                                                                                        <entry>
+                                                                                                                                          <long>8</long>
+                                                                                                                                          <org.drools.ruleflow.core.impl.EndNodeImpl reference="43"/>
+                                                                                                                                        </entry>
+                                                                                                                                        <entry>
+                                                                                                                                          <long>11</long>
+                                                                                                                                          <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="62"/>
+                                                                                                                                        </entry>
+                                                                                                                                        <entry>
+                                                                                                                                          <long>12</long>
+                                                                                                                                          <org.drools.ruleflow.core.impl.MilestoneNodeImpl reference="5"/>
+                                                                                                                                        </entry>
+                                                                                                                                        <entry>
+                                                                                                                                          <long>15</long>
+                                                                                                                                          <org.drools.ruleflow.core.impl.JoinImpl reference="8"/>
+                                                                                                                                        </entry>
+                                                                                                                                        <entry>
+                                                                                                                                          <long>17</long>
+                                                                                                                                          <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="11"/>
+                                                                                                                                        </entry>
+                                                                                                                                        <entry>
+                                                                                                                                          <long>16</long>
+                                                                                                                                          <org.drools.ruleflow.core.impl.SplitImpl reference="14"/>
+                                                                                                                                        </entry>
+                                                                                                                                        <entry>
+                                                                                                                                          <long>19</long>
+                                                                                                                                          <org.drools.ruleflow.core.impl.SplitImpl reference="22"/>
+                                                                                                                                        </entry>
+                                                                                                                                        <entry>
+                                                                                                                                          <long>23</long>
+                                                                                                                                          <org.drools.ruleflow.core.impl.JoinImpl reference="29"/>
+                                                                                                                                        </entry>
+                                                                                                                                        <entry>
+                                                                                                                                          <long>25</long>
+                                                                                                                                          <org.drools.ruleflow.core.impl.SubFlowNodeImpl reference="25"/>
+                                                                                                                                        </entry>
+                                                                                                                                        <entry>
+                                                                                                                                          <long>27</long>
+                                                                                                                                          <org.drools.ruleflow.core.impl.EndNodeImpl reference="49"/>
+                                                                                                                                        </entry>
+                                                                                                                                        <entry>
+                                                                                                                                          <long>26</long>
+                                                                                                                                          <org.drools.ruleflow.core.impl.SubFlowNodeImpl reference="32"/>
+                                                                                                                                        </entry>
+                                                                                                                                        <entry>
+                                                                                                                                          <long>29</long>
+                                                                                                                                          <org.drools.ruleflow.core.impl.ActionNodeImpl reference="38"/>
+                                                                                                                                        </entry>
+                                                                                                                                        <entry>
+                                                                                                                                          <long>28</long>
+                                                                                                                                          <org.drools.ruleflow.core.impl.ActionNodeImpl reference="17"/>
+                                                                                                                                        </entry>
+                                                                                                                                      </nodes>
+                                                                                                                                      <variables id="141"/>
+                                                                                                                                      <lastNodeId>31</lastNodeId>
+                                                                                                                                      <imports id="142">
+                                                                                                                                        <string>org.drools.examples.cdss.data.Diagnose</string>
+                                                                                                                                        <string>org.drools.examples.cdss.Terminology</string>
+                                                                                                                                      </imports>
+                                                                                                                                      <id>org.drools.examples.cdss.ClinicalPathwayX</id>
+                                                                                                                                      <name>ClinicalPathwayX</name>
+                                                                                                                                      <version>1.0</version>
+                                                                                                                                      <type>RuleFlow</type>
+                                                                                                                                      <packageName>com.sample</packageName>
+                                                                                                                                    </process>
+                                                                                                                                    <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="38"/>
+                                                                                                                                    <id class="string">Action</id>
+                                                                                                                                    <display>Action</display>
+                                                                                                                                    <incompatible>false</incompatible>
+                                                                                                                                  </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
+                                                                                                                                </descriptors>
+                                                                                                                              </default>
+                                                                                                                            </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+                                                                                                                          </target>
+                                                                                                                        </default>
+                                                                                                                      </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                                        <default>
+                                                                                                                          <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="37"/>
+                                                                                                                        </default>
+                                                                                                                      </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                                    </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                                  </outgoingConnections>
+                                                                                                                  <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+                                                                                                                </default>
+                                                                                                              </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                                            </target>
                                                                                                           </default>
                                                                                                         </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                                                         <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                                           <default>
-                                                                                                            <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="43"/>
+                                                                                                            <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="28"/>
                                                                                                           </default>
                                                                                                         </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                                       </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                    </incomingConnections>
-                                                                                                    <outgoingConnections id="106">
-                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="97"/>
                                                                                                     </outgoingConnections>
                                                                                                     <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                                                                   </default>
                                                                                                 </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                              </source>
-                                                                                              <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="94"/>
+                                                                                              </target>
                                                                                             </default>
                                                                                           </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                                           <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                             <default>
-                                                                                              <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="47"/>
+                                                                                              <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="24"/>
                                                                                             </default>
                                                                                           </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                         </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="107" serialization="custom">
+                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="120"/>
+                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="143" serialization="custom">
                                                                                           <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                                             <default>
                                                                                               <type>1</type>
-                                                                                              <bendpoints id="108"/>
-                                                                                              <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="109" serialization="custom">
+                                                                                              <bendpoints id="144"/>
+                                                                                              <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="100"/>
+                                                                                              <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="145" serialization="custom">
                                                                                                 <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                                                                   <default>
-                                                                                                    <constraint id="110">
-                                                                                                      <x>229</x>
-                                                                                                      <y>68</y>
-                                                                                                      <width>89</width>
+                                                                                                    <constraint id="146">
+                                                                                                      <x>337</x>
+                                                                                                      <y>437</y>
+                                                                                                      <width>80</width>
                                                                                                       <height>40</height>
                                                                                                     </constraint>
-                                                                                                    <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="51"/>
-                                                                                                    <incomingConnections id="111">
-                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="112" serialization="custom">
-                                                                                                        <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                                          <default>
-                                                                                                            <type>1</type>
-                                                                                                            <bendpoints id="113"/>
-                                                                                                            <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="114" serialization="custom">
-                                                                                                              <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                                <default>
-                                                                                                                  <constraint id="115">
-                                                                                                                    <x>235</x>
-                                                                                                                    <y>9</y>
-                                                                                                                    <width>80</width>
-                                                                                                                    <height>40</height>
-                                                                                                                  </constraint>
-                                                                                                                  <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="54"/>
-                                                                                                                  <incomingConnections id="116"/>
-                                                                                                                  <outgoingConnections id="117">
-                                                                                                                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="112"/>
-                                                                                                                  </outgoingConnections>
-                                                                                                                  <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
-                                                                                                                </default>
-                                                                                                              </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                            </source>
-                                                                                                            <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="109"/>
-                                                                                                          </default>
-                                                                                                        </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                          <default>
-                                                                                                            <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="53"/>
-                                                                                                          </default>
-                                                                                                        </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                                      </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                                    <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="49"/>
+                                                                                                    <incomingConnections id="147">
+                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="143"/>
                                                                                                     </incomingConnections>
-                                                                                                    <outgoingConnections id="118">
-                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="107"/>
-                                                                                                    </outgoingConnections>
+                                                                                                    <outgoingConnections id="148"/>
                                                                                                     <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                                                                   </default>
                                                                                                 </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                              </source>
-                                                                                              <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="94"/>
+                                                                                              </target>
                                                                                             </default>
                                                                                           </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                                           <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                             <default>
-                                                                                              <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="50"/>
+                                                                                              <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="48"/>
                                                                                             </default>
                                                                                           </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                                         </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                      </incomingConnections>
-                                                                                      <outgoingConnections id="119">
-                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="92"/>
                                                                                       </outgoingConnections>
                                                                                       <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                                                     </default>
                                                                                   </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                </source>
-                                                                                <target class="org.drools.eclipse.flow.ruleflow.core.MilestoneWrapper" reference="89"/>
+                                                                                  <org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
+                                                                                    <default/>
+                                                                                  </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
+                                                                                </target>
                                                                               </default>
                                                                             </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                             <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                               <default>
-                                                                                <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="59"/>
+                                                                                <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="21"/>
                                                                               </default>
                                                                             </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                           </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                        </incomingConnections>
-                                                                        <outgoingConnections id="120">
-                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="87"/>
                                                                         </outgoingConnections>
                                                                         <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                                       </default>
                                                                     </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                    <org.drools.eclipse.flow.ruleflow.core.MilestoneWrapper>
+                                                                    <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
                                                                       <default>
-                                                                        <descriptors id="121">
-                                                                          <org.eclipse.ui.views.properties.TextPropertyDescriptor id="122">
-                                                                            <id class="string">Name</id>
-                                                                            <display>Name</display>
+                                                                        <descriptors id="149">
+                                                                          <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="137"/>
+                                                                          <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="150">
+                                                                            <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="139"/>
+                                                                            <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="17"/>
+                                                                            <id class="string">Action</id>
+                                                                            <display>Action</display>
                                                                             <incompatible>false</incompatible>
-                                                                          </org.eclipse.ui.views.properties.TextPropertyDescriptor>
-                                                                          <org.drools.eclipse.flow.ruleflow.view.property.constraint.MilestoneConstraintPropertyDescriptor id="123">
-                                                                            <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="124">
-                                                                              <nodes id="125">
-                                                                                <entry>
-                                                                                  <long>15</long>
-                                                                                  <org.drools.ruleflow.core.impl.JoinImpl reference="48"/>
-                                                                                </entry>
-                                                                                <entry>
-                                                                                  <long>19</long>
-                                                                                  <org.drools.ruleflow.core.impl.SplitImpl reference="8"/>
-                                                                                </entry>
-                                                                                <entry>
-                                                                                  <long>8</long>
-                                                                                  <org.drools.ruleflow.core.impl.EndNodeImpl reference="25"/>
-                                                                                </entry>
-                                                                                <entry>
-                                                                                  <long>26</long>
-                                                                                  <org.drools.ruleflow.core.impl.SubFlowNodeImpl reference="5"/>
-                                                                                </entry>
-                                                                                <entry>
-                                                                                  <long>23</long>
-                                                                                  <org.drools.ruleflow.core.impl.JoinImpl reference="15"/>
-                                                                                </entry>
-                                                                                <entry>
-                                                                                  <long>11</long>
-                                                                                  <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="51"/>
-                                                                                </entry>
-                                                                                <entry>
-                                                                                  <long>16</long>
-                                                                                  <org.drools.ruleflow.core.impl.SplitImpl reference="41"/>
-                                                                                </entry>
-                                                                                <entry>
-                                                                                  <long>7</long>
-                                                                                  <org.drools.ruleflow.core.impl.StartNodeImpl reference="54"/>
-                                                                                </entry>
-                                                                                <entry>
-                                                                                  <long>12</long>
-                                                                                  <org.drools.ruleflow.core.impl.MilestoneNodeImpl reference="60"/>
-                                                                                </entry>
-                                                                                <entry>
-                                                                                  <long>27</long>
-                                                                                  <org.drools.ruleflow.core.impl.EndNodeImpl reference="31"/>
-                                                                                </entry>
-                                                                                <entry>
-                                                                                  <long>17</long>
-                                                                                  <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="44"/>
-                                                                                </entry>
-                                                                                <entry>
-                                                                                  <long>28</long>
-                                                                                  <org.drools.ruleflow.core.impl.ActionNodeImpl reference="37"/>
-                                                                                </entry>
-                                                                                <entry>
-                                                                                  <long>29</long>
-                                                                                  <org.drools.ruleflow.core.impl.ActionNodeImpl reference="20"/>
-                                                                                </entry>
-                                                                                <entry>
-                                                                                  <long>25</long>
-                                                                                  <org.drools.ruleflow.core.impl.SubFlowNodeImpl reference="11"/>
-                                                                                </entry>
-                                                                              </nodes>
-                                                                              <variables id="126"/>
-                                                                              <lastNodeId>31</lastNodeId>
-                                                                              <imports id="127">
-                                                                                <string>org.drools.examples.cdss.data.Diagnose</string>
-                                                                                <string>org.drools.examples.cdss.Terminology</string>
-                                                                              </imports>
-                                                                              <id>org.drools.examples.cdss.ClinicalPathwayX</id>
-                                                                              <name>ClinicalPathwayX</name>
-                                                                              <version>1.0</version>
-                                                                              <type>RuleFlow</type>
-                                                                            </process>
-                                                                            <milestone class="org.drools.ruleflow.core.impl.MilestoneNodeImpl" reference="60"/>
-                                                                            <id class="string">Constraint</id>
-                                                                            <display>Constraint</display>
-                                                                            <incompatible>false</incompatible>
-                                                                          </org.drools.eclipse.flow.ruleflow.view.property.constraint.MilestoneConstraintPropertyDescriptor>
+                                                                          </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
                                                                         </descriptors>
                                                                       </default>
-                                                                    </org.drools.eclipse.flow.ruleflow.core.MilestoneWrapper>
-                                                                  </source>
-                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="84"/>
+                                                                    </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+                                                                  </target>
                                                                 </default>
                                                               </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                               <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                 <default>
-                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="63"/>
+                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="16"/>
                                                                 </default>
                                                               </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                             </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                          </incomingConnections>
-                                                          <outgoingConnections id="128">
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="103"/>
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="82"/>
                                                           </outgoingConnections>
                                                           <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                         </default>
@@ -595,250 +726,106 @@
                                                         <default/>
                                                       </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
                                                     </source>
-                                                    <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="79"/>
+                                                    <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="80"/>
                                                   </default>
                                                 </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                   <default>
-                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="40"/>
+                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="13"/>
                                                   </default>
                                                 </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                               </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                             </incomingConnections>
-                                            <outgoingConnections id="129">
+                                            <outgoingConnections id="151">
                                               <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="77"/>
                                             </outgoingConnections>
                                             <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                           </default>
                                         </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                        <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
-                                          <default>
-                                            <descriptors id="130">
-                                              <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="122"/>
-                                              <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="131">
-                                                <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="124"/>
-                                                <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="37"/>
-                                                <id class="string">Action</id>
-                                                <display>Action</display>
-                                                <incompatible>false</incompatible>
-                                              </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
-                                            </descriptors>
-                                          </default>
-                                        </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
                                       </source>
-                                      <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="74"/>
+                                      <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="74"/>
                                     </default>
                                   </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                   <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                     <default>
-                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="36"/>
+                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="10"/>
                                     </default>
                                   </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                 </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                              </incomingConnections>
-                              <outgoingConnections id="132">
-                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="133" serialization="custom">
+                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="152" serialization="custom">
                                   <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                     <default>
                                       <type>1</type>
-                                      <bendpoints id="134"/>
-                                      <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="74"/>
-                                      <target class="org.drools.eclipse.flow.ruleflow.core.SubFlowWrapper" id="135" serialization="custom">
+                                      <bendpoints id="153"/>
+                                      <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="154" serialization="custom">
                                         <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                           <default>
-                                            <constraint id="136">
-                                              <x>131</x>
-                                              <y>437</y>
+                                            <constraint id="155">
+                                              <x>229</x>
+                                              <y>68</y>
                                               <width>89</width>
                                               <height>40</height>
                                             </constraint>
-                                            <element class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" reference="11"/>
-                                            <incomingConnections id="137">
-                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="133"/>
-                                            </incomingConnections>
-                                            <outgoingConnections id="138">
-                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="139" serialization="custom">
+                                            <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="62"/>
+                                            <incomingConnections id="156">
+                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="157" serialization="custom">
                                                 <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                   <default>
                                                     <type>1</type>
-                                                    <bendpoints id="140"/>
-                                                    <source class="org.drools.eclipse.flow.ruleflow.core.SubFlowWrapper" reference="135"/>
-                                                    <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="141" serialization="custom">
+                                                    <bendpoints id="158"/>
+                                                    <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="159" serialization="custom">
                                                       <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                         <default>
-                                                          <constraint id="142">
-                                                            <x>218</x>
-                                                            <y>501</y>
-                                                            <width>13</width>
-                                                            <height>14</height>
+                                                          <constraint id="160">
+                                                            <x>235</x>
+                                                            <y>9</y>
+                                                            <width>80</width>
+                                                            <height>40</height>
                                                           </constraint>
-                                                          <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="15"/>
-                                                          <incomingConnections id="143">
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="144" serialization="custom">
-                                                              <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                <default>
-                                                                  <type>1</type>
-                                                                  <bendpoints id="145"/>
-                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.SubFlowWrapper" reference="3"/>
-                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="141"/>
-                                                                </default>
-                                                              </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                <default>
-                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="17"/>
-                                                                </default>
-                                                              </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                            </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="139"/>
-                                                          </incomingConnections>
-                                                          <outgoingConnections id="146">
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="147" serialization="custom">
-                                                              <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                <default>
-                                                                  <type>1</type>
-                                                                  <bendpoints id="148"/>
-                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="141"/>
-                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="149" serialization="custom">
-                                                                    <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                      <default>
-                                                                        <constraint id="150">
-                                                                          <x>158</x>
-                                                                          <y>533</y>
-                                                                          <width>134</width>
-                                                                          <height>40</height>
-                                                                        </constraint>
-                                                                        <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="20"/>
-                                                                        <incomingConnections id="151">
-                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="147"/>
-                                                                        </incomingConnections>
-                                                                        <outgoingConnections id="152">
-                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="153" serialization="custom">
-                                                                            <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                              <default>
-                                                                                <type>1</type>
-                                                                                <bendpoints id="154"/>
-                                                                                <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="149"/>
-                                                                                <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="155" serialization="custom">
-                                                                                  <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                    <default>
-                                                                                      <constraint id="156">
-                                                                                        <x>185</x>
-                                                                                        <y>595</y>
-                                                                                        <width>80</width>
-                                                                                        <height>40</height>
-                                                                                      </constraint>
-                                                                                      <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="25"/>
-                                                                                      <incomingConnections id="157">
-                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="153"/>
-                                                                                      </incomingConnections>
-                                                                                      <outgoingConnections id="158"/>
-                                                                                      <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
-                                                                                    </default>
-                                                                                  </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                </target>
-                                                                              </default>
-                                                                            </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                              <default>
-                                                                                <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="24"/>
-                                                                              </default>
-                                                                            </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                          </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                        </outgoingConnections>
-                                                                        <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
-                                                                      </default>
-                                                                    </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                    <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
-                                                                      <default>
-                                                                        <descriptors id="159">
-                                                                          <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="122"/>
-                                                                          <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="160">
-                                                                            <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="124"/>
-                                                                            <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="20"/>
-                                                                            <id class="string">Action</id>
-                                                                            <display>Action</display>
-                                                                            <incompatible>false</incompatible>
-                                                                          </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
-                                                                        </descriptors>
-                                                                      </default>
-                                                                    </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
-                                                                  </target>
-                                                                </default>
-                                                              </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                <default>
-                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="19"/>
-                                                                </default>
-                                                              </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                            </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                          <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="65"/>
+                                                          <incomingConnections id="161"/>
+                                                          <outgoingConnections id="162">
+                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="157"/>
                                                           </outgoingConnections>
                                                           <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                         </default>
                                                       </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                    </target>
+                                                    </source>
+                                                    <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="154"/>
                                                   </default>
                                                 </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                   <default>
-                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="14"/>
+                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="64"/>
                                                   </default>
                                                 </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                               </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                            </incomingConnections>
+                                            <outgoingConnections id="163">
+                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="152"/>
                                             </outgoingConnections>
                                             <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                           </default>
                                         </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                      </target>
+                                      </source>
+                                      <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="74"/>
                                     </default>
                                   </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                   <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                     <default>
-                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="10"/>
+                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="61"/>
                                     </default>
                                   </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                 </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                              </incomingConnections>
+                              <outgoingConnections id="164">
                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="72"/>
-                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="161" serialization="custom">
-                                  <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                    <default>
-                                      <type>1</type>
-                                      <bendpoints id="162"/>
-                                      <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="74"/>
-                                      <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="163" serialization="custom">
-                                        <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                          <default>
-                                            <constraint id="164">
-                                              <x>337</x>
-                                              <y>437</y>
-                                              <width>80</width>
-                                              <height>40</height>
-                                            </constraint>
-                                            <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="31"/>
-                                            <incomingConnections id="165">
-                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="161"/>
-                                            </incomingConnections>
-                                            <outgoingConnections id="166"/>
-                                            <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
-                                          </default>
-                                        </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                      </target>
-                                    </default>
-                                  </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                    <default>
-                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="30"/>
-                                    </default>
-                                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                               </outgoingConnections>
                               <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                             </default>
                           </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
-                            <default/>
-                          </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
                         </source>
-                        <target class="org.drools.eclipse.flow.ruleflow.core.SubFlowWrapper" reference="3"/>
+                        <target class="org.drools.eclipse.flow.ruleflow.core.MilestoneWrapper" reference="3"/>
                       </default>
                     </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                     <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
@@ -848,68 +835,82 @@
                     </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                   </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                 </incomingConnections>
-                <outgoingConnections id="167">
-                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="144"/>
+                <outgoingConnections id="165">
+                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="89"/>
                 </outgoingConnections>
                 <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
               </default>
             </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-          </org.drools.eclipse.flow.ruleflow.core.SubFlowWrapper>
+            <org.drools.eclipse.flow.ruleflow.core.MilestoneWrapper>
+              <default>
+                <descriptors id="166">
+                  <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="137"/>
+                  <org.drools.eclipse.flow.ruleflow.view.property.constraint.MilestoneConstraintPropertyDescriptor id="167">
+                    <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="139"/>
+                    <milestone class="org.drools.ruleflow.core.impl.MilestoneNodeImpl" reference="5"/>
+                    <id class="string">Constraint</id>
+                    <display>Constraint</display>
+                    <incompatible>false</incompatible>
+                  </org.drools.eclipse.flow.ruleflow.view.property.constraint.MilestoneConstraintPropertyDescriptor>
+                </descriptors>
+              </default>
+            </org.drools.eclipse.flow.ruleflow.core.MilestoneWrapper>
+          </org.drools.eclipse.flow.ruleflow.core.MilestoneWrapper>
         </entry>
         <entry>
-          <string>11-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="109"/>
+          <string>16-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper reference="86"/>
         </entry>
         <entry>
-          <string>12-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.MilestoneWrapper reference="89"/>
+          <string>28-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="94"/>
         </entry>
         <entry>
-          <string>23-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="141"/>
+          <string>19-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper reference="100"/>
         </entry>
         <entry>
-          <string>19-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper reference="74"/>
+          <string>17-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="80"/>
         </entry>
         <entry>
-          <string>15-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="94"/>
+          <string>23-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="112"/>
         </entry>
         <entry>
-          <string>29-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="149"/>
+          <string>25-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.SubFlowWrapper reference="106"/>
         </entry>
         <entry>
-          <string>27-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="163"/>
+          <string>29-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="126"/>
         </entry>
         <entry>
           <string>7-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="114"/>
+          <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="159"/>
         </entry>
         <entry>
-          <string>16-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper reference="84"/>
+          <string>8-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="132"/>
         </entry>
         <entry>
-          <string>25-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.SubFlowWrapper reference="135"/>
+          <string>11-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="154"/>
         </entry>
         <entry>
-          <string>28-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="79"/>
+          <string>26-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.SubFlowWrapper reference="117"/>
         </entry>
         <entry>
-          <string>17-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="100"/>
+          <string>15-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="74"/>
         </entry>
         <entry>
-          <string>8-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="155"/>
+          <string>27-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="145"/>
         </entry>
       </elements>
-      <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="124"/>
+      <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="139"/>
       <routerLayout>2</routerLayout>
     </default>
   </org.drools.eclipse.flow.common.editor.core.ProcessWrapper>

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/ClinicalPathwayX.rfm
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/ClinicalPathwayX.rfm	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/ClinicalPathwayX.rfm	2007-10-03 00:20:35 UTC (rev 15530)
@@ -1,304 +1,304 @@
 <org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
   <nodes id="2">
     <entry>
-      <long>15</long>
-      <org.drools.ruleflow.core.impl.JoinImpl id="3">
-        <type>2</type>
-        <id>15</id>
-        <name></name>
-        <incomingConnections id="4">
-          <org.drools.ruleflow.core.impl.ConnectionImpl id="5">
+      <long>7</long>
+      <org.drools.ruleflow.core.impl.StartNodeImpl id="3">
+        <id>7</id>
+        <name>Start</name>
+        <incomingConnections id="4"/>
+        <outgoingConnections id="5">
+          <org.drools.ruleflow.core.impl.ConnectionImpl id="6">
             <type>1</type>
-            <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="6">
-              <ruleFlowGroup>AdditionalExaminations</ruleFlowGroup>
-              <id>17</id>
-              <name>Additional Examinations</name>
-              <incomingConnections id="7">
-                <org.drools.ruleflow.core.impl.ConnectionImpl id="8">
+            <from class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="3"/>
+            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="7">
+              <ruleFlowGroup>Examinations</ruleFlowGroup>
+              <id>11</id>
+              <name>Examinations</name>
+              <incomingConnections id="8">
+                <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
+              </incomingConnections>
+              <outgoingConnections id="9">
+                <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
                   <type>1</type>
-                  <from class="org.drools.ruleflow.core.impl.SplitImpl" id="9">
+                  <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="7"/>
+                  <to class="org.drools.ruleflow.core.impl.JoinImpl" id="11">
                     <type>2</type>
-                    <constraints id="10">
-                      <entry>
-                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="8"/>
-                        <org.drools.ruleflow.core.impl.ConstraintImpl id="11">
-                          <name>Diagnose inconclusive</name>
-                          <constraint>Diagnose( type == Terminology.DIAGNOSE_X_TYPE_UNKNOWN )</constraint>
-                          <priority>1</priority>
-                        </org.drools.ruleflow.core.impl.ConstraintImpl>
-                      </entry>
-                      <entry>
-                        <org.drools.ruleflow.core.impl.ConnectionImpl id="12">
-                          <type>1</type>
-                          <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="9"/>
-                          <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="13">
-                            <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="14">
-                              <consequence>System.out.println(&quot;Notifying GP of patient of the diagnose.&quot;);</consequence>
-                            </action>
-                            <id>28</id>
-                            <name>Notify GP</name>
-                            <incomingConnections id="15">
-                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
-                            </incomingConnections>
-                            <outgoingConnections id="16">
-                              <org.drools.ruleflow.core.impl.ConnectionImpl id="17">
-                                <type>1</type>
-                                <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="13"/>
-                                <to class="org.drools.ruleflow.core.impl.SplitImpl" id="18">
-                                  <type>2</type>
-                                  <constraints id="19">
-                                    <entry>
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="20">
-                                        <type>1</type>
-                                        <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="18"/>
-                                        <to class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" id="21">
-                                          <processId>org.drools.examples.cdss.TreatmentX</processId>
-                                          <id>25</id>
-                                          <name>Treatment X</name>
-                                          <incomingConnections id="22">
-                                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="20"/>
-                                          </incomingConnections>
-                                          <outgoingConnections id="23">
-                                            <org.drools.ruleflow.core.impl.ConnectionImpl id="24">
-                                              <type>1</type>
-                                              <from class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" reference="21"/>
-                                              <to class="org.drools.ruleflow.core.impl.JoinImpl" id="25">
-                                                <type>2</type>
-                                                <id>23</id>
-                                                <name></name>
-                                                <incomingConnections id="26">
+                    <id>15</id>
+                    <name></name>
+                    <incomingConnections id="12">
+                      <org.drools.ruleflow.core.impl.ConnectionImpl id="13">
+                        <type>1</type>
+                        <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="14">
+                          <ruleFlowGroup>AdditionalExaminations</ruleFlowGroup>
+                          <id>17</id>
+                          <name>Additional Examinations</name>
+                          <incomingConnections id="15">
+                            <org.drools.ruleflow.core.impl.ConnectionImpl id="16">
+                              <type>1</type>
+                              <from class="org.drools.ruleflow.core.impl.SplitImpl" id="17">
+                                <type>2</type>
+                                <constraints id="18">
+                                  <entry>
+                                    <org.drools.ruleflow.core.impl.ConnectionImpl id="19">
+                                      <type>1</type>
+                                      <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="17"/>
+                                      <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="20">
+                                        <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="21">
+                                          <consequence>System.out.println(&quot;Notifying GP of patient of the diagnose.&quot;);</consequence>
+                                        </action>
+                                        <id>28</id>
+                                        <name>Notify GP</name>
+                                        <incomingConnections id="22">
+                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="19"/>
+                                        </incomingConnections>
+                                        <outgoingConnections id="23">
+                                          <org.drools.ruleflow.core.impl.ConnectionImpl id="24">
+                                            <type>1</type>
+                                            <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="20"/>
+                                            <to class="org.drools.ruleflow.core.impl.SplitImpl" id="25">
+                                              <type>2</type>
+                                              <constraints id="26">
+                                                <entry>
                                                   <org.drools.ruleflow.core.impl.ConnectionImpl id="27">
                                                     <type>1</type>
-                                                    <from class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" id="28">
-                                                      <processId>org.drools.examples.cdss.TreatmentY</processId>
-                                                      <id>26</id>
-                                                      <name>Treatment Y</name>
+                                                    <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="25"/>
+                                                    <to class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" id="28">
+                                                      <processId>org.drools.examples.cdss.TreatmentX</processId>
+                                                      <id>25</id>
+                                                      <name>Treatment X</name>
                                                       <incomingConnections id="29">
-                                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="30">
-                                                          <type>1</type>
-                                                          <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="18"/>
-                                                          <to class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" reference="28"/>
-                                                        </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                      </incomingConnections>
-                                                      <outgoingConnections id="31">
                                                         <org.drools.ruleflow.core.impl.ConnectionImpl reference="27"/>
-                                                      </outgoingConnections>
-                                                    </from>
-                                                    <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="25"/>
-                                                  </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="24"/>
-                                                </incomingConnections>
-                                                <outgoingConnections id="32">
-                                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="33">
-                                                    <type>1</type>
-                                                    <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="25"/>
-                                                    <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="34">
-                                                      <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="35">
-                                                        <consequence>System.out.println(&quot;Scheduling follow-up of patient.&quot;);</consequence>
-                                                      </action>
-                                                      <id>29</id>
-                                                      <name>Schedule Follow-up</name>
-                                                      <incomingConnections id="36">
-                                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="33"/>
                                                       </incomingConnections>
-                                                      <outgoingConnections id="37">
-                                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="38">
+                                                      <outgoingConnections id="30">
+                                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="31">
                                                           <type>1</type>
-                                                          <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="34"/>
-                                                          <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="39">
-                                                            <id>8</id>
-                                                            <name>End</name>
-                                                            <incomingConnections id="40">
-                                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="38"/>
+                                                          <from class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" reference="28"/>
+                                                          <to class="org.drools.ruleflow.core.impl.JoinImpl" id="32">
+                                                            <type>2</type>
+                                                            <id>23</id>
+                                                            <name></name>
+                                                            <incomingConnections id="33">
+                                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="34">
+                                                                <type>1</type>
+                                                                <from class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" id="35">
+                                                                  <processId>org.drools.examples.cdss.TreatmentY</processId>
+                                                                  <id>26</id>
+                                                                  <name>Treatment Y</name>
+                                                                  <incomingConnections id="36">
+                                                                    <org.drools.ruleflow.core.impl.ConnectionImpl id="37">
+                                                                      <type>1</type>
+                                                                      <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="25"/>
+                                                                      <to class="org.drools.ruleflow.core.impl.SubFlowNodeImpl" reference="35"/>
+                                                                    </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                                  </incomingConnections>
+                                                                  <outgoingConnections id="38">
+                                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="34"/>
+                                                                  </outgoingConnections>
+                                                                </from>
+                                                                <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="32"/>
+                                                              </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="31"/>
                                                             </incomingConnections>
-                                                            <outgoingConnections id="41"/>
+                                                            <outgoingConnections id="39">
+                                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="40">
+                                                                <type>1</type>
+                                                                <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="32"/>
+                                                                <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="41">
+                                                                  <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="42">
+                                                                    <consequence>System.out.println(&quot;Scheduling follow-up of patient.&quot;);</consequence>
+                                                                  </action>
+                                                                  <id>29</id>
+                                                                  <name>Schedule Follow-up</name>
+                                                                  <incomingConnections id="43">
+                                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="40"/>
+                                                                  </incomingConnections>
+                                                                  <outgoingConnections id="44">
+                                                                    <org.drools.ruleflow.core.impl.ConnectionImpl id="45">
+                                                                      <type>1</type>
+                                                                      <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="41"/>
+                                                                      <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="46">
+                                                                        <id>8</id>
+                                                                        <name>End</name>
+                                                                        <incomingConnections id="47">
+                                                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="45"/>
+                                                                        </incomingConnections>
+                                                                        <outgoingConnections id="48"/>
+                                                                      </to>
+                                                                    </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                                  </outgoingConnections>
+                                                                </to>
+                                                              </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                            </outgoingConnections>
                                                           </to>
                                                         </org.drools.ruleflow.core.impl.ConnectionImpl>
                                                       </outgoingConnections>
                                                     </to>
                                                   </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                </outgoingConnections>
-                                              </to>
-                                            </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                          </outgoingConnections>
-                                        </to>
-                                      </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                      <org.drools.ruleflow.core.impl.ConstraintImpl id="42">
-                                        <name>Diagnosed type 1</name>
-                                        <constraint>Diagnose( type == Terminology.DIAGNOSE_X_TYPE1 )</constraint>
-                                        <priority>1</priority>
-                                      </org.drools.ruleflow.core.impl.ConstraintImpl>
-                                    </entry>
-                                    <entry>
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="30"/>
-                                      <org.drools.ruleflow.core.impl.ConstraintImpl id="43">
-                                        <name>Diagnosed type 2</name>
-                                        <constraint>Diagnose( type == Terminology.DIAGNOSE_X_TYPE2 )</constraint>
-                                        <priority>2</priority>
-                                      </org.drools.ruleflow.core.impl.ConstraintImpl>
-                                    </entry>
-                                    <entry>
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="44">
-                                        <type>1</type>
-                                        <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="18"/>
-                                        <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="45">
-                                          <id>27</id>
-                                          <name>End</name>
-                                          <incomingConnections id="46">
-                                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="44"/>
-                                          </incomingConnections>
-                                          <outgoingConnections id="47"/>
-                                        </to>
-                                      </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                      <org.drools.ruleflow.core.impl.ConstraintImpl id="48">
-                                        <name>Else</name>
-                                        <constraint>eval(true)</constraint>
-                                        <priority>3</priority>
-                                      </org.drools.ruleflow.core.impl.ConstraintImpl>
-                                    </entry>
-                                  </constraints>
-                                  <id>19</id>
-                                  <name>Select Treatment</name>
-                                  <incomingConnections id="49">
-                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="17"/>
-                                  </incomingConnections>
-                                  <outgoingConnections id="50">
-                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="20"/>
-                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="30"/>
-                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="44"/>
-                                  </outgoingConnections>
-                                </to>
-                              </org.drools.ruleflow.core.impl.ConnectionImpl>
-                            </outgoingConnections>
-                          </to>
-                        </org.drools.ruleflow.core.impl.ConnectionImpl>
-                        <org.drools.ruleflow.core.impl.ConstraintImpl id="51">
-                          <name>Diagnose complete</name>
-                          <constraint>eval(true)</constraint>
-                          <priority>2</priority>
-                        </org.drools.ruleflow.core.impl.ConstraintImpl>
-                      </entry>
-                    </constraints>
-                    <id>16</id>
-                    <name>Diagnose complete?</name>
-                    <incomingConnections id="52">
-                      <org.drools.ruleflow.core.impl.ConnectionImpl id="53">
-                        <type>1</type>
-                        <from class="org.drools.ruleflow.core.impl.MilestoneNodeImpl" id="54">
-                          <constraint>Diagnose(  )</constraint>
-                          <id>12</id>
-                          <name>Wait for Diagnose</name>
-                          <incomingConnections id="55">
-                            <org.drools.ruleflow.core.impl.ConnectionImpl id="56">
-                              <type>1</type>
-                              <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="3"/>
-                              <to class="org.drools.ruleflow.core.impl.MilestoneNodeImpl" reference="54"/>
+                                                  <org.drools.ruleflow.core.impl.ConstraintImpl id="49">
+                                                    <name>Diagnosed type 1</name>
+                                                    <constraint>Diagnose( type == Terminology.DIAGNOSE_X_TYPE1 )</constraint>
+                                                    <priority>1</priority>
+                                                  </org.drools.ruleflow.core.impl.ConstraintImpl>
+                                                </entry>
+                                                <entry>
+                                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="37"/>
+                                                  <org.drools.ruleflow.core.impl.ConstraintImpl id="50">
+                                                    <name>Diagnosed type 2</name>
+                                                    <constraint>Diagnose( type == Terminology.DIAGNOSE_X_TYPE2 )</constraint>
+                                                    <priority>2</priority>
+                                                  </org.drools.ruleflow.core.impl.ConstraintImpl>
+                                                </entry>
+                                                <entry>
+                                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="51">
+                                                    <type>1</type>
+                                                    <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="25"/>
+                                                    <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="52">
+                                                      <id>27</id>
+                                                      <name>End</name>
+                                                      <incomingConnections id="53">
+                                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="51"/>
+                                                      </incomingConnections>
+                                                      <outgoingConnections id="54"/>
+                                                    </to>
+                                                  </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                  <org.drools.ruleflow.core.impl.ConstraintImpl id="55">
+                                                    <name>Else</name>
+                                                    <constraint>eval(true)</constraint>
+                                                    <priority>3</priority>
+                                                  </org.drools.ruleflow.core.impl.ConstraintImpl>
+                                                </entry>
+                                              </constraints>
+                                              <id>19</id>
+                                              <name>Select Treatment</name>
+                                              <incomingConnections id="56">
+                                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="24"/>
+                                              </incomingConnections>
+                                              <outgoingConnections id="57">
+                                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="27"/>
+                                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="37"/>
+                                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="51"/>
+                                              </outgoingConnections>
+                                            </to>
+                                          </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                        </outgoingConnections>
+                                      </to>
+                                    </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                    <org.drools.ruleflow.core.impl.ConstraintImpl id="58">
+                                      <name>Diagnose complete</name>
+                                      <constraint>eval(true)</constraint>
+                                      <priority>2</priority>
+                                    </org.drools.ruleflow.core.impl.ConstraintImpl>
+                                  </entry>
+                                  <entry>
+                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="16"/>
+                                    <org.drools.ruleflow.core.impl.ConstraintImpl id="59">
+                                      <name>Diagnose inconclusive</name>
+                                      <constraint>Diagnose( type == Terminology.DIAGNOSE_X_TYPE_UNKNOWN )</constraint>
+                                      <priority>1</priority>
+                                    </org.drools.ruleflow.core.impl.ConstraintImpl>
+                                  </entry>
+                                </constraints>
+                                <id>16</id>
+                                <name>Diagnose complete?</name>
+                                <incomingConnections id="60">
+                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="61">
+                                    <type>1</type>
+                                    <from class="org.drools.ruleflow.core.impl.MilestoneNodeImpl" id="62">
+                                      <constraint>Diagnose(  )</constraint>
+                                      <id>12</id>
+                                      <name>Wait for Diagnose</name>
+                                      <incomingConnections id="63">
+                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="64">
+                                          <type>1</type>
+                                          <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="11"/>
+                                          <to class="org.drools.ruleflow.core.impl.MilestoneNodeImpl" reference="62"/>
+                                        </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                      </incomingConnections>
+                                      <outgoingConnections id="65">
+                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="61"/>
+                                      </outgoingConnections>
+                                    </from>
+                                    <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="17"/>
+                                  </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                </incomingConnections>
+                                <outgoingConnections id="66">
+                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="16"/>
+                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="19"/>
+                                </outgoingConnections>
+                              </from>
+                              <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="14"/>
                             </org.drools.ruleflow.core.impl.ConnectionImpl>
                           </incomingConnections>
-                          <outgoingConnections id="57">
-                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="53"/>
+                          <outgoingConnections id="67">
+                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="13"/>
                           </outgoingConnections>
                         </from>
-                        <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="9"/>
+                        <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="11"/>
                       </org.drools.ruleflow.core.impl.ConnectionImpl>
+                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
                     </incomingConnections>
-                    <outgoingConnections id="58">
-                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="8"/>
-                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
+                    <outgoingConnections id="68">
+                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="64"/>
                     </outgoingConnections>
-                  </from>
-                  <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="6"/>
+                  </to>
                 </org.drools.ruleflow.core.impl.ConnectionImpl>
-              </incomingConnections>
-              <outgoingConnections id="59">
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="5"/>
               </outgoingConnections>
-            </from>
-            <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="3"/>
+            </to>
           </org.drools.ruleflow.core.impl.ConnectionImpl>
-          <org.drools.ruleflow.core.impl.ConnectionImpl id="60">
-            <type>1</type>
-            <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="61">
-              <ruleFlowGroup>Examinations</ruleFlowGroup>
-              <id>11</id>
-              <name>Examinations</name>
-              <incomingConnections id="62">
-                <org.drools.ruleflow.core.impl.ConnectionImpl id="63">
-                  <type>1</type>
-                  <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="64">
-                    <id>7</id>
-                    <name>Start</name>
-                    <incomingConnections id="65"/>
-                    <outgoingConnections id="66">
-                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="63"/>
-                    </outgoingConnections>
-                  </from>
-                  <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="61"/>
-                </org.drools.ruleflow.core.impl.ConnectionImpl>
-              </incomingConnections>
-              <outgoingConnections id="67">
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="60"/>
-              </outgoingConnections>
-            </from>
-            <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="3"/>
-          </org.drools.ruleflow.core.impl.ConnectionImpl>
-        </incomingConnections>
-        <outgoingConnections id="68">
-          <org.drools.ruleflow.core.impl.ConnectionImpl reference="56"/>
         </outgoingConnections>
-      </org.drools.ruleflow.core.impl.JoinImpl>
+      </org.drools.ruleflow.core.impl.StartNodeImpl>
     </entry>
     <entry>
-      <long>19</long>
-      <org.drools.ruleflow.core.impl.SplitImpl reference="18"/>
+      <long>8</long>
+      <org.drools.ruleflow.core.impl.EndNodeImpl reference="46"/>
     </entry>
     <entry>
-      <long>8</long>
-      <org.drools.ruleflow.core.impl.EndNodeImpl reference="39"/>
+      <long>11</long>
+      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="7"/>
     </entry>
     <entry>
-      <long>26</long>
-      <org.drools.ruleflow.core.impl.SubFlowNodeImpl reference="28"/>
+      <long>12</long>
+      <org.drools.ruleflow.core.impl.MilestoneNodeImpl reference="62"/>
     </entry>
     <entry>
-      <long>23</long>
-      <org.drools.ruleflow.core.impl.JoinImpl reference="25"/>
+      <long>15</long>
+      <org.drools.ruleflow.core.impl.JoinImpl reference="11"/>
     </entry>
     <entry>
-      <long>11</long>
-      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="61"/>
+      <long>17</long>
+      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="14"/>
     </entry>
     <entry>
       <long>16</long>
-      <org.drools.ruleflow.core.impl.SplitImpl reference="9"/>
+      <org.drools.ruleflow.core.impl.SplitImpl reference="17"/>
     </entry>
     <entry>
-      <long>7</long>
-      <org.drools.ruleflow.core.impl.StartNodeImpl reference="64"/>
+      <long>19</long>
+      <org.drools.ruleflow.core.impl.SplitImpl reference="25"/>
     </entry>
     <entry>
-      <long>12</long>
-      <org.drools.ruleflow.core.impl.MilestoneNodeImpl reference="54"/>
+      <long>23</long>
+      <org.drools.ruleflow.core.impl.JoinImpl reference="32"/>
     </entry>
     <entry>
-      <long>27</long>
-      <org.drools.ruleflow.core.impl.EndNodeImpl reference="45"/>
+      <long>25</long>
+      <org.drools.ruleflow.core.impl.SubFlowNodeImpl reference="28"/>
     </entry>
     <entry>
-      <long>17</long>
-      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="6"/>
+      <long>27</long>
+      <org.drools.ruleflow.core.impl.EndNodeImpl reference="52"/>
     </entry>
     <entry>
-      <long>28</long>
-      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="13"/>
+      <long>26</long>
+      <org.drools.ruleflow.core.impl.SubFlowNodeImpl reference="35"/>
     </entry>
     <entry>
       <long>29</long>
-      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="34"/>
+      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="41"/>
     </entry>
     <entry>
-      <long>25</long>
-      <org.drools.ruleflow.core.impl.SubFlowNodeImpl reference="21"/>
+      <long>28</long>
+      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="20"/>
     </entry>
   </nodes>
   <variables id="69"/>
@@ -311,4 +311,5 @@
   <name>ClinicalPathwayX</name>
   <version>1.0</version>
   <type>RuleFlow</type>
+  <packageName>com.sample</packageName>
 </org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/GenericRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/GenericRules.drl	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/GenericRules.drl	2007-10-03 00:20:35 UTC (rev 15530)
@@ -10,7 +10,7 @@
 
 rule "Start Clinical Pathway X if diagnosed"
 	when
-		d: Diagnose( type == Terminology.DIAGNOSE_X_TYPE_UNKNOWN )
+		d: Diagnose( type == Terminology.DIAGNOSE_X )
 	then
 		retract(d);
 		drools.getWorkingMemory().startProcess(

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentX.rf
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentX.rf	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentX.rf	2007-10-03 00:20:35 UTC (rev 15530)
@@ -3,50 +3,50 @@
     <default>
       <elements id="2">
         <entry>
-          <string>2-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper id="3" serialization="custom">
+          <string>4-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper id="3" serialization="custom">
             <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
               <default>
                 <constraint id="4">
-                  <x>393</x>
+                  <x>217</x>
                   <y>101</y>
-                  <width>80</width>
+                  <width>140</width>
                   <height>40</height>
                 </constraint>
-                <element class="org.drools.ruleflow.core.impl.EndNodeImpl" id="5">
-                  <id>2</id>
-                  <name>End</name>
-                  <incomingConnections id="6">
-                    <org.drools.ruleflow.core.impl.ConnectionImpl id="7">
+                <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="5">
+                  <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="6">
+                    <consequence>System.out.println(&quot;Executing TreatmentX&quot;);</consequence>
+                  </action>
+                  <id>4</id>
+                  <name>Dummy TreatmentX</name>
+                  <incomingConnections id="7">
+                    <org.drools.ruleflow.core.impl.ConnectionImpl id="8">
                       <type>1</type>
-                      <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="8">
-                        <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="9">
-                          <consequence>System.out.println(&quot;Executing TreatmentX&quot;);</consequence>
-                        </action>
-                        <id>4</id>
-                        <name>Dummy TreatmentX</name>
-                        <incomingConnections id="10">
-                          <org.drools.ruleflow.core.impl.ConnectionImpl id="11">
-                            <type>1</type>
-                            <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="12">
-                              <id>1</id>
-                              <name>Start</name>
-                              <incomingConnections id="13"/>
-                              <outgoingConnections id="14">
-                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="11"/>
-                              </outgoingConnections>
-                            </from>
-                            <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="8"/>
-                          </org.drools.ruleflow.core.impl.ConnectionImpl>
-                        </incomingConnections>
-                        <outgoingConnections id="15">
-                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
+                      <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="9">
+                        <id>1</id>
+                        <name>Start</name>
+                        <incomingConnections id="10"/>
+                        <outgoingConnections id="11">
+                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="8"/>
                         </outgoingConnections>
                       </from>
-                      <to class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="5"/>
+                      <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
                     </org.drools.ruleflow.core.impl.ConnectionImpl>
                   </incomingConnections>
-                  <outgoingConnections id="16"/>
+                  <outgoingConnections id="12">
+                    <org.drools.ruleflow.core.impl.ConnectionImpl id="13">
+                      <type>1</type>
+                      <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
+                      <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="14">
+                        <id>2</id>
+                        <name>End</name>
+                        <incomingConnections id="15">
+                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="13"/>
+                        </incomingConnections>
+                        <outgoingConnections id="16"/>
+                      </to>
+                    </org.drools.ruleflow.core.impl.ConnectionImpl>
+                  </outgoingConnections>
                 </element>
                 <incomingConnections id="17">
                   <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="18" serialization="custom">
@@ -54,121 +54,122 @@
                       <default>
                         <type>1</type>
                         <bendpoints id="19"/>
-                        <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="20" serialization="custom">
+                        <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="20" serialization="custom">
                           <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                             <default>
                               <constraint id="21">
-                                <x>217</x>
-                                <y>101</y>
-                                <width>140</width>
+                                <x>99</x>
+                                <y>100</y>
+                                <width>80</width>
                                 <height>40</height>
                               </constraint>
-                              <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="8"/>
-                              <incomingConnections id="22">
-                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="23" serialization="custom">
-                                  <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                    <default>
-                                      <type>1</type>
-                                      <bendpoints id="24"/>
-                                      <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="25" serialization="custom">
-                                        <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                          <default>
-                                            <constraint id="26">
-                                              <x>100</x>
-                                              <y>100</y>
-                                              <width>80</width>
-                                              <height>40</height>
-                                            </constraint>
-                                            <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="12"/>
-                                            <incomingConnections id="27"/>
-                                            <outgoingConnections id="28">
-                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="23"/>
-                                            </outgoingConnections>
-                                          </default>
-                                        </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                      </source>
-                                      <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="20"/>
-                                    </default>
-                                  </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                    <default>
-                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="11"/>
-                                    </default>
-                                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                              </incomingConnections>
-                              <outgoingConnections id="29">
+                              <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="9"/>
+                              <incomingConnections id="22"/>
+                              <outgoingConnections id="23">
                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="18"/>
                               </outgoingConnections>
-                              <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                             </default>
                           </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+                        </source>
+                        <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="3"/>
+                      </default>
+                    </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                      <default>
+                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="8"/>
+                      </default>
+                    </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                </incomingConnections>
+                <outgoingConnections id="24">
+                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="25" serialization="custom">
+                    <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                      <default>
+                        <type>1</type>
+                        <bendpoints id="26"/>
+                        <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="3"/>
+                        <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="27" serialization="custom">
+                          <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                             <default>
-                              <descriptors id="30">
-                                <org.eclipse.ui.views.properties.TextPropertyDescriptor id="31">
-                                  <id class="string">Name</id>
-                                  <display>Name</display>
-                                  <incompatible>false</incompatible>
-                                </org.eclipse.ui.views.properties.TextPropertyDescriptor>
-                                <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="32">
-                                  <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="33">
-                                    <nodes id="34">
-                                      <entry>
-                                        <long>2</long>
-                                        <org.drools.ruleflow.core.impl.EndNodeImpl reference="5"/>
-                                      </entry>
-                                      <entry>
-                                        <long>4</long>
-                                        <org.drools.ruleflow.core.impl.ActionNodeImpl reference="8"/>
-                                      </entry>
-                                      <entry>
-                                        <long>1</long>
-                                        <org.drools.ruleflow.core.impl.StartNodeImpl reference="12"/>
-                                      </entry>
-                                    </nodes>
-                                    <variables id="35"/>
-                                    <lastNodeId>4</lastNodeId>
-                                    <id>org.drools.examples.cdss.TreatmentX</id>
-                                    <name>TreatmentX</name>
-                                    <version>1.0</version>
-                                    <type>RuleFlow</type>
-                                  </process>
-                                  <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="8"/>
-                                  <id class="string">Action</id>
-                                  <display>Action</display>
-                                  <incompatible>false</incompatible>
-                                </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
-                              </descriptors>
+                              <constraint id="28">
+                                <x>393</x>
+                                <y>101</y>
+                                <width>80</width>
+                                <height>40</height>
+                              </constraint>
+                              <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="14"/>
+                              <incomingConnections id="29">
+                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="25"/>
+                              </incomingConnections>
+                              <outgoingConnections id="30"/>
+                              <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                             </default>
-                          </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
-                        </source>
-                        <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" reference="3"/>
+                          </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                        </target>
                       </default>
                     </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                     <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                       <default>
-                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="7"/>
+                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="13"/>
                       </default>
                     </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                   </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                </incomingConnections>
-                <outgoingConnections id="36"/>
+                </outgoingConnections>
                 <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
               </default>
             </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-          </org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper>
+            <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+              <default>
+                <descriptors id="31">
+                  <org.eclipse.ui.views.properties.TextPropertyDescriptor id="32">
+                    <id class="string">Name</id>
+                    <display>Name</display>
+                    <incompatible>false</incompatible>
+                  </org.eclipse.ui.views.properties.TextPropertyDescriptor>
+                  <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="33">
+                    <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="34">
+                      <nodes id="35">
+                        <entry>
+                          <long>1</long>
+                          <org.drools.ruleflow.core.impl.StartNodeImpl reference="9"/>
+                        </entry>
+                        <entry>
+                          <long>2</long>
+                          <org.drools.ruleflow.core.impl.EndNodeImpl reference="14"/>
+                        </entry>
+                        <entry>
+                          <long>4</long>
+                          <org.drools.ruleflow.core.impl.ActionNodeImpl reference="5"/>
+                        </entry>
+                      </nodes>
+                      <variables id="36"/>
+                      <lastNodeId>4</lastNodeId>
+                      <id>org.drools.examples.cdss.TreatmentX</id>
+                      <name>TreatmentX</name>
+                      <version>1.0</version>
+                      <type>RuleFlow</type>
+                      <packageName>com.sample</packageName>
+                    </process>
+                    <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
+                    <id class="string">Action</id>
+                    <display>Action</display>
+                    <incompatible>false</incompatible>
+                  </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
+                </descriptors>
+              </default>
+            </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+          </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
         </entry>
         <entry>
-          <string>4-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="20"/>
+          <string>2-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="27"/>
         </entry>
         <entry>
           <string>1-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="25"/>
+          <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="20"/>
         </entry>
       </elements>
-      <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="33"/>
+      <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="34"/>
       <routerLayout>2</routerLayout>
     </default>
   </org.drools.eclipse.flow.common.editor.core.ProcessWrapper>

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentX.rfm
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentX.rfm	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentX.rfm	2007-10-03 00:20:35 UTC (rev 15530)
@@ -1,50 +1,50 @@
 <org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
   <nodes id="2">
     <entry>
-      <long>2</long>
-      <org.drools.ruleflow.core.impl.EndNodeImpl id="3">
-        <id>2</id>
-        <name>End</name>
-        <incomingConnections id="4">
-          <org.drools.ruleflow.core.impl.ConnectionImpl id="5">
+      <long>1</long>
+      <org.drools.ruleflow.core.impl.StartNodeImpl id="3">
+        <id>1</id>
+        <name>Start</name>
+        <incomingConnections id="4"/>
+        <outgoingConnections id="5">
+          <org.drools.ruleflow.core.impl.ConnectionImpl id="6">
             <type>1</type>
-            <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="6">
-              <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="7">
+            <from class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="3"/>
+            <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="7">
+              <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="8">
                 <consequence>System.out.println(&quot;Executing TreatmentX&quot;);</consequence>
               </action>
               <id>4</id>
               <name>Dummy TreatmentX</name>
-              <incomingConnections id="8">
-                <org.drools.ruleflow.core.impl.ConnectionImpl id="9">
+              <incomingConnections id="9">
+                <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
+              </incomingConnections>
+              <outgoingConnections id="10">
+                <org.drools.ruleflow.core.impl.ConnectionImpl id="11">
                   <type>1</type>
-                  <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="10">
-                    <id>1</id>
-                    <name>Start</name>
-                    <incomingConnections id="11"/>
-                    <outgoingConnections id="12">
-                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="9"/>
-                    </outgoingConnections>
-                  </from>
-                  <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="6"/>
+                  <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="7"/>
+                  <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="12">
+                    <id>2</id>
+                    <name>End</name>
+                    <incomingConnections id="13">
+                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="11"/>
+                    </incomingConnections>
+                    <outgoingConnections id="14"/>
+                  </to>
                 </org.drools.ruleflow.core.impl.ConnectionImpl>
-              </incomingConnections>
-              <outgoingConnections id="13">
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="5"/>
               </outgoingConnections>
-            </from>
-            <to class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="3"/>
+            </to>
           </org.drools.ruleflow.core.impl.ConnectionImpl>
-        </incomingConnections>
-        <outgoingConnections id="14"/>
-      </org.drools.ruleflow.core.impl.EndNodeImpl>
+        </outgoingConnections>
+      </org.drools.ruleflow.core.impl.StartNodeImpl>
     </entry>
     <entry>
-      <long>4</long>
-      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="6"/>
+      <long>2</long>
+      <org.drools.ruleflow.core.impl.EndNodeImpl reference="12"/>
     </entry>
     <entry>
-      <long>1</long>
-      <org.drools.ruleflow.core.impl.StartNodeImpl reference="10"/>
+      <long>4</long>
+      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="7"/>
     </entry>
   </nodes>
   <variables id="15"/>
@@ -53,4 +53,5 @@
   <name>TreatmentX</name>
   <version>1.0</version>
   <type>RuleFlow</type>
+  <packageName>com.sample</packageName>
 </org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentY.rf
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentY.rf	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentY.rf	2007-10-03 00:20:35 UTC (rev 15530)
@@ -3,122 +3,122 @@
     <default>
       <elements id="2">
         <entry>
-          <string>5-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.JoinWrapper id="3" serialization="custom">
+          <string>3-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper id="3" serialization="custom">
             <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
               <default>
                 <constraint id="4">
-                  <x>411</x>
-                  <y>100</y>
-                  <width>39</width>
+                  <x>211</x>
+                  <y>43</y>
+                  <width>166</width>
                   <height>40</height>
                 </constraint>
-                <element class="org.drools.ruleflow.core.impl.JoinImpl" id="5">
-                  <type>1</type>
-                  <id>5</id>
-                  <name>AND</name>
-                  <incomingConnections id="6">
-                    <org.drools.ruleflow.core.impl.ConnectionImpl id="7">
+                <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="5">
+                  <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="6">
+                    <consequence>System.out.println(&quot;Executing TreatmentY Part1&quot;);</consequence>
+                  </action>
+                  <id>3</id>
+                  <name>Dummy TreatmentY Part1</name>
+                  <incomingConnections id="7">
+                    <org.drools.ruleflow.core.impl.ConnectionImpl id="8">
                       <type>1</type>
-                      <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="8">
-                        <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="9">
-                          <consequence>System.out.println(&quot;Executing TreatmentY Part1&quot;);</consequence>
-                        </action>
-                        <id>3</id>
-                        <name>Dummy TreatmentY Part1</name>
-                        <incomingConnections id="10">
-                          <org.drools.ruleflow.core.impl.ConnectionImpl id="11">
+                      <from class="org.drools.ruleflow.core.impl.SplitImpl" id="9">
+                        <type>1</type>
+                        <constraints id="10"/>
+                        <id>4</id>
+                        <name>AND</name>
+                        <incomingConnections id="11">
+                          <org.drools.ruleflow.core.impl.ConnectionImpl id="12">
                             <type>1</type>
-                            <from class="org.drools.ruleflow.core.impl.SplitImpl" id="12">
-                              <type>1</type>
-                              <constraints id="13"/>
-                              <id>4</id>
-                              <name>AND</name>
-                              <incomingConnections id="14">
-                                <org.drools.ruleflow.core.impl.ConnectionImpl id="15">
-                                  <type>1</type>
-                                  <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="16">
-                                    <id>1</id>
-                                    <name>Start</name>
-                                    <incomingConnections id="17"/>
-                                    <outgoingConnections id="18">
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="15"/>
-                                    </outgoingConnections>
-                                  </from>
-                                  <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="12"/>
-                                </org.drools.ruleflow.core.impl.ConnectionImpl>
+                            <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="13">
+                              <id>1</id>
+                              <name>Start</name>
+                              <incomingConnections id="14"/>
+                              <outgoingConnections id="15">
+                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
+                              </outgoingConnections>
+                            </from>
+                            <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="9"/>
+                          </org.drools.ruleflow.core.impl.ConnectionImpl>
+                        </incomingConnections>
+                        <outgoingConnections id="16">
+                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="8"/>
+                          <org.drools.ruleflow.core.impl.ConnectionImpl id="17">
+                            <type>1</type>
+                            <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="9"/>
+                            <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="18">
+                              <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="19">
+                                <consequence>System.out.println(&quot;Executing TreatmentY Part2&quot;);</consequence>
+                              </action>
+                              <id>6</id>
+                              <name>Dummy TreatmentY Part2</name>
+                              <incomingConnections id="20">
+                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="17"/>
                               </incomingConnections>
-                              <outgoingConnections id="19">
-                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="11"/>
-                                <org.drools.ruleflow.core.impl.ConnectionImpl id="20">
+                              <outgoingConnections id="21">
+                                <org.drools.ruleflow.core.impl.ConnectionImpl id="22">
                                   <type>1</type>
-                                  <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="12"/>
-                                  <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="21">
-                                    <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="22">
-                                      <consequence>System.out.println(&quot;Executing TreatmentY Part2&quot;);</consequence>
-                                    </action>
-                                    <id>6</id>
-                                    <name>Dummy TreatmentY Part2</name>
-                                    <incomingConnections id="23">
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="20"/>
-                                    </incomingConnections>
-                                    <outgoingConnections id="24">
+                                  <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="18"/>
+                                  <to class="org.drools.ruleflow.core.impl.JoinImpl" id="23">
+                                    <type>1</type>
+                                    <id>5</id>
+                                    <name>AND</name>
+                                    <incomingConnections id="24">
                                       <org.drools.ruleflow.core.impl.ConnectionImpl id="25">
                                         <type>1</type>
-                                        <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="21"/>
-                                        <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="5"/>
+                                        <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
+                                        <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="23"/>
                                       </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                    </outgoingConnections>
-                                  </to>
-                                </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                <org.drools.ruleflow.core.impl.ConnectionImpl id="26">
-                                  <type>1</type>
-                                  <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="12"/>
-                                  <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="27">
-                                    <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="28">
-                                      <consequence>System.out.println(&quot;Executing TreatmentY Part3&quot;);</consequence>
-                                    </action>
-                                    <id>7</id>
-                                    <name>Dummy TreatmentY Part3</name>
-                                    <incomingConnections id="29">
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="26"/>
+                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="22"/>
+                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="26">
+                                        <type>1</type>
+                                        <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="27">
+                                          <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="28">
+                                            <consequence>System.out.println(&quot;Executing TreatmentY Part3&quot;);</consequence>
+                                          </action>
+                                          <id>7</id>
+                                          <name>Dummy TreatmentY Part3</name>
+                                          <incomingConnections id="29">
+                                            <org.drools.ruleflow.core.impl.ConnectionImpl id="30">
+                                              <type>1</type>
+                                              <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="9"/>
+                                              <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="27"/>
+                                            </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                          </incomingConnections>
+                                          <outgoingConnections id="31">
+                                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="26"/>
+                                          </outgoingConnections>
+                                        </from>
+                                        <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="23"/>
+                                      </org.drools.ruleflow.core.impl.ConnectionImpl>
                                     </incomingConnections>
-                                    <outgoingConnections id="30">
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="31">
+                                    <outgoingConnections id="32">
+                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="33">
                                         <type>1</type>
-                                        <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="27"/>
-                                        <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="5"/>
+                                        <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="23"/>
+                                        <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="34">
+                                          <id>2</id>
+                                          <name>End</name>
+                                          <incomingConnections id="35">
+                                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="33"/>
+                                          </incomingConnections>
+                                          <outgoingConnections id="36"/>
+                                        </to>
                                       </org.drools.ruleflow.core.impl.ConnectionImpl>
                                     </outgoingConnections>
                                   </to>
                                 </org.drools.ruleflow.core.impl.ConnectionImpl>
                               </outgoingConnections>
-                            </from>
-                            <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="8"/>
+                            </to>
                           </org.drools.ruleflow.core.impl.ConnectionImpl>
-                        </incomingConnections>
-                        <outgoingConnections id="32">
-                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
+                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="30"/>
                         </outgoingConnections>
                       </from>
-                      <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="5"/>
+                      <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
                     </org.drools.ruleflow.core.impl.ConnectionImpl>
+                  </incomingConnections>
+                  <outgoingConnections id="37">
                     <org.drools.ruleflow.core.impl.ConnectionImpl reference="25"/>
-                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="31"/>
-                  </incomingConnections>
-                  <outgoingConnections id="33">
-                    <org.drools.ruleflow.core.impl.ConnectionImpl id="34">
-                      <type>1</type>
-                      <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="5"/>
-                      <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="35">
-                        <id>2</id>
-                        <name>End</name>
-                        <incomingConnections id="36">
-                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="34"/>
-                        </incomingConnections>
-                        <outgoingConnections id="37"/>
-                      </to>
-                    </org.drools.ruleflow.core.impl.ConnectionImpl>
                   </outgoingConnections>
                 </element>
                 <incomingConnections id="38">
@@ -128,103 +128,104 @@
                         <type>1</type>
                         <bendpoints id="40">
                           <org.eclipse.draw2d.geometry.Point id="41">
-                            <x>414</x>
-                            <y>62</y>
+                            <x>170</x>
+                            <y>63</y>
                           </org.eclipse.draw2d.geometry.Point>
                         </bendpoints>
-                        <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="42" serialization="custom">
+                        <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" id="42" serialization="custom">
                           <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                             <default>
                               <constraint id="43">
-                                <x>211</x>
-                                <y>43</y>
-                                <width>166</width>
+                                <x>141</x>
+                                <y>100</y>
+                                <width>38</width>
                                 <height>40</height>
                               </constraint>
-                              <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="8"/>
+                              <element class="org.drools.ruleflow.core.impl.SplitImpl" reference="9"/>
                               <incomingConnections id="44">
                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="45" serialization="custom">
                                   <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                     <default>
                                       <type>1</type>
-                                      <bendpoints id="46">
-                                        <org.eclipse.draw2d.geometry.Point id="47">
-                                          <x>170</x>
-                                          <y>63</y>
-                                        </org.eclipse.draw2d.geometry.Point>
-                                      </bendpoints>
-                                      <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" id="48" serialization="custom">
+                                      <bendpoints id="46"/>
+                                      <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="47" serialization="custom">
                                         <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                           <default>
-                                            <constraint id="49">
-                                              <x>141</x>
-                                              <y>100</y>
-                                              <width>38</width>
+                                            <constraint id="48">
+                                              <x>34</x>
+                                              <y>98</y>
+                                              <width>80</width>
                                               <height>40</height>
                                             </constraint>
-                                            <element class="org.drools.ruleflow.core.impl.SplitImpl" reference="12"/>
-                                            <incomingConnections id="50">
-                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="51" serialization="custom">
-                                                <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                  <default>
-                                                    <type>1</type>
-                                                    <bendpoints id="52"/>
-                                                    <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="53" serialization="custom">
-                                                      <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                        <default>
-                                                          <constraint id="54">
-                                                            <x>34</x>
-                                                            <y>98</y>
-                                                            <width>80</width>
-                                                            <height>40</height>
-                                                          </constraint>
-                                                          <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="16"/>
-                                                          <incomingConnections id="55"/>
-                                                          <outgoingConnections id="56">
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="51"/>
-                                                          </outgoingConnections>
-                                                        </default>
-                                                      </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                    </source>
-                                                    <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="48"/>
-                                                  </default>
-                                                </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                  <default>
-                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="15"/>
-                                                  </default>
-                                                </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                              </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                            <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="13"/>
+                                            <incomingConnections id="49"/>
+                                            <outgoingConnections id="50">
+                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="45"/>
+                                            </outgoingConnections>
+                                          </default>
+                                        </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                      </source>
+                                      <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="42"/>
+                                    </default>
+                                  </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                    <default>
+                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="12"/>
+                                    </default>
+                                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                              </incomingConnections>
+                              <outgoingConnections id="51">
+                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="39"/>
+                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="52" serialization="custom">
+                                  <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                    <default>
+                                      <type>1</type>
+                                      <bendpoints id="53"/>
+                                      <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="42"/>
+                                      <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="54" serialization="custom">
+                                        <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                          <default>
+                                            <constraint id="55">
+                                              <x>210</x>
+                                              <y>98</y>
+                                              <width>166</width>
+                                              <height>40</height>
+                                            </constraint>
+                                            <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="18"/>
+                                            <incomingConnections id="56">
+                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="52"/>
                                             </incomingConnections>
                                             <outgoingConnections id="57">
-                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="45"/>
                                               <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="58" serialization="custom">
                                                 <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                   <default>
                                                     <type>1</type>
                                                     <bendpoints id="59"/>
-                                                    <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="48"/>
-                                                    <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="60" serialization="custom">
+                                                    <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="54"/>
+                                                    <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="60" serialization="custom">
                                                       <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                         <default>
                                                           <constraint id="61">
-                                                            <x>210</x>
-                                                            <y>98</y>
-                                                            <width>166</width>
+                                                            <x>411</x>
+                                                            <y>100</y>
+                                                            <width>39</width>
                                                             <height>40</height>
                                                           </constraint>
-                                                          <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="21"/>
+                                                          <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="23"/>
                                                           <incomingConnections id="62">
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="58"/>
-                                                          </incomingConnections>
-                                                          <outgoingConnections id="63">
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="64" serialization="custom">
+                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="63" serialization="custom">
                                                               <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                 <default>
                                                                   <type>1</type>
-                                                                  <bendpoints id="65"/>
-                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="60"/>
-                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="3"/>
+                                                                  <bendpoints id="64">
+                                                                    <org.eclipse.draw2d.geometry.Point id="65">
+                                                                      <x>414</x>
+                                                                      <y>62</y>
+                                                                    </org.eclipse.draw2d.geometry.Point>
+                                                                  </bendpoints>
+                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="3"/>
+                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="60"/>
                                                                 </default>
                                                               </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                               <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
@@ -233,143 +234,165 @@
                                                                 </default>
                                                               </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                             </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                          </outgoingConnections>
-                                                          <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
-                                                        </default>
-                                                      </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                      <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
-                                                        <default>
-                                                          <descriptors id="66">
-                                                            <org.eclipse.ui.views.properties.TextPropertyDescriptor id="67">
-                                                              <id class="string">Name</id>
-                                                              <display>Name</display>
-                                                              <incompatible>false</incompatible>
-                                                            </org.eclipse.ui.views.properties.TextPropertyDescriptor>
-                                                            <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="68">
-                                                              <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="69">
-                                                                <nodes id="70">
-                                                                  <entry>
-                                                                    <long>2</long>
-                                                                    <org.drools.ruleflow.core.impl.EndNodeImpl reference="35"/>
-                                                                  </entry>
-                                                                  <entry>
-                                                                    <long>4</long>
-                                                                    <org.drools.ruleflow.core.impl.SplitImpl reference="12"/>
-                                                                  </entry>
-                                                                  <entry>
-                                                                    <long>6</long>
-                                                                    <org.drools.ruleflow.core.impl.ActionNodeImpl reference="21"/>
-                                                                  </entry>
-                                                                  <entry>
-                                                                    <long>1</long>
-                                                                    <org.drools.ruleflow.core.impl.StartNodeImpl reference="16"/>
-                                                                  </entry>
-                                                                  <entry>
-                                                                    <long>3</long>
-                                                                    <org.drools.ruleflow.core.impl.ActionNodeImpl reference="8"/>
-                                                                  </entry>
-                                                                  <entry>
-                                                                    <long>7</long>
-                                                                    <org.drools.ruleflow.core.impl.ActionNodeImpl reference="27"/>
-                                                                  </entry>
-                                                                  <entry>
-                                                                    <long>5</long>
-                                                                    <org.drools.ruleflow.core.impl.JoinImpl reference="5"/>
-                                                                  </entry>
-                                                                </nodes>
-                                                                <variables id="71"/>
-                                                                <lastNodeId>7</lastNodeId>
-                                                                <id>org.drools.examples.cdss.TreatmentY</id>
-                                                                <name>TreatmentY</name>
-                                                                <version>1.0</version>
-                                                                <type>RuleFlow</type>
-                                                              </process>
-                                                              <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="21"/>
-                                                              <id class="string">Action</id>
-                                                              <display>Action</display>
-                                                              <incompatible>false</incompatible>
-                                                            </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
-                                                          </descriptors>
-                                                        </default>
-                                                      </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
-                                                    </target>
-                                                  </default>
-                                                </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                  <default>
-                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="20"/>
-                                                  </default>
-                                                </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                              </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="72" serialization="custom">
-                                                <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                  <default>
-                                                    <type>1</type>
-                                                    <bendpoints id="73">
-                                                      <org.eclipse.draw2d.geometry.Point id="74">
-                                                        <x>172</x>
-                                                        <y>178</y>
-                                                      </org.eclipse.draw2d.geometry.Point>
-                                                    </bendpoints>
-                                                    <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="48"/>
-                                                    <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="75" serialization="custom">
-                                                      <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                        <default>
-                                                          <constraint id="76">
-                                                            <x>209</x>
-                                                            <y>157</y>
-                                                            <width>167</width>
-                                                            <height>40</height>
-                                                          </constraint>
-                                                          <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="27"/>
-                                                          <incomingConnections id="77">
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="72"/>
-                                                          </incomingConnections>
-                                                          <outgoingConnections id="78">
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="79" serialization="custom">
+                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="58"/>
+                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="66" serialization="custom">
                                                               <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                 <default>
                                                                   <type>1</type>
-                                                                  <bendpoints id="80">
-                                                                    <org.eclipse.draw2d.geometry.Point id="81">
+                                                                  <bendpoints id="67">
+                                                                    <org.eclipse.draw2d.geometry.Point id="68">
                                                                       <x>416</x>
                                                                       <y>177</y>
                                                                     </org.eclipse.draw2d.geometry.Point>
                                                                   </bendpoints>
-                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="75"/>
-                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="3"/>
+                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="69" serialization="custom">
+                                                                    <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                      <default>
+                                                                        <constraint id="70">
+                                                                          <x>209</x>
+                                                                          <y>157</y>
+                                                                          <width>167</width>
+                                                                          <height>40</height>
+                                                                        </constraint>
+                                                                        <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="27"/>
+                                                                        <incomingConnections id="71">
+                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="72" serialization="custom">
+                                                                            <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                              <default>
+                                                                                <type>1</type>
+                                                                                <bendpoints id="73">
+                                                                                  <org.eclipse.draw2d.geometry.Point id="74">
+                                                                                    <x>172</x>
+                                                                                    <y>178</y>
+                                                                                  </org.eclipse.draw2d.geometry.Point>
+                                                                                </bendpoints>
+                                                                                <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="42"/>
+                                                                                <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="69"/>
+                                                                              </default>
+                                                                            </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                              <default>
+                                                                                <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="30"/>
+                                                                              </default>
+                                                                            </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                          </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                        </incomingConnections>
+                                                                        <outgoingConnections id="75">
+                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="66"/>
+                                                                        </outgoingConnections>
+                                                                        <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+                                                                      </default>
+                                                                    </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                    <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+                                                                      <default>
+                                                                        <descriptors id="76">
+                                                                          <org.eclipse.ui.views.properties.TextPropertyDescriptor id="77">
+                                                                            <id class="string">Name</id>
+                                                                            <display>Name</display>
+                                                                            <incompatible>false</incompatible>
+                                                                          </org.eclipse.ui.views.properties.TextPropertyDescriptor>
+                                                                          <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="78">
+                                                                            <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="79">
+                                                                              <nodes id="80">
+                                                                                <entry>
+                                                                                  <long>1</long>
+                                                                                  <org.drools.ruleflow.core.impl.StartNodeImpl reference="13"/>
+                                                                                </entry>
+                                                                                <entry>
+                                                                                  <long>2</long>
+                                                                                  <org.drools.ruleflow.core.impl.EndNodeImpl reference="34"/>
+                                                                                </entry>
+                                                                                <entry>
+                                                                                  <long>3</long>
+                                                                                  <org.drools.ruleflow.core.impl.ActionNodeImpl reference="5"/>
+                                                                                </entry>
+                                                                                <entry>
+                                                                                  <long>4</long>
+                                                                                  <org.drools.ruleflow.core.impl.SplitImpl reference="9"/>
+                                                                                </entry>
+                                                                                <entry>
+                                                                                  <long>5</long>
+                                                                                  <org.drools.ruleflow.core.impl.JoinImpl reference="23"/>
+                                                                                </entry>
+                                                                                <entry>
+                                                                                  <long>6</long>
+                                                                                  <org.drools.ruleflow.core.impl.ActionNodeImpl reference="18"/>
+                                                                                </entry>
+                                                                                <entry>
+                                                                                  <long>7</long>
+                                                                                  <org.drools.ruleflow.core.impl.ActionNodeImpl reference="27"/>
+                                                                                </entry>
+                                                                              </nodes>
+                                                                              <variables id="81"/>
+                                                                              <lastNodeId>7</lastNodeId>
+                                                                              <id>org.drools.examples.cdss.TreatmentY</id>
+                                                                              <name>TreatmentY</name>
+                                                                              <version>1.0</version>
+                                                                              <type>RuleFlow</type>
+                                                                              <packageName>com.sample</packageName>
+                                                                            </process>
+                                                                            <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="27"/>
+                                                                            <id class="string">Action</id>
+                                                                            <display>Action</display>
+                                                                            <incompatible>false</incompatible>
+                                                                          </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
+                                                                        </descriptors>
+                                                                      </default>
+                                                                    </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+                                                                  </source>
+                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="60"/>
                                                                 </default>
                                                               </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                               <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                 <default>
-                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="31"/>
+                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="26"/>
                                                                 </default>
                                                               </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                             </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                          </incomingConnections>
+                                                          <outgoingConnections id="82">
+                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="83" serialization="custom">
+                                                              <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                <default>
+                                                                  <type>1</type>
+                                                                  <bendpoints id="84"/>
+                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="60"/>
+                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="85" serialization="custom">
+                                                                    <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                      <default>
+                                                                        <constraint id="86">
+                                                                          <x>470</x>
+                                                                          <y>98</y>
+                                                                          <width>80</width>
+                                                                          <height>40</height>
+                                                                        </constraint>
+                                                                        <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="34"/>
+                                                                        <incomingConnections id="87">
+                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="83"/>
+                                                                        </incomingConnections>
+                                                                        <outgoingConnections id="88"/>
+                                                                        <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+                                                                      </default>
+                                                                    </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                  </target>
+                                                                </default>
+                                                              </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                <default>
+                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="33"/>
+                                                                </default>
+                                                              </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                            </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                           </outgoingConnections>
                                                           <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                         </default>
                                                       </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                      <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
-                                                        <default>
-                                                          <descriptors id="82">
-                                                            <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="67"/>
-                                                            <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="83">
-                                                              <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="69"/>
-                                                              <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="27"/>
-                                                              <id class="string">Action</id>
-                                                              <display>Action</display>
-                                                              <incompatible>false</incompatible>
-                                                            </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
-                                                          </descriptors>
-                                                        </default>
-                                                      </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
                                                     </target>
                                                   </default>
                                                 </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                   <default>
-                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="26"/>
+                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="22"/>
                                                   </default>
                                                 </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                               </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
@@ -377,122 +400,100 @@
                                             <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                           </default>
                                         </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                        <org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
-                                          <default/>
-                                        </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
-                                      </source>
-                                      <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="42"/>
+                                        <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+                                          <default>
+                                            <descriptors id="89">
+                                              <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="77"/>
+                                              <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="90">
+                                                <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="79"/>
+                                                <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="18"/>
+                                                <id class="string">Action</id>
+                                                <display>Action</display>
+                                                <incompatible>false</incompatible>
+                                              </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
+                                            </descriptors>
+                                          </default>
+                                        </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+                                      </target>
                                     </default>
                                   </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                   <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                     <default>
-                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="11"/>
+                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="17"/>
                                     </default>
                                   </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                 </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                              </incomingConnections>
-                              <outgoingConnections id="84">
-                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="39"/>
+                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="72"/>
                               </outgoingConnections>
                               <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                             </default>
                           </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
-                            <default>
-                              <descriptors id="85">
-                                <org.eclipse.ui.views.properties.TextPropertyDescriptor id="86">
-                                  <id class="string">Name</id>
-                                  <display>Name</display>
-                                  <incompatible>false</incompatible>
-                                </org.eclipse.ui.views.properties.TextPropertyDescriptor>
-                                <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="87">
-                                  <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="69"/>
-                                  <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="8"/>
-                                  <id class="string">Action</id>
-                                  <display>Action</display>
-                                  <incompatible>false</incompatible>
-                                </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
-                              </descriptors>
-                            </default>
-                          </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+                          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
+                            <default/>
+                          </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
                         </source>
-                        <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="3"/>
+                        <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="3"/>
                       </default>
                     </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                     <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                       <default>
-                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="7"/>
+                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="8"/>
                       </default>
                     </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                   </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="64"/>
-                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="79"/>
                 </incomingConnections>
-                <outgoingConnections id="88">
-                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="89" serialization="custom">
-                    <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                      <default>
-                        <type>1</type>
-                        <bendpoints id="90"/>
-                        <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="3"/>
-                        <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="91" serialization="custom">
-                          <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                            <default>
-                              <constraint id="92">
-                                <x>470</x>
-                                <y>98</y>
-                                <width>80</width>
-                                <height>40</height>
-                              </constraint>
-                              <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="35"/>
-                              <incomingConnections id="93">
-                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="89"/>
-                              </incomingConnections>
-                              <outgoingConnections id="94"/>
-                              <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
-                            </default>
-                          </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                        </target>
-                      </default>
-                    </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                      <default>
-                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="34"/>
-                      </default>
-                    </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                <outgoingConnections id="91">
+                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="63"/>
                 </outgoingConnections>
                 <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
               </default>
             </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-          </org.drools.eclipse.flow.ruleflow.core.JoinWrapper>
+            <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+              <default>
+                <descriptors id="92">
+                  <org.eclipse.ui.views.properties.TextPropertyDescriptor id="93">
+                    <id class="string">Name</id>
+                    <display>Name</display>
+                    <incompatible>false</incompatible>
+                  </org.eclipse.ui.views.properties.TextPropertyDescriptor>
+                  <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="94">
+                    <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="79"/>
+                    <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
+                    <id class="string">Action</id>
+                    <display>Action</display>
+                    <incompatible>false</incompatible>
+                  </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
+                </descriptors>
+              </default>
+            </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+          </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
         </entry>
         <entry>
-          <string>2-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="91"/>
+          <string>4-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper reference="42"/>
         </entry>
         <entry>
           <string>7-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="75"/>
+          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="69"/>
         </entry>
         <entry>
-          <string>4-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper reference="48"/>
+          <string>2-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="85"/>
         </entry>
         <entry>
-          <string>6-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="60"/>
+          <string>1-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="47"/>
         </entry>
         <entry>
-          <string>3-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="42"/>
+          <string>6-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="54"/>
         </entry>
         <entry>
-          <string>1-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="53"/>
+          <string>5-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="60"/>
         </entry>
       </elements>
-      <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="69"/>
+      <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="79"/>
       <routerLayout>0</routerLayout>
     </default>
   </org.drools.eclipse.flow.common.editor.core.ProcessWrapper>

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentY.rfm
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentY.rfm	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/cdss/TreatmentY.rfm	2007-10-03 00:20:35 UTC (rev 15530)
@@ -1,139 +1,139 @@
 <org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
   <nodes id="2">
     <entry>
-      <long>2</long>
-      <org.drools.ruleflow.core.impl.EndNodeImpl id="3">
-        <id>2</id>
-        <name>End</name>
-        <incomingConnections id="4">
-          <org.drools.ruleflow.core.impl.ConnectionImpl id="5">
+      <long>1</long>
+      <org.drools.ruleflow.core.impl.StartNodeImpl id="3">
+        <id>1</id>
+        <name>Start</name>
+        <incomingConnections id="4"/>
+        <outgoingConnections id="5">
+          <org.drools.ruleflow.core.impl.ConnectionImpl id="6">
             <type>1</type>
-            <from class="org.drools.ruleflow.core.impl.JoinImpl" id="6">
+            <from class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="3"/>
+            <to class="org.drools.ruleflow.core.impl.SplitImpl" id="7">
               <type>1</type>
-              <id>5</id>
+              <constraints id="8"/>
+              <id>4</id>
               <name>AND</name>
-              <incomingConnections id="7">
-                <org.drools.ruleflow.core.impl.ConnectionImpl id="8">
+              <incomingConnections id="9">
+                <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
+              </incomingConnections>
+              <outgoingConnections id="10">
+                <org.drools.ruleflow.core.impl.ConnectionImpl id="11">
                   <type>1</type>
-                  <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="9">
-                    <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="10">
+                  <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="7"/>
+                  <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="12">
+                    <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="13">
                       <consequence>System.out.println(&quot;Executing TreatmentY Part1&quot;);</consequence>
                     </action>
                     <id>3</id>
                     <name>Dummy TreatmentY Part1</name>
-                    <incomingConnections id="11">
-                      <org.drools.ruleflow.core.impl.ConnectionImpl id="12">
+                    <incomingConnections id="14">
+                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="11"/>
+                    </incomingConnections>
+                    <outgoingConnections id="15">
+                      <org.drools.ruleflow.core.impl.ConnectionImpl id="16">
                         <type>1</type>
-                        <from class="org.drools.ruleflow.core.impl.SplitImpl" id="13">
+                        <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="12"/>
+                        <to class="org.drools.ruleflow.core.impl.JoinImpl" id="17">
                           <type>1</type>
-                          <constraints id="14"/>
-                          <id>4</id>
+                          <id>5</id>
                           <name>AND</name>
-                          <incomingConnections id="15">
-                            <org.drools.ruleflow.core.impl.ConnectionImpl id="16">
+                          <incomingConnections id="18">
+                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="16"/>
+                            <org.drools.ruleflow.core.impl.ConnectionImpl id="19">
                               <type>1</type>
-                              <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="17">
-                                <id>1</id>
-                                <name>Start</name>
-                                <incomingConnections id="18"/>
-                                <outgoingConnections id="19">
-                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="16"/>
-                                </outgoingConnections>
-                              </from>
-                              <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="13"/>
-                            </org.drools.ruleflow.core.impl.ConnectionImpl>
-                          </incomingConnections>
-                          <outgoingConnections id="20">
-                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
-                            <org.drools.ruleflow.core.impl.ConnectionImpl id="21">
-                              <type>1</type>
-                              <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="13"/>
-                              <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="22">
-                                <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="23">
+                              <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="20">
+                                <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="21">
                                   <consequence>System.out.println(&quot;Executing TreatmentY Part2&quot;);</consequence>
                                 </action>
                                 <id>6</id>
                                 <name>Dummy TreatmentY Part2</name>
-                                <incomingConnections id="24">
-                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="21"/>
-                                </incomingConnections>
-                                <outgoingConnections id="25">
-                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="26">
+                                <incomingConnections id="22">
+                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="23">
                                     <type>1</type>
-                                    <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="22"/>
-                                    <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="6"/>
+                                    <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="7"/>
+                                    <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="20"/>
                                   </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                </incomingConnections>
+                                <outgoingConnections id="24">
+                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="19"/>
                                 </outgoingConnections>
-                              </to>
+                              </from>
+                              <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="17"/>
                             </org.drools.ruleflow.core.impl.ConnectionImpl>
-                            <org.drools.ruleflow.core.impl.ConnectionImpl id="27">
+                            <org.drools.ruleflow.core.impl.ConnectionImpl id="25">
                               <type>1</type>
-                              <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="13"/>
-                              <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="28">
-                                <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="29">
+                              <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="26">
+                                <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="27">
                                   <consequence>System.out.println(&quot;Executing TreatmentY Part3&quot;);</consequence>
                                 </action>
                                 <id>7</id>
                                 <name>Dummy TreatmentY Part3</name>
-                                <incomingConnections id="30">
-                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="27"/>
-                                </incomingConnections>
-                                <outgoingConnections id="31">
-                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="32">
+                                <incomingConnections id="28">
+                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="29">
                                     <type>1</type>
-                                    <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="28"/>
-                                    <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="6"/>
+                                    <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="7"/>
+                                    <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="26"/>
                                   </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                </incomingConnections>
+                                <outgoingConnections id="30">
+                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="25"/>
                                 </outgoingConnections>
+                              </from>
+                              <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="17"/>
+                            </org.drools.ruleflow.core.impl.ConnectionImpl>
+                          </incomingConnections>
+                          <outgoingConnections id="31">
+                            <org.drools.ruleflow.core.impl.ConnectionImpl id="32">
+                              <type>1</type>
+                              <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="17"/>
+                              <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="33">
+                                <id>2</id>
+                                <name>End</name>
+                                <incomingConnections id="34">
+                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="32"/>
+                                </incomingConnections>
+                                <outgoingConnections id="35"/>
                               </to>
                             </org.drools.ruleflow.core.impl.ConnectionImpl>
                           </outgoingConnections>
-                        </from>
-                        <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="9"/>
+                        </to>
                       </org.drools.ruleflow.core.impl.ConnectionImpl>
-                    </incomingConnections>
-                    <outgoingConnections id="33">
-                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="8"/>
                     </outgoingConnections>
-                  </from>
-                  <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="6"/>
+                  </to>
                 </org.drools.ruleflow.core.impl.ConnectionImpl>
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="26"/>
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="32"/>
-              </incomingConnections>
-              <outgoingConnections id="34">
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="5"/>
+                <org.drools.ruleflow.core.impl.ConnectionImpl reference="23"/>
+                <org.drools.ruleflow.core.impl.ConnectionImpl reference="29"/>
               </outgoingConnections>
-            </from>
-            <to class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="3"/>
+            </to>
           </org.drools.ruleflow.core.impl.ConnectionImpl>
-        </incomingConnections>
-        <outgoingConnections id="35"/>
-      </org.drools.ruleflow.core.impl.EndNodeImpl>
+        </outgoingConnections>
+      </org.drools.ruleflow.core.impl.StartNodeImpl>
     </entry>
     <entry>
-      <long>4</long>
-      <org.drools.ruleflow.core.impl.SplitImpl reference="13"/>
+      <long>2</long>
+      <org.drools.ruleflow.core.impl.EndNodeImpl reference="33"/>
     </entry>
     <entry>
-      <long>6</long>
-      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="22"/>
+      <long>3</long>
+      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="12"/>
     </entry>
     <entry>
-      <long>1</long>
-      <org.drools.ruleflow.core.impl.StartNodeImpl reference="17"/>
+      <long>4</long>
+      <org.drools.ruleflow.core.impl.SplitImpl reference="7"/>
     </entry>
     <entry>
-      <long>3</long>
-      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="9"/>
+      <long>5</long>
+      <org.drools.ruleflow.core.impl.JoinImpl reference="17"/>
     </entry>
     <entry>
-      <long>7</long>
-      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="28"/>
+      <long>6</long>
+      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="20"/>
     </entry>
     <entry>
-      <long>5</long>
-      <org.drools.ruleflow.core.impl.JoinImpl reference="6"/>
+      <long>7</long>
+      <org.drools.ruleflow.core.impl.ActionNodeImpl reference="26"/>
     </entry>
   </nodes>
   <variables id="36"/>
@@ -142,4 +142,5 @@
   <name>TreatmentY</name>
   <version>1.0</version>
   <type>RuleFlow</type>
+  <packageName>com.sample</packageName>
 </org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/generation.rf
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/generation.rf	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/generation.rf	2007-10-03 00:20:35 UTC (rev 15530)
@@ -3,152 +3,152 @@
     <default>
       <elements id="2">
         <entry>
-          <string>5-Wrapper</string>
+          <string>3-Wrapper</string>
           <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper id="3" serialization="custom">
             <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
               <default>
                 <constraint id="4">
-                  <x>23</x>
-                  <y>566</y>
+                  <x>155</x>
+                  <y>285</y>
                   <width>80</width>
                   <height>40</height>
                 </constraint>
                 <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="5">
-                  <ruleFlowGroup>birth</ruleFlowGroup>
-                  <id>5</id>
-                  <name>birth</name>
+                  <ruleFlowGroup>rest</ruleFlowGroup>
+                  <id>3</id>
+                  <name>rest</name>
                   <incomingConnections id="6">
                     <org.drools.ruleflow.core.impl.ConnectionImpl id="7">
                       <type>1</type>
-                      <from class="org.drools.ruleflow.core.impl.SplitImpl" id="8">
-                        <type>1</type>
-                        <constraints id="9"/>
-                        <id>9</id>
-                        <name>Split</name>
-                        <incomingConnections id="10">
-                          <org.drools.ruleflow.core.impl.ConnectionImpl id="11">
+                      <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="8">
+                        <ruleFlowGroup>evaluate</ruleFlowGroup>
+                        <id>2</id>
+                        <name>evaluate</name>
+                        <incomingConnections id="9">
+                          <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
                             <type>1</type>
-                            <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="12">
-                              <ruleFlowGroup>reset calculate</ruleFlowGroup>
-                              <id>4</id>
-                              <name>reset calculate</name>
-                              <incomingConnections id="13">
-                                <org.drools.ruleflow.core.impl.ConnectionImpl id="14">
+                            <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="11">
+                              <ruleFlowGroup>calculate</ruleFlowGroup>
+                              <id>7</id>
+                              <name>calculate</name>
+                              <incomingConnections id="12">
+                                <org.drools.ruleflow.core.impl.ConnectionImpl id="13">
                                   <type>1</type>
-                                  <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="15">
-                                    <ruleFlowGroup>rest</ruleFlowGroup>
-                                    <id>3</id>
-                                    <name>rest</name>
-                                    <incomingConnections id="16">
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="17">
-                                        <type>1</type>
-                                        <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="18">
-                                          <ruleFlowGroup>evaluate</ruleFlowGroup>
-                                          <id>2</id>
-                                          <name>evaluate</name>
-                                          <incomingConnections id="19">
-                                            <org.drools.ruleflow.core.impl.ConnectionImpl id="20">
-                                              <type>1</type>
-                                              <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="21">
-                                                <ruleFlowGroup>calculate</ruleFlowGroup>
-                                                <id>7</id>
-                                                <name>calculate</name>
-                                                <incomingConnections id="22">
-                                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="23">
-                                                    <type>1</type>
-                                                    <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="24">
-                                                      <id>1</id>
-                                                      <name>Start</name>
-                                                      <incomingConnections id="25"/>
-                                                      <outgoingConnections id="26">
-                                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="23"/>
-                                                      </outgoingConnections>
-                                                    </from>
-                                                    <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="21"/>
-                                                  </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                                </incomingConnections>
-                                                <outgoingConnections id="27">
-                                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="20"/>
-                                                </outgoingConnections>
-                                              </from>
-                                              <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="18"/>
-                                            </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                          </incomingConnections>
-                                          <outgoingConnections id="28">
-                                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="17"/>
-                                          </outgoingConnections>
-                                        </from>
-                                        <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="15"/>
-                                      </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                    </incomingConnections>
-                                    <outgoingConnections id="29">
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="14"/>
+                                  <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="14">
+                                    <id>1</id>
+                                    <name>Start</name>
+                                    <incomingConnections id="15"/>
+                                    <outgoingConnections id="16">
+                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="13"/>
                                     </outgoingConnections>
                                   </from>
-                                  <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="12"/>
+                                  <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="11"/>
                                 </org.drools.ruleflow.core.impl.ConnectionImpl>
                               </incomingConnections>
-                              <outgoingConnections id="30">
-                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="11"/>
+                              <outgoingConnections id="17">
+                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
                               </outgoingConnections>
                             </from>
-                            <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="8"/>
+                            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="8"/>
                           </org.drools.ruleflow.core.impl.ConnectionImpl>
                         </incomingConnections>
-                        <outgoingConnections id="31">
+                        <outgoingConnections id="18">
                           <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
-                          <org.drools.ruleflow.core.impl.ConnectionImpl id="32">
+                        </outgoingConnections>
+                      </from>
+                      <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="5"/>
+                    </org.drools.ruleflow.core.impl.ConnectionImpl>
+                  </incomingConnections>
+                  <outgoingConnections id="19">
+                    <org.drools.ruleflow.core.impl.ConnectionImpl id="20">
+                      <type>1</type>
+                      <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="5"/>
+                      <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="21">
+                        <ruleFlowGroup>reset calculate</ruleFlowGroup>
+                        <id>4</id>
+                        <name>reset calculate</name>
+                        <incomingConnections id="22">
+                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="20"/>
+                        </incomingConnections>
+                        <outgoingConnections id="23">
+                          <org.drools.ruleflow.core.impl.ConnectionImpl id="24">
                             <type>1</type>
-                            <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="8"/>
-                            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="33">
-                              <ruleFlowGroup>kill</ruleFlowGroup>
-                              <id>6</id>
-                              <name>kill</name>
-                              <incomingConnections id="34">
-                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="32"/>
+                            <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="21"/>
+                            <to class="org.drools.ruleflow.core.impl.SplitImpl" id="25">
+                              <type>1</type>
+                              <constraints id="26"/>
+                              <id>9</id>
+                              <name>Split</name>
+                              <incomingConnections id="27">
+                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="24"/>
                               </incomingConnections>
-                              <outgoingConnections id="35">
-                                <org.drools.ruleflow.core.impl.ConnectionImpl id="36">
+                              <outgoingConnections id="28">
+                                <org.drools.ruleflow.core.impl.ConnectionImpl id="29">
                                   <type>1</type>
-                                  <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="33"/>
-                                  <to class="org.drools.ruleflow.core.impl.JoinImpl" id="37">
-                                    <type>1</type>
-                                    <id>10</id>
-                                    <name>Join</name>
-                                    <incomingConnections id="38">
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="39">
-                                        <type>1</type>
-                                        <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="5"/>
-                                        <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="37"/>
-                                      </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="36"/>
+                                  <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="25"/>
+                                  <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="30">
+                                    <ruleFlowGroup>birth</ruleFlowGroup>
+                                    <id>5</id>
+                                    <name>birth</name>
+                                    <incomingConnections id="31">
+                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="29"/>
                                     </incomingConnections>
-                                    <outgoingConnections id="40">
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="41">
+                                    <outgoingConnections id="32">
+                                      <org.drools.ruleflow.core.impl.ConnectionImpl id="33">
                                         <type>1</type>
-                                        <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="37"/>
-                                        <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="42">
-                                          <id>11</id>
-                                          <name>End</name>
-                                          <incomingConnections id="43">
-                                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="41"/>
+                                        <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="30"/>
+                                        <to class="org.drools.ruleflow.core.impl.JoinImpl" id="34">
+                                          <type>1</type>
+                                          <id>10</id>
+                                          <name>Join</name>
+                                          <incomingConnections id="35">
+                                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="33"/>
+                                            <org.drools.ruleflow.core.impl.ConnectionImpl id="36">
+                                              <type>1</type>
+                                              <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="37">
+                                                <ruleFlowGroup>kill</ruleFlowGroup>
+                                                <id>6</id>
+                                                <name>kill</name>
+                                                <incomingConnections id="38">
+                                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="39">
+                                                    <type>1</type>
+                                                    <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="25"/>
+                                                    <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="37"/>
+                                                  </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                </incomingConnections>
+                                                <outgoingConnections id="40">
+                                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="36"/>
+                                                </outgoingConnections>
+                                              </from>
+                                              <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="34"/>
+                                            </org.drools.ruleflow.core.impl.ConnectionImpl>
                                           </incomingConnections>
-                                          <outgoingConnections id="44"/>
+                                          <outgoingConnections id="41">
+                                            <org.drools.ruleflow.core.impl.ConnectionImpl id="42">
+                                              <type>1</type>
+                                              <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="34"/>
+                                              <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="43">
+                                                <id>11</id>
+                                                <name>End</name>
+                                                <incomingConnections id="44">
+                                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="42"/>
+                                                </incomingConnections>
+                                                <outgoingConnections id="45"/>
+                                              </to>
+                                            </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                          </outgoingConnections>
                                         </to>
                                       </org.drools.ruleflow.core.impl.ConnectionImpl>
                                     </outgoingConnections>
                                   </to>
                                 </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="39"/>
                               </outgoingConnections>
                             </to>
                           </org.drools.ruleflow.core.impl.ConnectionImpl>
                         </outgoingConnections>
-                      </from>
-                      <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="5"/>
+                      </to>
                     </org.drools.ruleflow.core.impl.ConnectionImpl>
-                  </incomingConnections>
-                  <outgoingConnections id="45">
-                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="39"/>
                   </outgoingConnections>
                 </element>
                 <incomingConnections id="46">
@@ -157,16 +157,16 @@
                       <default>
                         <type>1</type>
                         <bendpoints id="48"/>
-                        <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" id="49" serialization="custom">
+                        <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="49" serialization="custom">
                           <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                             <default>
                               <constraint id="50">
                                 <x>155</x>
-                                <y>470</y>
+                                <y>190</y>
                                 <width>80</width>
                                 <height>40</height>
                               </constraint>
-                              <element class="org.drools.ruleflow.core.impl.SplitImpl" reference="8"/>
+                              <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="8"/>
                               <incomingConnections id="51">
                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="52" serialization="custom">
                                   <org.drools.eclipse.flow.common.editor.core.ElementConnection>
@@ -177,131 +177,32 @@
                                         <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                           <default>
                                             <constraint id="55">
-                                              <x>155</x>
-                                              <y>382</y>
+                                              <x>154</x>
+                                              <y>109</y>
                                               <width>80</width>
                                               <height>40</height>
                                             </constraint>
-                                            <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="12"/>
+                                            <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="11"/>
                                             <incomingConnections id="56">
                                               <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="57" serialization="custom">
                                                 <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                   <default>
                                                     <type>1</type>
                                                     <bendpoints id="58"/>
-                                                    <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="59" serialization="custom">
+                                                    <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="59" serialization="custom">
                                                       <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                         <default>
                                                           <constraint id="60">
                                                             <x>155</x>
-                                                            <y>285</y>
+                                                            <y>21</y>
                                                             <width>80</width>
                                                             <height>40</height>
                                                           </constraint>
-                                                          <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="15"/>
-                                                          <incomingConnections id="61">
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="62" serialization="custom">
-                                                              <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                <default>
-                                                                  <type>1</type>
-                                                                  <bendpoints id="63"/>
-                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="64" serialization="custom">
-                                                                    <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                      <default>
-                                                                        <constraint id="65">
-                                                                          <x>155</x>
-                                                                          <y>190</y>
-                                                                          <width>80</width>
-                                                                          <height>40</height>
-                                                                        </constraint>
-                                                                        <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="18"/>
-                                                                        <incomingConnections id="66">
-                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="67" serialization="custom">
-                                                                            <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                              <default>
-                                                                                <type>1</type>
-                                                                                <bendpoints id="68"/>
-                                                                                <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="69" serialization="custom">
-                                                                                  <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                    <default>
-                                                                                      <constraint id="70">
-                                                                                        <x>154</x>
-                                                                                        <y>109</y>
-                                                                                        <width>80</width>
-                                                                                        <height>40</height>
-                                                                                      </constraint>
-                                                                                      <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="21"/>
-                                                                                      <incomingConnections id="71">
-                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="72" serialization="custom">
-                                                                                          <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                            <default>
-                                                                                              <type>1</type>
-                                                                                              <bendpoints id="73"/>
-                                                                                              <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="74" serialization="custom">
-                                                                                                <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                                  <default>
-                                                                                                    <constraint id="75">
-                                                                                                      <x>155</x>
-                                                                                                      <y>21</y>
-                                                                                                      <width>80</width>
-                                                                                                      <height>40</height>
-                                                                                                    </constraint>
-                                                                                                    <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="24"/>
-                                                                                                    <incomingConnections id="76"/>
-                                                                                                    <outgoingConnections id="77">
-                                                                                                      <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="72"/>
-                                                                                                    </outgoingConnections>
-                                                                                                  </default>
-                                                                                                </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                              </source>
-                                                                                              <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="69"/>
-                                                                                            </default>
-                                                                                          </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                            <default>
-                                                                                              <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="23"/>
-                                                                                            </default>
-                                                                                          </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                        </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                                      </incomingConnections>
-                                                                                      <outgoingConnections id="78">
-                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="67"/>
-                                                                                      </outgoingConnections>
-                                                                                      <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
-                                                                                    </default>
-                                                                                  </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                                </source>
-                                                                                <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="64"/>
-                                                                              </default>
-                                                                            </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                              <default>
-                                                                                <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="20"/>
-                                                                              </default>
-                                                                            </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                          </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                        </incomingConnections>
-                                                                        <outgoingConnections id="79">
-                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="62"/>
-                                                                        </outgoingConnections>
-                                                                        <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
-                                                                      </default>
-                                                                    </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                                  </source>
-                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="59"/>
-                                                                </default>
-                                                              </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                <default>
-                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="17"/>
-                                                                </default>
-                                                              </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                            </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                          </incomingConnections>
-                                                          <outgoingConnections id="80">
+                                                          <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="14"/>
+                                                          <incomingConnections id="61"/>
+                                                          <outgoingConnections id="62">
                                                             <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="57"/>
                                                           </outgoingConnections>
-                                                          <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                         </default>
                                                       </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                     </source>
@@ -310,105 +211,207 @@
                                                 </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                   <default>
-                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="14"/>
+                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="13"/>
                                                   </default>
                                                 </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                               </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                             </incomingConnections>
-                                            <outgoingConnections id="81">
+                                            <outgoingConnections id="63">
                                               <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="52"/>
                                             </outgoingConnections>
                                             <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                           </default>
                                         </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                       </source>
-                                      <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="49"/>
+                                      <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="49"/>
                                     </default>
                                   </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                   <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                     <default>
-                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="11"/>
+                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="10"/>
                                     </default>
                                   </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                 </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                               </incomingConnections>
-                              <outgoingConnections id="82">
+                              <outgoingConnections id="64">
                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="47"/>
-                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="83" serialization="custom">
+                              </outgoingConnections>
+                              <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+                            </default>
+                          </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                        </source>
+                        <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="3"/>
+                      </default>
+                    </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                      <default>
+                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="7"/>
+                      </default>
+                    </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                </incomingConnections>
+                <outgoingConnections id="65">
+                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="66" serialization="custom">
+                    <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                      <default>
+                        <type>1</type>
+                        <bendpoints id="67"/>
+                        <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="3"/>
+                        <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="68" serialization="custom">
+                          <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                            <default>
+                              <constraint id="69">
+                                <x>155</x>
+                                <y>382</y>
+                                <width>80</width>
+                                <height>40</height>
+                              </constraint>
+                              <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="21"/>
+                              <incomingConnections id="70">
+                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="66"/>
+                              </incomingConnections>
+                              <outgoingConnections id="71">
+                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="72" serialization="custom">
                                   <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                     <default>
                                       <type>1</type>
-                                      <bendpoints id="84"/>
-                                      <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="49"/>
-                                      <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="85" serialization="custom">
+                                      <bendpoints id="73"/>
+                                      <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="68"/>
+                                      <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" id="74" serialization="custom">
                                         <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                           <default>
-                                            <constraint id="86">
-                                              <x>287</x>
-                                              <y>566</y>
+                                            <constraint id="75">
+                                              <x>155</x>
+                                              <y>470</y>
                                               <width>80</width>
                                               <height>40</height>
                                             </constraint>
-                                            <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="33"/>
-                                            <incomingConnections id="87">
-                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="83"/>
+                                            <element class="org.drools.ruleflow.core.impl.SplitImpl" reference="25"/>
+                                            <incomingConnections id="76">
+                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="72"/>
                                             </incomingConnections>
-                                            <outgoingConnections id="88">
-                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="89" serialization="custom">
+                                            <outgoingConnections id="77">
+                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="78" serialization="custom">
                                                 <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                   <default>
                                                     <type>1</type>
-                                                    <bendpoints id="90"/>
-                                                    <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="85"/>
-                                                    <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="91" serialization="custom">
+                                                    <bendpoints id="79"/>
+                                                    <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="74"/>
+                                                    <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="80" serialization="custom">
                                                       <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                         <default>
-                                                          <constraint id="92">
-                                                            <x>155</x>
-                                                            <y>648</y>
+                                                          <constraint id="81">
+                                                            <x>23</x>
+                                                            <y>566</y>
                                                             <width>80</width>
                                                             <height>40</height>
                                                           </constraint>
-                                                          <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="37"/>
-                                                          <incomingConnections id="93">
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="94" serialization="custom">
-                                                              <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                                <default>
-                                                                  <type>1</type>
-                                                                  <bendpoints id="95"/>
-                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="3"/>
-                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="91"/>
-                                                                </default>
-                                                              </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                                <default>
-                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="39"/>
-                                                                </default>
-                                                              </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                            </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="89"/>
+                                                          <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="30"/>
+                                                          <incomingConnections id="82">
+                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="78"/>
                                                           </incomingConnections>
-                                                          <outgoingConnections id="96">
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="97" serialization="custom">
+                                                          <outgoingConnections id="83">
+                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="84" serialization="custom">
                                                               <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                                 <default>
                                                                   <type>1</type>
-                                                                  <bendpoints id="98"/>
-                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="91"/>
-                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="99" serialization="custom">
+                                                                  <bendpoints id="85"/>
+                                                                  <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="80"/>
+                                                                  <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="86" serialization="custom">
                                                                     <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                                       <default>
-                                                                        <constraint id="100">
+                                                                        <constraint id="87">
                                                                           <x>155</x>
-                                                                          <y>751</y>
+                                                                          <y>648</y>
                                                                           <width>80</width>
                                                                           <height>40</height>
                                                                         </constraint>
-                                                                        <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="42"/>
-                                                                        <incomingConnections id="101">
-                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="97"/>
+                                                                        <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="34"/>
+                                                                        <incomingConnections id="88">
+                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="84"/>
+                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="89" serialization="custom">
+                                                                            <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                              <default>
+                                                                                <type>1</type>
+                                                                                <bendpoints id="90"/>
+                                                                                <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="91" serialization="custom">
+                                                                                  <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                    <default>
+                                                                                      <constraint id="92">
+                                                                                        <x>287</x>
+                                                                                        <y>566</y>
+                                                                                        <width>80</width>
+                                                                                        <height>40</height>
+                                                                                      </constraint>
+                                                                                      <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="37"/>
+                                                                                      <incomingConnections id="93">
+                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="94" serialization="custom">
+                                                                                          <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                            <default>
+                                                                                              <type>1</type>
+                                                                                              <bendpoints id="95"/>
+                                                                                              <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="74"/>
+                                                                                              <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="91"/>
+                                                                                            </default>
+                                                                                          </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                            <default>
+                                                                                              <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="39"/>
+                                                                                            </default>
+                                                                                          </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                        </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                                      </incomingConnections>
+                                                                                      <outgoingConnections id="96">
+                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="89"/>
+                                                                                      </outgoingConnections>
+                                                                                      <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+                                                                                    </default>
+                                                                                  </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                </source>
+                                                                                <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="86"/>
+                                                                              </default>
+                                                                            </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                              <default>
+                                                                                <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="36"/>
+                                                                              </default>
+                                                                            </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                          </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                         </incomingConnections>
-                                                                        <outgoingConnections id="102"/>
+                                                                        <outgoingConnections id="97">
+                                                                          <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="98" serialization="custom">
+                                                                            <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                              <default>
+                                                                                <type>1</type>
+                                                                                <bendpoints id="99"/>
+                                                                                <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="86"/>
+                                                                                <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="100" serialization="custom">
+                                                                                  <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                    <default>
+                                                                                      <constraint id="101">
+                                                                                        <x>155</x>
+                                                                                        <y>751</y>
+                                                                                        <width>80</width>
+                                                                                        <height>40</height>
+                                                                                      </constraint>
+                                                                                      <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="43"/>
+                                                                                      <incomingConnections id="102">
+                                                                                        <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="98"/>
+                                                                                      </incomingConnections>
+                                                                                      <outgoingConnections id="103"/>
+                                                                                      <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+                                                                                    </default>
+                                                                                  </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                                                                </target>
+                                                                              </default>
+                                                                            </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                              <default>
+                                                                                <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="42"/>
+                                                                              </default>
+                                                                            </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                          </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                                                        </outgoingConnections>
                                                                         <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                                       </default>
                                                                     </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
@@ -417,7 +420,7 @@
                                                               </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                               <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                                 <default>
-                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="41"/>
+                                                                  <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="33"/>
                                                                 </default>
                                                               </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                             </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
@@ -430,20 +433,24 @@
                                                 </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                   <default>
-                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="36"/>
+                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="29"/>
                                                   </default>
                                                 </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                               </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="94"/>
                                             </outgoingConnections>
                                             <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                           </default>
                                         </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                        <org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
+                                          <default/>
+                                        </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
                                       </target>
                                     </default>
                                   </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                   <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                     <default>
-                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="32"/>
+                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="24"/>
                                     </default>
                                   </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                 </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
@@ -451,22 +458,15 @@
                               <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                             </default>
                           </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
-                            <default/>
-                          </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
-                        </source>
-                        <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="3"/>
+                        </target>
                       </default>
                     </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                     <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                       <default>
-                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="7"/>
+                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="20"/>
                       </default>
                     </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                   </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                </incomingConnections>
-                <outgoingConnections id="103">
-                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="94"/>
                 </outgoingConnections>
                 <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
               </default>
@@ -474,83 +474,83 @@
           </org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper>
         </entry>
         <entry>
+          <string>4-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="68"/>
+        </entry>
+        <entry>
+          <string>7-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="54"/>
+        </entry>
+        <entry>
           <string>9-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper reference="49"/>
+          <org.drools.eclipse.flow.ruleflow.core.SplitWrapper reference="74"/>
         </entry>
         <entry>
           <string>2-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="64"/>
+          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="49"/>
         </entry>
         <entry>
-          <string>7-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="69"/>
+          <string>10-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="86"/>
         </entry>
         <entry>
-          <string>4-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="54"/>
-        </entry>
-        <entry>
           <string>11-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="99"/>
+          <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="100"/>
         </entry>
         <entry>
-          <string>3-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="59"/>
+          <string>1-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="59"/>
         </entry>
         <entry>
           <string>6-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="85"/>
+          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="91"/>
         </entry>
         <entry>
-          <string>10-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="91"/>
+          <string>5-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="80"/>
         </entry>
-        <entry>
-          <string>1-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="74"/>
-        </entry>
       </elements>
       <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="104">
         <nodes id="105">
           <entry>
-            <long>2</long>
-            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="18"/>
+            <long>1</long>
+            <org.drools.ruleflow.core.impl.StartNodeImpl reference="14"/>
           </entry>
           <entry>
-            <long>4</long>
-            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="12"/>
+            <long>2</long>
+            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="8"/>
           </entry>
           <entry>
-            <long>9</long>
-            <org.drools.ruleflow.core.impl.SplitImpl reference="8"/>
+            <long>3</long>
+            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="5"/>
           </entry>
           <entry>
-            <long>6</long>
-            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="33"/>
+            <long>4</long>
+            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="21"/>
           </entry>
           <entry>
-            <long>11</long>
-            <org.drools.ruleflow.core.impl.EndNodeImpl reference="42"/>
+            <long>5</long>
+            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="30"/>
           </entry>
           <entry>
-            <long>1</long>
-            <org.drools.ruleflow.core.impl.StartNodeImpl reference="24"/>
+            <long>6</long>
+            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="37"/>
           </entry>
           <entry>
-            <long>3</long>
-            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="15"/>
+            <long>7</long>
+            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="11"/>
           </entry>
           <entry>
-            <long>7</long>
-            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="21"/>
+            <long>9</long>
+            <org.drools.ruleflow.core.impl.SplitImpl reference="25"/>
           </entry>
           <entry>
             <long>10</long>
-            <org.drools.ruleflow.core.impl.JoinImpl reference="37"/>
+            <org.drools.ruleflow.core.impl.JoinImpl reference="34"/>
           </entry>
           <entry>
-            <long>5</long>
-            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="5"/>
+            <long>11</long>
+            <org.drools.ruleflow.core.impl.EndNodeImpl reference="43"/>
           </entry>
         </nodes>
         <variables id="106"/>
@@ -559,6 +559,7 @@
         <name>generation</name>
         <version>1</version>
         <type>RuleFlow</type>
+        <packageName>org.drools.examples</packageName>
       </process>
       <routerLayout>2</routerLayout>
     </default>

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/generation.rfm
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/generation.rfm	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/generation.rfm	2007-10-03 00:20:35 UTC (rev 15530)
@@ -1,134 +1,134 @@
 <org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
   <nodes id="2">
     <entry>
-      <long>2</long>
-      <org.drools.ruleflow.core.impl.RuleSetNodeImpl id="3">
-        <ruleFlowGroup>evaluate</ruleFlowGroup>
-        <id>2</id>
-        <name>evaluate</name>
-        <incomingConnections id="4">
-          <org.drools.ruleflow.core.impl.ConnectionImpl id="5">
+      <long>1</long>
+      <org.drools.ruleflow.core.impl.StartNodeImpl id="3">
+        <id>1</id>
+        <name>Start</name>
+        <incomingConnections id="4"/>
+        <outgoingConnections id="5">
+          <org.drools.ruleflow.core.impl.ConnectionImpl id="6">
             <type>1</type>
-            <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="6">
+            <from class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="3"/>
+            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="7">
               <ruleFlowGroup>calculate</ruleFlowGroup>
               <id>7</id>
               <name>calculate</name>
-              <incomingConnections id="7">
-                <org.drools.ruleflow.core.impl.ConnectionImpl id="8">
-                  <type>1</type>
-                  <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="9">
-                    <id>1</id>
-                    <name>Start</name>
-                    <incomingConnections id="10"/>
-                    <outgoingConnections id="11">
-                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="8"/>
-                    </outgoingConnections>
-                  </from>
-                  <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="6"/>
-                </org.drools.ruleflow.core.impl.ConnectionImpl>
+              <incomingConnections id="8">
+                <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
               </incomingConnections>
-              <outgoingConnections id="12">
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="5"/>
-              </outgoingConnections>
-            </from>
-            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="3"/>
-          </org.drools.ruleflow.core.impl.ConnectionImpl>
-        </incomingConnections>
-        <outgoingConnections id="13">
-          <org.drools.ruleflow.core.impl.ConnectionImpl id="14">
-            <type>1</type>
-            <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="3"/>
-            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="15">
-              <ruleFlowGroup>rest</ruleFlowGroup>
-              <id>3</id>
-              <name>rest</name>
-              <incomingConnections id="16">
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="14"/>
-              </incomingConnections>
-              <outgoingConnections id="17">
-                <org.drools.ruleflow.core.impl.ConnectionImpl id="18">
+              <outgoingConnections id="9">
+                <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
                   <type>1</type>
-                  <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="15"/>
-                  <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="19">
-                    <ruleFlowGroup>reset calculate</ruleFlowGroup>
-                    <id>4</id>
-                    <name>reset calculate</name>
-                    <incomingConnections id="20">
-                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="18"/>
+                  <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="7"/>
+                  <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="11">
+                    <ruleFlowGroup>evaluate</ruleFlowGroup>
+                    <id>2</id>
+                    <name>evaluate</name>
+                    <incomingConnections id="12">
+                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
                     </incomingConnections>
-                    <outgoingConnections id="21">
-                      <org.drools.ruleflow.core.impl.ConnectionImpl id="22">
+                    <outgoingConnections id="13">
+                      <org.drools.ruleflow.core.impl.ConnectionImpl id="14">
                         <type>1</type>
-                        <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="19"/>
-                        <to class="org.drools.ruleflow.core.impl.SplitImpl" id="23">
-                          <type>1</type>
-                          <constraints id="24"/>
-                          <id>9</id>
-                          <name>Split</name>
-                          <incomingConnections id="25">
-                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="22"/>
+                        <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="11"/>
+                        <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="15">
+                          <ruleFlowGroup>rest</ruleFlowGroup>
+                          <id>3</id>
+                          <name>rest</name>
+                          <incomingConnections id="16">
+                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="14"/>
                           </incomingConnections>
-                          <outgoingConnections id="26">
-                            <org.drools.ruleflow.core.impl.ConnectionImpl id="27">
+                          <outgoingConnections id="17">
+                            <org.drools.ruleflow.core.impl.ConnectionImpl id="18">
                               <type>1</type>
-                              <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="23"/>
-                              <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="28">
-                                <ruleFlowGroup>birth</ruleFlowGroup>
-                                <id>5</id>
-                                <name>birth</name>
-                                <incomingConnections id="29">
-                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="27"/>
+                              <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="15"/>
+                              <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="19">
+                                <ruleFlowGroup>reset calculate</ruleFlowGroup>
+                                <id>4</id>
+                                <name>reset calculate</name>
+                                <incomingConnections id="20">
+                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="18"/>
                                 </incomingConnections>
-                                <outgoingConnections id="30">
-                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="31">
+                                <outgoingConnections id="21">
+                                  <org.drools.ruleflow.core.impl.ConnectionImpl id="22">
                                     <type>1</type>
-                                    <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="28"/>
-                                    <to class="org.drools.ruleflow.core.impl.JoinImpl" id="32">
+                                    <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="19"/>
+                                    <to class="org.drools.ruleflow.core.impl.SplitImpl" id="23">
                                       <type>1</type>
-                                      <id>10</id>
-                                      <name>Join</name>
-                                      <incomingConnections id="33">
-                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="31"/>
-                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="34">
+                                      <constraints id="24"/>
+                                      <id>9</id>
+                                      <name>Split</name>
+                                      <incomingConnections id="25">
+                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="22"/>
+                                      </incomingConnections>
+                                      <outgoingConnections id="26">
+                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="27">
                                           <type>1</type>
-                                          <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="35">
-                                            <ruleFlowGroup>kill</ruleFlowGroup>
-                                            <id>6</id>
-                                            <name>kill</name>
-                                            <incomingConnections id="36">
-                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="37">
+                                          <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="23"/>
+                                          <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="28">
+                                            <ruleFlowGroup>birth</ruleFlowGroup>
+                                            <id>5</id>
+                                            <name>birth</name>
+                                            <incomingConnections id="29">
+                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="27"/>
+                                            </incomingConnections>
+                                            <outgoingConnections id="30">
+                                              <org.drools.ruleflow.core.impl.ConnectionImpl id="31">
                                                 <type>1</type>
-                                                <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="23"/>
-                                                <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="35"/>
+                                                <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="28"/>
+                                                <to class="org.drools.ruleflow.core.impl.JoinImpl" id="32">
+                                                  <type>1</type>
+                                                  <id>10</id>
+                                                  <name>Join</name>
+                                                  <incomingConnections id="33">
+                                                    <org.drools.ruleflow.core.impl.ConnectionImpl reference="31"/>
+                                                    <org.drools.ruleflow.core.impl.ConnectionImpl id="34">
+                                                      <type>1</type>
+                                                      <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="35">
+                                                        <ruleFlowGroup>kill</ruleFlowGroup>
+                                                        <id>6</id>
+                                                        <name>kill</name>
+                                                        <incomingConnections id="36">
+                                                          <org.drools.ruleflow.core.impl.ConnectionImpl id="37">
+                                                            <type>1</type>
+                                                            <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="23"/>
+                                                            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="35"/>
+                                                          </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                        </incomingConnections>
+                                                        <outgoingConnections id="38">
+                                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="34"/>
+                                                        </outgoingConnections>
+                                                      </from>
+                                                      <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="32"/>
+                                                    </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                  </incomingConnections>
+                                                  <outgoingConnections id="39">
+                                                    <org.drools.ruleflow.core.impl.ConnectionImpl id="40">
+                                                      <type>1</type>
+                                                      <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="32"/>
+                                                      <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="41">
+                                                        <id>11</id>
+                                                        <name>End</name>
+                                                        <incomingConnections id="42">
+                                                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="40"/>
+                                                        </incomingConnections>
+                                                        <outgoingConnections id="43"/>
+                                                      </to>
+                                                    </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                                  </outgoingConnections>
+                                                </to>
                                               </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                            </incomingConnections>
-                                            <outgoingConnections id="38">
-                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="34"/>
                                             </outgoingConnections>
-                                          </from>
-                                          <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="32"/>
-                                        </org.drools.ruleflow.core.impl.ConnectionImpl>
-                                      </incomingConnections>
-                                      <outgoingConnections id="39">
-                                        <org.drools.ruleflow.core.impl.ConnectionImpl id="40">
-                                          <type>1</type>
-                                          <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="32"/>
-                                          <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="41">
-                                            <id>11</id>
-                                            <name>End</name>
-                                            <incomingConnections id="42">
-                                              <org.drools.ruleflow.core.impl.ConnectionImpl reference="40"/>
-                                            </incomingConnections>
-                                            <outgoingConnections id="43"/>
                                           </to>
                                         </org.drools.ruleflow.core.impl.ConnectionImpl>
+                                        <org.drools.ruleflow.core.impl.ConnectionImpl reference="37"/>
                                       </outgoingConnections>
                                     </to>
                                   </org.drools.ruleflow.core.impl.ConnectionImpl>
                                 </outgoingConnections>
                               </to>
                             </org.drools.ruleflow.core.impl.ConnectionImpl>
-                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="37"/>
                           </outgoingConnections>
                         </to>
                       </org.drools.ruleflow.core.impl.ConnectionImpl>
@@ -139,43 +139,43 @@
             </to>
           </org.drools.ruleflow.core.impl.ConnectionImpl>
         </outgoingConnections>
-      </org.drools.ruleflow.core.impl.RuleSetNodeImpl>
+      </org.drools.ruleflow.core.impl.StartNodeImpl>
     </entry>
     <entry>
+      <long>2</long>
+      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="11"/>
+    </entry>
+    <entry>
+      <long>3</long>
+      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="15"/>
+    </entry>
+    <entry>
       <long>4</long>
       <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="19"/>
     </entry>
     <entry>
-      <long>9</long>
-      <org.drools.ruleflow.core.impl.SplitImpl reference="23"/>
+      <long>5</long>
+      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="28"/>
     </entry>
     <entry>
       <long>6</long>
       <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="35"/>
     </entry>
     <entry>
-      <long>11</long>
-      <org.drools.ruleflow.core.impl.EndNodeImpl reference="41"/>
+      <long>7</long>
+      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="7"/>
     </entry>
     <entry>
-      <long>1</long>
-      <org.drools.ruleflow.core.impl.StartNodeImpl reference="9"/>
+      <long>9</long>
+      <org.drools.ruleflow.core.impl.SplitImpl reference="23"/>
     </entry>
     <entry>
-      <long>3</long>
-      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="15"/>
-    </entry>
-    <entry>
-      <long>7</long>
-      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="6"/>
-    </entry>
-    <entry>
       <long>10</long>
       <org.drools.ruleflow.core.impl.JoinImpl reference="32"/>
     </entry>
     <entry>
-      <long>5</long>
-      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="28"/>
+      <long>11</long>
+      <org.drools.ruleflow.core.impl.EndNodeImpl reference="41"/>
     </entry>
   </nodes>
   <variables id="44"/>
@@ -184,4 +184,5 @@
   <name>generation</name>
   <version>1</version>
   <type>RuleFlow</type>
+  <packageName>org.drools.examples</packageName>
 </org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/killAll.rf
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/killAll.rf	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/killAll.rf	2007-10-03 00:20:35 UTC (rev 15530)
@@ -3,73 +3,73 @@
     <default>
       <elements id="2">
         <entry>
-          <string>7-Wrapper</string>
+          <string>4-Wrapper</string>
           <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper id="3" serialization="custom">
             <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
               <default>
                 <constraint id="4">
                   <x>368</x>
-                  <y>298</y>
+                  <y>154</y>
                   <width>80</width>
                   <height>40</height>
                 </constraint>
                 <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="5">
                   <ruleFlowGroup>calculate</ruleFlowGroup>
-                  <id>7</id>
-                  <name>calculate after</name>
+                  <id>4</id>
+                  <name> calculate before</name>
                   <incomingConnections id="6">
                     <org.drools.ruleflow.core.impl.ConnectionImpl id="7">
                       <type>1</type>
-                      <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="8">
+                      <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="8">
+                        <id>1</id>
+                        <name>Start</name>
+                        <incomingConnections id="9"/>
+                        <outgoingConnections id="10">
+                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
+                        </outgoingConnections>
+                      </from>
+                      <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="5"/>
+                    </org.drools.ruleflow.core.impl.ConnectionImpl>
+                  </incomingConnections>
+                  <outgoingConnections id="11">
+                    <org.drools.ruleflow.core.impl.ConnectionImpl id="12">
+                      <type>1</type>
+                      <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="5"/>
+                      <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="13">
                         <ruleFlowGroup>kill all</ruleFlowGroup>
                         <id>6</id>
                         <name>kill all</name>
-                        <incomingConnections id="9">
-                          <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
+                        <incomingConnections id="14">
+                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
+                        </incomingConnections>
+                        <outgoingConnections id="15">
+                          <org.drools.ruleflow.core.impl.ConnectionImpl id="16">
                             <type>1</type>
-                            <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="11">
+                            <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="13"/>
+                            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="17">
                               <ruleFlowGroup>calculate</ruleFlowGroup>
-                              <id>4</id>
-                              <name> calculate before</name>
-                              <incomingConnections id="12">
-                                <org.drools.ruleflow.core.impl.ConnectionImpl id="13">
+                              <id>7</id>
+                              <name>calculate after</name>
+                              <incomingConnections id="18">
+                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="16"/>
+                              </incomingConnections>
+                              <outgoingConnections id="19">
+                                <org.drools.ruleflow.core.impl.ConnectionImpl id="20">
                                   <type>1</type>
-                                  <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="14">
-                                    <id>1</id>
-                                    <name>Start</name>
-                                    <incomingConnections id="15"/>
-                                    <outgoingConnections id="16">
-                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="13"/>
-                                    </outgoingConnections>
-                                  </from>
-                                  <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="11"/>
+                                  <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="17"/>
+                                  <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="21">
+                                    <id>11</id>
+                                    <name>End</name>
+                                    <incomingConnections id="22">
+                                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="20"/>
+                                    </incomingConnections>
+                                    <outgoingConnections id="23"/>
+                                  </to>
                                 </org.drools.ruleflow.core.impl.ConnectionImpl>
-                              </incomingConnections>
-                              <outgoingConnections id="17">
-                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
                               </outgoingConnections>
-                            </from>
-                            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="8"/>
+                            </to>
                           </org.drools.ruleflow.core.impl.ConnectionImpl>
-                        </incomingConnections>
-                        <outgoingConnections id="18">
-                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
                         </outgoingConnections>
-                      </from>
-                      <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="5"/>
-                    </org.drools.ruleflow.core.impl.ConnectionImpl>
-                  </incomingConnections>
-                  <outgoingConnections id="19">
-                    <org.drools.ruleflow.core.impl.ConnectionImpl id="20">
-                      <type>1</type>
-                      <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="5"/>
-                      <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="21">
-                        <id>11</id>
-                        <name>End</name>
-                        <incomingConnections id="22">
-                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="20"/>
-                        </incomingConnections>
-                        <outgoingConnections id="23"/>
                       </to>
                     </org.drools.ruleflow.core.impl.ConnectionImpl>
                   </outgoingConnections>
@@ -80,129 +80,129 @@
                       <default>
                         <type>1</type>
                         <bendpoints id="26"/>
-                        <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="27" serialization="custom">
+                        <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="27" serialization="custom">
                           <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                             <default>
                               <constraint id="28">
                                 <x>368</x>
+                                <y>73</y>
+                                <width>80</width>
+                                <height>40</height>
+                              </constraint>
+                              <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="8"/>
+                              <incomingConnections id="29"/>
+                              <outgoingConnections id="30">
+                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="25"/>
+                              </outgoingConnections>
+                            </default>
+                          </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                        </source>
+                        <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="3"/>
+                      </default>
+                    </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                      <default>
+                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="7"/>
+                      </default>
+                    </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                </incomingConnections>
+                <outgoingConnections id="31">
+                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="32" serialization="custom">
+                    <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                      <default>
+                        <type>1</type>
+                        <bendpoints id="33"/>
+                        <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="3"/>
+                        <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="34" serialization="custom">
+                          <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                            <default>
+                              <constraint id="35">
+                                <x>368</x>
                                 <y>223</y>
                                 <width>80</width>
                                 <height>40</height>
                               </constraint>
-                              <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="8"/>
-                              <incomingConnections id="29">
-                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="30" serialization="custom">
+                              <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="13"/>
+                              <incomingConnections id="36">
+                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="32"/>
+                              </incomingConnections>
+                              <outgoingConnections id="37">
+                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="38" serialization="custom">
                                   <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                     <default>
                                       <type>1</type>
-                                      <bendpoints id="31"/>
-                                      <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="32" serialization="custom">
+                                      <bendpoints id="39"/>
+                                      <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="34"/>
+                                      <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="40" serialization="custom">
                                         <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                           <default>
-                                            <constraint id="33">
+                                            <constraint id="41">
                                               <x>368</x>
-                                              <y>154</y>
+                                              <y>298</y>
                                               <width>80</width>
                                               <height>40</height>
                                             </constraint>
-                                            <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="11"/>
-                                            <incomingConnections id="34">
-                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="35" serialization="custom">
+                                            <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="17"/>
+                                            <incomingConnections id="42">
+                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="38"/>
+                                            </incomingConnections>
+                                            <outgoingConnections id="43">
+                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="44" serialization="custom">
                                                 <org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                   <default>
                                                     <type>1</type>
-                                                    <bendpoints id="36"/>
-                                                    <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="37" serialization="custom">
+                                                    <bendpoints id="45"/>
+                                                    <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="40"/>
+                                                    <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="46" serialization="custom">
                                                       <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                                                         <default>
-                                                          <constraint id="38">
+                                                          <constraint id="47">
                                                             <x>368</x>
-                                                            <y>73</y>
+                                                            <y>383</y>
                                                             <width>80</width>
                                                             <height>40</height>
                                                           </constraint>
-                                                          <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="14"/>
-                                                          <incomingConnections id="39"/>
-                                                          <outgoingConnections id="40">
-                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="35"/>
-                                                          </outgoingConnections>
+                                                          <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="21"/>
+                                                          <incomingConnections id="48">
+                                                            <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="44"/>
+                                                          </incomingConnections>
+                                                          <outgoingConnections id="49"/>
+                                                          <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                                         </default>
                                                       </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                                    </source>
-                                                    <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="32"/>
+                                                    </target>
                                                   </default>
                                                 </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                                   <default>
-                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="13"/>
+                                                    <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="20"/>
                                                   </default>
                                                 </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                               </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                                            </incomingConnections>
-                                            <outgoingConnections id="41">
-                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="30"/>
                                             </outgoingConnections>
                                             <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                                           </default>
                                         </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                                      </source>
-                                      <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="27"/>
+                                      </target>
                                     </default>
                                   </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                                   <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                     <default>
-                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="10"/>
+                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="16"/>
                                     </default>
                                   </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                                 </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                              </incomingConnections>
-                              <outgoingConnections id="42">
-                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="25"/>
                               </outgoingConnections>
                               <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                             </default>
                           </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                        </source>
-                        <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="3"/>
-                      </default>
-                    </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                      <default>
-                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="7"/>
-                      </default>
-                    </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                </incomingConnections>
-                <outgoingConnections id="43">
-                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="44" serialization="custom">
-                    <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                      <default>
-                        <type>1</type>
-                        <bendpoints id="45"/>
-                        <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="3"/>
-                        <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="46" serialization="custom">
-                          <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                            <default>
-                              <constraint id="47">
-                                <x>368</x>
-                                <y>383</y>
-                                <width>80</width>
-                                <height>40</height>
-                              </constraint>
-                              <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="21"/>
-                              <incomingConnections id="48">
-                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="44"/>
-                              </incomingConnections>
-                              <outgoingConnections id="49"/>
-                              <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
-                            </default>
-                          </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                         </target>
                       </default>
                     </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                     <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                       <default>
-                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="20"/>
+                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="12"/>
                       </default>
                     </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                   </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
@@ -213,43 +213,43 @@
           </org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper>
         </entry>
         <entry>
-          <string>4-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="32"/>
+          <string>7-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="40"/>
         </entry>
         <entry>
           <string>11-Wrapper</string>
           <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="46"/>
         </entry>
         <entry>
-          <string>6-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="27"/>
+          <string>1-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="27"/>
         </entry>
         <entry>
-          <string>1-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="37"/>
+          <string>6-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="34"/>
         </entry>
       </elements>
       <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="50">
         <nodes id="51">
           <entry>
-            <long>4</long>
-            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="11"/>
+            <long>1</long>
+            <org.drools.ruleflow.core.impl.StartNodeImpl reference="8"/>
           </entry>
           <entry>
-            <long>11</long>
-            <org.drools.ruleflow.core.impl.EndNodeImpl reference="21"/>
+            <long>4</long>
+            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="5"/>
           </entry>
           <entry>
             <long>6</long>
-            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="8"/>
+            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="13"/>
           </entry>
           <entry>
-            <long>1</long>
-            <org.drools.ruleflow.core.impl.StartNodeImpl reference="14"/>
+            <long>7</long>
+            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="17"/>
           </entry>
           <entry>
-            <long>7</long>
-            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="5"/>
+            <long>11</long>
+            <org.drools.ruleflow.core.impl.EndNodeImpl reference="21"/>
           </entry>
         </nodes>
         <variables id="52"/>
@@ -258,6 +258,7 @@
         <name>kill all</name>
         <version>1</version>
         <type>RuleFlow</type>
+        <packageName>org.drools.examples</packageName>
       </process>
       <routerLayout>2</routerLayout>
     </default>

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/killAll.rfm
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/killAll.rfm	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/killAll.rfm	2007-10-03 00:20:35 UTC (rev 15530)
@@ -1,58 +1,58 @@
 <org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
   <nodes id="2">
     <entry>
-      <long>4</long>
-      <org.drools.ruleflow.core.impl.RuleSetNodeImpl id="3">
-        <ruleFlowGroup>calculate</ruleFlowGroup>
-        <id>4</id>
-        <name> calculate before</name>
-        <incomingConnections id="4">
-          <org.drools.ruleflow.core.impl.ConnectionImpl id="5">
+      <long>1</long>
+      <org.drools.ruleflow.core.impl.StartNodeImpl id="3">
+        <id>1</id>
+        <name>Start</name>
+        <incomingConnections id="4"/>
+        <outgoingConnections id="5">
+          <org.drools.ruleflow.core.impl.ConnectionImpl id="6">
             <type>1</type>
-            <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="6">
-              <id>1</id>
-              <name>Start</name>
-              <incomingConnections id="7"/>
-              <outgoingConnections id="8">
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="5"/>
-              </outgoingConnections>
-            </from>
-            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="3"/>
-          </org.drools.ruleflow.core.impl.ConnectionImpl>
-        </incomingConnections>
-        <outgoingConnections id="9">
-          <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
-            <type>1</type>
-            <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="3"/>
-            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="11">
-              <ruleFlowGroup>kill all</ruleFlowGroup>
-              <id>6</id>
-              <name>kill all</name>
-              <incomingConnections id="12">
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
+            <from class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="3"/>
+            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="7">
+              <ruleFlowGroup>calculate</ruleFlowGroup>
+              <id>4</id>
+              <name> calculate before</name>
+              <incomingConnections id="8">
+                <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
               </incomingConnections>
-              <outgoingConnections id="13">
-                <org.drools.ruleflow.core.impl.ConnectionImpl id="14">
+              <outgoingConnections id="9">
+                <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
                   <type>1</type>
-                  <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="11"/>
-                  <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="15">
-                    <ruleFlowGroup>calculate</ruleFlowGroup>
-                    <id>7</id>
-                    <name>calculate after</name>
-                    <incomingConnections id="16">
-                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="14"/>
+                  <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="7"/>
+                  <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="11">
+                    <ruleFlowGroup>kill all</ruleFlowGroup>
+                    <id>6</id>
+                    <name>kill all</name>
+                    <incomingConnections id="12">
+                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
                     </incomingConnections>
-                    <outgoingConnections id="17">
-                      <org.drools.ruleflow.core.impl.ConnectionImpl id="18">
+                    <outgoingConnections id="13">
+                      <org.drools.ruleflow.core.impl.ConnectionImpl id="14">
                         <type>1</type>
-                        <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="15"/>
-                        <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="19">
-                          <id>11</id>
-                          <name>End</name>
-                          <incomingConnections id="20">
-                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="18"/>
+                        <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="11"/>
+                        <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="15">
+                          <ruleFlowGroup>calculate</ruleFlowGroup>
+                          <id>7</id>
+                          <name>calculate after</name>
+                          <incomingConnections id="16">
+                            <org.drools.ruleflow.core.impl.ConnectionImpl reference="14"/>
                           </incomingConnections>
-                          <outgoingConnections id="21"/>
+                          <outgoingConnections id="17">
+                            <org.drools.ruleflow.core.impl.ConnectionImpl id="18">
+                              <type>1</type>
+                              <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="15"/>
+                              <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="19">
+                                <id>11</id>
+                                <name>End</name>
+                                <incomingConnections id="20">
+                                  <org.drools.ruleflow.core.impl.ConnectionImpl reference="18"/>
+                                </incomingConnections>
+                                <outgoingConnections id="21"/>
+                              </to>
+                            </org.drools.ruleflow.core.impl.ConnectionImpl>
+                          </outgoingConnections>
                         </to>
                       </org.drools.ruleflow.core.impl.ConnectionImpl>
                     </outgoingConnections>
@@ -62,24 +62,24 @@
             </to>
           </org.drools.ruleflow.core.impl.ConnectionImpl>
         </outgoingConnections>
-      </org.drools.ruleflow.core.impl.RuleSetNodeImpl>
+      </org.drools.ruleflow.core.impl.StartNodeImpl>
     </entry>
     <entry>
-      <long>11</long>
-      <org.drools.ruleflow.core.impl.EndNodeImpl reference="19"/>
+      <long>4</long>
+      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="7"/>
     </entry>
     <entry>
       <long>6</long>
       <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="11"/>
     </entry>
     <entry>
-      <long>1</long>
-      <org.drools.ruleflow.core.impl.StartNodeImpl reference="6"/>
-    </entry>
-    <entry>
       <long>7</long>
       <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="15"/>
     </entry>
+    <entry>
+      <long>11</long>
+      <org.drools.ruleflow.core.impl.EndNodeImpl reference="19"/>
+    </entry>
   </nodes>
   <variables id="22"/>
   <lastNodeId>11</lastNodeId>
@@ -87,4 +87,5 @@
   <name>kill all</name>
   <version>1</version>
   <type>RuleFlow</type>
+  <packageName>org.drools.examples</packageName>
 </org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/registerNeighbor.rf
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/registerNeighbor.rf	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/registerNeighbor.rf	2007-10-03 00:20:35 UTC (rev 15530)
@@ -3,48 +3,48 @@
     <default>
       <elements id="2">
         <entry>
-          <string>2-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper id="3" serialization="custom">
+          <string>3-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper id="3" serialization="custom">
             <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
               <default>
                 <constraint id="4">
-                  <x>307</x>
-                  <y>128</y>
-                  <width>99</width>
+                  <x>316</x>
+                  <y>222</y>
+                  <width>80</width>
                   <height>40</height>
                 </constraint>
-                <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="5">
-                  <ruleFlowGroup>register neighbor</ruleFlowGroup>
-                  <id>2</id>
-                  <name>register neighbor</name>
+                <element class="org.drools.ruleflow.core.impl.EndNodeImpl" id="5">
+                  <id>3</id>
+                  <name>End</name>
                   <incomingConnections id="6">
                     <org.drools.ruleflow.core.impl.ConnectionImpl id="7">
                       <type>1</type>
-                      <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="8">
-                        <id>1</id>
-                        <name>Start</name>
-                        <incomingConnections id="9"/>
-                        <outgoingConnections id="10">
+                      <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="8">
+                        <ruleFlowGroup>register neighbor</ruleFlowGroup>
+                        <id>2</id>
+                        <name>register neighbor</name>
+                        <incomingConnections id="9">
+                          <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
+                            <type>1</type>
+                            <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="11">
+                              <id>1</id>
+                              <name>Start</name>
+                              <incomingConnections id="12"/>
+                              <outgoingConnections id="13">
+                                <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
+                              </outgoingConnections>
+                            </from>
+                            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="8"/>
+                          </org.drools.ruleflow.core.impl.ConnectionImpl>
+                        </incomingConnections>
+                        <outgoingConnections id="14">
                           <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
                         </outgoingConnections>
                       </from>
-                      <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="5"/>
+                      <to class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="5"/>
                     </org.drools.ruleflow.core.impl.ConnectionImpl>
                   </incomingConnections>
-                  <outgoingConnections id="11">
-                    <org.drools.ruleflow.core.impl.ConnectionImpl id="12">
-                      <type>1</type>
-                      <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="5"/>
-                      <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="13">
-                        <id>3</id>
-                        <name>End</name>
-                        <incomingConnections id="14">
-                          <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
-                        </incomingConnections>
-                        <outgoingConnections id="15"/>
-                      </to>
-                    </org.drools.ruleflow.core.impl.ConnectionImpl>
-                  </outgoingConnections>
+                  <outgoingConnections id="15"/>
                 </element>
                 <incomingConnections id="16">
                   <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="17" serialization="custom">
@@ -52,24 +52,57 @@
                       <default>
                         <type>1</type>
                         <bendpoints id="18"/>
-                        <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="19" serialization="custom">
+                        <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="19" serialization="custom">
                           <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                             <default>
                               <constraint id="20">
-                                <x>316</x>
-                                <y>33</y>
-                                <width>80</width>
+                                <x>307</x>
+                                <y>128</y>
+                                <width>99</width>
                                 <height>40</height>
                               </constraint>
-                              <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="8"/>
-                              <incomingConnections id="21"/>
-                              <outgoingConnections id="22">
+                              <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="8"/>
+                              <incomingConnections id="21">
+                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="22" serialization="custom">
+                                  <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                    <default>
+                                      <type>1</type>
+                                      <bendpoints id="23"/>
+                                      <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="24" serialization="custom">
+                                        <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                          <default>
+                                            <constraint id="25">
+                                              <x>316</x>
+                                              <y>33</y>
+                                              <width>80</width>
+                                              <height>40</height>
+                                            </constraint>
+                                            <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="11"/>
+                                            <incomingConnections id="26"/>
+                                            <outgoingConnections id="27">
+                                              <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="22"/>
+                                            </outgoingConnections>
+                                          </default>
+                                        </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+                                      </source>
+                                      <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="19"/>
+                                    </default>
+                                  </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+                                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                    <default>
+                                      <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="10"/>
+                                    </default>
+                                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                                </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+                              </incomingConnections>
+                              <outgoingConnections id="28">
                                 <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="17"/>
                               </outgoingConnections>
+                              <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
                             </default>
                           </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
                         </source>
-                        <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="3"/>
+                        <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" reference="3"/>
                       </default>
                     </org.drools.eclipse.flow.common.editor.core.ElementConnection>
                     <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
@@ -79,67 +112,34 @@
                     </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                   </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
                 </incomingConnections>
-                <outgoingConnections id="23">
-                  <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="24" serialization="custom">
-                    <org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                      <default>
-                        <type>1</type>
-                        <bendpoints id="25"/>
-                        <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="3"/>
-                        <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="26" serialization="custom">
-                          <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                            <default>
-                              <constraint id="27">
-                                <x>316</x>
-                                <y>222</y>
-                                <width>80</width>
-                                <height>40</height>
-                              </constraint>
-                              <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="13"/>
-                              <incomingConnections id="28">
-                                <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="24"/>
-                              </incomingConnections>
-                              <outgoingConnections id="29"/>
-                              <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
-                            </default>
-                          </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-                        </target>
-                      </default>
-                    </org.drools.eclipse.flow.common.editor.core.ElementConnection>
-                    <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                      <default>
-                        <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="12"/>
-                      </default>
-                    </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                  </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
-                </outgoingConnections>
+                <outgoingConnections id="29"/>
                 <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
               </default>
             </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
-          </org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper>
+          </org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper>
         </entry>
         <entry>
-          <string>3-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="26"/>
+          <string>2-Wrapper</string>
+          <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="19"/>
         </entry>
         <entry>
           <string>1-Wrapper</string>
-          <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="19"/>
+          <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="24"/>
         </entry>
       </elements>
       <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="30">
         <nodes id="31">
           <entry>
-            <long>2</long>
-            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="5"/>
+            <long>1</long>
+            <org.drools.ruleflow.core.impl.StartNodeImpl reference="11"/>
           </entry>
           <entry>
-            <long>1</long>
-            <org.drools.ruleflow.core.impl.StartNodeImpl reference="8"/>
+            <long>2</long>
+            <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="8"/>
           </entry>
           <entry>
             <long>3</long>
-            <org.drools.ruleflow.core.impl.EndNodeImpl reference="13"/>
+            <org.drools.ruleflow.core.impl.EndNodeImpl reference="5"/>
           </entry>
         </nodes>
         <variables id="32"/>
@@ -147,6 +147,7 @@
         <id>register neighbor</id>
         <name>register neighbor</name>
         <type>RuleFlow</type>
+        <packageName>org.drools.examples</packageName>
       </process>
       <routerLayout>2</routerLayout>
     </default>

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/registerNeighbor.rfm
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/registerNeighbor.rfm	2007-10-03 00:20:18 UTC (rev 15529)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/conway/registerNeighbor.rfm	2007-10-03 00:20:35 UTC (rev 15530)
@@ -1,44 +1,44 @@
 <org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
   <nodes id="2">
     <entry>
-      <long>2</long>
-      <org.drools.ruleflow.core.impl.RuleSetNodeImpl id="3">
-        <ruleFlowGroup>register neighbor</ruleFlowGroup>
-        <id>2</id>
-        <name>register neighbor</name>
-        <incomingConnections id="4">
-          <org.drools.ruleflow.core.impl.ConnectionImpl id="5">
+      <long>1</long>
+      <org.drools.ruleflow.core.impl.StartNodeImpl id="3">
+        <id>1</id>
+        <name>Start</name>
+        <incomingConnections id="4"/>
+        <outgoingConnections id="5">
+          <org.drools.ruleflow.core.impl.ConnectionImpl id="6">
             <type>1</type>
-            <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="6">
-              <id>1</id>
-              <name>Start</name>
-              <incomingConnections id="7"/>
-              <outgoingConnections id="8">
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="5"/>
+            <from class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="3"/>
+            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="7">
+              <ruleFlowGroup>register neighbor</ruleFlowGroup>
+              <id>2</id>
+              <name>register neighbor</name>
+              <incomingConnections id="8">
+                <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
+              </incomingConnections>
+              <outgoingConnections id="9">
+                <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
+                  <type>1</type>
+                  <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="7"/>
+                  <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="11">
+                    <id>3</id>
+                    <name>End</name>
+                    <incomingConnections id="12">
+                      <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
+                    </incomingConnections>
+                    <outgoingConnections id="13"/>
+                  </to>
+                </org.drools.ruleflow.core.impl.ConnectionImpl>
               </outgoingConnections>
-            </from>
-            <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="3"/>
-          </org.drools.ruleflow.core.impl.ConnectionImpl>
-        </incomingConnections>
-        <outgoingConnections id="9">
-          <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
-            <type>1</type>
-            <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="3"/>
-            <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="11">
-              <id>3</id>
-              <name>End</name>
-              <incomingConnections id="12">
-                <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
-              </incomingConnections>
-              <outgoingConnections id="13"/>
             </to>
           </org.drools.ruleflow.core.impl.ConnectionImpl>
         </outgoingConnections>
-      </org.drools.ruleflow.core.impl.RuleSetNodeImpl>
+      </org.drools.ruleflow.core.impl.StartNodeImpl>
     </entry>
     <entry>
-      <long>1</long>
-      <org.drools.ruleflow.core.impl.StartNodeImpl reference="6"/>
+      <long>2</long>
+      <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="7"/>
     </entry>
     <entry>
       <long>3</long>
@@ -50,4 +50,5 @@
   <id>register neighbor</id>
   <name>register neighbor</name>
   <type>RuleFlow</type>
+  <packageName>org.drools.examples</packageName>
 </org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file




More information about the jboss-svn-commits mailing list