From 1ed3b0b6f668fdfaa0a04c3da2f0e6594d995e46 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 24 Jul 2014 17:25:29 +0200
Subject: New desc workflow activity to move latest numbered viewpoint to last
 for updating description versions.

---
 .../resources/boot/CA/ManageCompositeActDef.xml    | 340 +++++++++++--------
 .../resources/boot/CA/ManageElementaryActDef.xml   | 338 ++++++++++--------
 src/main/resources/boot/CA/ManageSchema.xml        | 353 +++++++++++--------
 src/main/resources/boot/CA/ManageScript.xml        | 376 ++++++++++++---------
 src/main/resources/boot/CA/ManageStateMachine.xml  | 353 +++++++++++--------
 .../resources/boot/EA/MoveLatestVersionToLast.xml  |   1 +
 .../boot/SC/SetLastNumberedVersionToLast.xml       |  29 ++
 src/main/resources/module.xml                      |   4 +-
 8 files changed, 1080 insertions(+), 714 deletions(-)
 create mode 100644 src/main/resources/boot/EA/MoveLatestVersionToLast.xml
 create mode 100644 src/main/resources/boot/SC/SetLastNumberedVersionToLast.xml

diff --git a/src/main/resources/boot/CA/ManageCompositeActDef.xml b/src/main/resources/boot/CA/ManageCompositeActDef.xml
index ea0655a..e5d6d20 100644
--- a/src/main/resources/boot/CA/ManageCompositeActDef.xml
+++ b/src/main/resources/boot/CA/ManageCompositeActDef.xml
@@ -1,208 +1,278 @@
-<CompositeActivityDef ID="-1" Name="ManageCompositeActDef" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+<CompositeActivityDef ID="-1" Name="ManageCompositeActDef"
+	Height="0" Width="0" IsLayoutable="false" IsComposite="true">
 	<childrenGraphModel>
-		<GraphModelCastorData StartVertexId="13" NextId="26">
-			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
-				<CentrePoint x="358" y="360"/>
-				<OutlinePoint x="328" y="348"/>
-				<OutlinePoint x="388" y="348"/>
-				<OutlinePoint x="388" y="372"/>
-				<OutlinePoint x="328" y="372"/>
+		<GraphModelCastorData StartVertexId="13" NextId="34">
+			<LoopDef ID="30" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="463" y="360" />
+				<OutlinePoint x="433" y="348" />
+				<OutlinePoint x="493" y="348" />
+				<OutlinePoint x="493" y="372" />
+				<OutlinePoint x="433" y="372" />
+				<InEdgeId>31</InEdgeId>
+				<OutEdgeId>32</OutEdgeId>
+				<OutEdgeId>33</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
+				</Properties>
+			</LoopDef>
+			<JoinDef ID="27" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="463" y="132" />
+				<OutlinePoint x="433" y="120" />
+				<OutlinePoint x="493" y="120" />
+				<OutlinePoint x="493" y="144" />
+				<OutlinePoint x="433" y="144" />
+				<InEdgeId>28</InEdgeId>
+				<InEdgeId>33</InEdgeId>
+				<OutEdgeId>29</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<ActivitySlotDef ID="26" Name="MoveLatestVersionToLast slot"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="594" y="253" />
+				<OutlinePoint x="529" y="223" />
+				<OutlinePoint x="659" y="223" />
+				<OutlinePoint x="659" y="283" />
+				<OutlinePoint x="529" y="283" />
+				<InEdgeId>29</InEdgeId>
+				<OutEdgeId>31</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="MoveLatestActivityVersionToLast" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="ViewName" String="CompositeActivityDef" />
+				</Properties>
+				<activityDef>MoveLatestVersionToLast</activityDef>
+			</ActivitySlotDef>
+			<ActivitySlotDef ID="22" Name="EditDefinition"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="76" y="251" />
+				<OutlinePoint x="11" y="221" />
+				<OutlinePoint x="141" y="221" />
+				<OutlinePoint x="141" y="281" />
+				<OutlinePoint x="11" y="281" />
+				<InEdgeId>24</InEdgeId>
+				<OutEdgeId>25</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="EditDefinition" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="SchemaType" String="CompositeActivityDef" />
+				</Properties>
+				<activityDef>EditDefinition</activityDef>
+			</ActivitySlotDef>
+			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="358" y="360" />
+				<OutlinePoint x="328" y="348" />
+				<OutlinePoint x="388" y="348" />
+				<OutlinePoint x="388" y="372" />
+				<OutlinePoint x="328" y="372" />
 				<InEdgeId>19</InEdgeId>
 				<OutEdgeId>20</OutEdgeId>
 				<OutEdgeId>21</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>					
-					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
 				</Properties>
 			</LoopDef>
-			<JoinDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="357" y="132"/>
-				<OutlinePoint x="327" y="120"/>
-				<OutlinePoint x="387" y="120"/>
-				<OutlinePoint x="387" y="144"/>
-				<OutlinePoint x="327" y="144"/>
+			<JoinDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="357" y="132" />
+				<OutlinePoint x="327" y="120" />
+				<OutlinePoint x="387" y="120" />
+				<OutlinePoint x="387" y="144" />
+				<OutlinePoint x="327" y="144" />
 				<InEdgeId>17</InEdgeId>
 				<InEdgeId>20</InEdgeId>
 				<OutEdgeId>18</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<AndSplitDef ID="13" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="274" y="39"/>
-				<OutlinePoint x="244" y="27"/>
-				<OutlinePoint x="304" y="27"/>
-				<OutlinePoint x="304" y="51"/>
-				<OutlinePoint x="244" y="51"/>
+			<AndSplitDef ID="13" Name="" Height="24" Width="60"
+				IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="357" y="41" />
+				<OutlinePoint x="327" y="29" />
+				<OutlinePoint x="387" y="29" />
+				<OutlinePoint x="387" y="53" />
+				<OutlinePoint x="327" y="53" />
 				<OutEdgeId>16</OutEdgeId>
 				<OutEdgeId>17</OutEdgeId>
-				<Properties/>
+				<OutEdgeId>28</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="RoutingScriptName" String="" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
+				</Properties>
 			</AndSplitDef>
-			<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="265" y="473"/>
-				<OutlinePoint x="235" y="461"/>
-				<OutlinePoint x="295" y="461"/>
-				<OutlinePoint x="295" y="485"/>
-				<OutlinePoint x="235" y="485"/>
+			<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="265" y="473" />
+				<OutlinePoint x="235" y="461" />
+				<OutlinePoint x="295" y="461" />
+				<OutlinePoint x="295" y="485" />
+				<OutlinePoint x="235" y="485" />
 				<InEdgeId>8</InEdgeId>
 				<InEdgeId>21</InEdgeId>
+				<InEdgeId>32</InEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
-				<CentrePoint x="177" y="359"/>
-				<OutlinePoint x="147" y="347"/>
-				<OutlinePoint x="207" y="347"/>
-				<OutlinePoint x="207" y="371"/>
-				<OutlinePoint x="147" y="371"/>
+			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="177" y="359" />
+				<OutlinePoint x="147" y="347" />
+				<OutlinePoint x="207" y="347" />
+				<OutlinePoint x="207" y="371" />
+				<OutlinePoint x="147" y="371" />
 				<InEdgeId>25</InEdgeId>
 				<OutEdgeId>7</OutEdgeId>
 				<OutEdgeId>8</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
 				</Properties>
 			</LoopDef>
-			<ActivitySlotDef ID="11" Name="AssignNewVersionFromLast_" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="270" y="251"/>
-				<OutlinePoint x="205" y="221"/>
-				<OutlinePoint x="335" y="221"/>
-				<OutlinePoint x="335" y="281"/>
-				<OutlinePoint x="205" y="281"/>
-				<InEdgeId>18</InEdgeId>
-				<OutEdgeId>19</OutEdgeId>
-				<Properties>
-					<KeyValuePair Key="ViewName" String="CompositeActivityDef"/>
-					<KeyValuePair Key="Name" String="AssignNewActivityVersionFromLast"/>
-				</Properties>
-				<activityDef>AssignNewVersionFromLast</activityDef>
-			</ActivitySlotDef>
-			<JoinDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="175" y="131"/>
-				<OutlinePoint x="145" y="119"/>
-				<OutlinePoint x="205" y="119"/>
-				<OutlinePoint x="205" y="143"/>
-				<OutlinePoint x="145" y="143"/>
+			<JoinDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="175" y="131" />
+				<OutlinePoint x="145" y="119" />
+				<OutlinePoint x="205" y="119" />
+				<OutlinePoint x="205" y="143" />
+				<OutlinePoint x="145" y="143" />
 				<InEdgeId>7</InEdgeId>
 				<InEdgeId>16</InEdgeId>
 				<OutEdgeId>24</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<ActivitySlotDef ID="22" Name="EditDefinition" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="76" y="251"/>
-				<OutlinePoint x="11" y="221"/>
-				<OutlinePoint x="141" y="221"/>
-				<OutlinePoint x="141" y="281"/>
-				<OutlinePoint x="11" y="281"/>
-				<InEdgeId>24</InEdgeId>
-				<OutEdgeId>25</OutEdgeId>
+			<ActivitySlotDef ID="11" Name="AssignNewVersionFromLast_"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="270" y="251" />
+				<OutlinePoint x="205" y="221" />
+				<OutlinePoint x="335" y="221" />
+				<OutlinePoint x="335" y="281" />
+				<OutlinePoint x="205" y="281" />
+				<InEdgeId>18</InEdgeId>
+				<OutEdgeId>19</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Name" String="EditDefinition"/>
-					<KeyValuePair Key="SchemaType" String="CompositeActivityDef"/>
+					<KeyValuePair Key="Name" String="AssignNewActivityVersionFromLast" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="ViewName" String="CompositeActivityDef" />
 				</Properties>
-				<activityDef>EditDefinition</activityDef>
+				<activityDef>AssignNewVersionFromLast</activityDef>
 			</ActivitySlotDef>
-			<NextDef ID="25" OriginVertexId="22" TerminusVertexId="3">
-				<OriginPoint x="76" y="251"/>
-				<TerminusPoint x="177" y="359"/>
+			<NextDef ID="33" OriginVertexId="30" TerminusVertexId="27">
+				<OriginPoint x="463" y="360" />
+				<TerminusPoint x="463" y="132" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="24" OriginVertexId="2" TerminusVertexId="22">
-				<OriginPoint x="175" y="131"/>
-				<TerminusPoint x="76" y="251"/>
+			<NextDef ID="32" OriginVertexId="30" TerminusVertexId="4">
+				<OriginPoint x="463" y="360" />
+				<TerminusPoint x="265" y="473" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="19" OriginVertexId="11" TerminusVertexId="15">
-				<OriginPoint x="270" y="251"/>
-				<TerminusPoint x="358" y="360"/>
+			<NextDef ID="29" OriginVertexId="27" TerminusVertexId="26">
+				<OriginPoint x="463" y="132" />
+				<TerminusPoint x="594" y="253" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="31" OriginVertexId="26" TerminusVertexId="30">
+				<OriginPoint x="594" y="253" />
+				<TerminusPoint x="463" y="360" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="28" OriginVertexId="13" TerminusVertexId="27">
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="463" y="132" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="25" OriginVertexId="22" TerminusVertexId="3">
+				<OriginPoint x="76" y="251" />
+				<TerminusPoint x="177" y="359" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="24" OriginVertexId="2" TerminusVertexId="22">
+				<OriginPoint x="175" y="131" />
+				<TerminusPoint x="76" y="251" />
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="21" OriginVertexId="15" TerminusVertexId="4">
-				<OriginPoint x="358" y="360"/>
-				<TerminusPoint x="265" y="473"/>
+				<OriginPoint x="358" y="360" />
+				<TerminusPoint x="265" y="473" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="false"/>
+					<KeyValuePair Key="Alias" String="false" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="18" OriginVertexId="14" TerminusVertexId="11">
-				<OriginPoint x="357" y="132"/>
-				<TerminusPoint x="270" y="251"/>
+			<NextDef ID="19" OriginVertexId="11" TerminusVertexId="15">
+				<OriginPoint x="270" y="251" />
+				<TerminusPoint x="358" y="360" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="20" OriginVertexId="15" TerminusVertexId="14">
-				<OriginPoint x="358" y="360"/>
-				<TerminusPoint x="357" y="132"/>
+				<OriginPoint x="358" y="360" />
+				<TerminusPoint x="357" y="132" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="true"/>
+					<KeyValuePair Key="Alias" String="true" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="8" OriginVertexId="3" TerminusVertexId="4">
-				<OriginPoint x="177" y="359"/>
-				<TerminusPoint x="265" y="473"/>
+			<NextDef ID="18" OriginVertexId="14" TerminusVertexId="11">
+				<OriginPoint x="357" y="132" />
+				<TerminusPoint x="270" y="251" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="false"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="17" OriginVertexId="13" TerminusVertexId="14">
-				<OriginPoint x="274" y="39"/>
-				<TerminusPoint x="357" y="132"/>
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="357" y="132" />
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="8" OriginVertexId="3" TerminusVertexId="4">
+				<OriginPoint x="177" y="359" />
+				<TerminusPoint x="265" y="473" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="16" OriginVertexId="13" TerminusVertexId="2">
-				<OriginPoint x="274" y="39"/>
-				<TerminusPoint x="175" y="131"/>
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="175" y="131" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="2">
-				<OriginPoint x="177" y="359"/>
-				<TerminusPoint x="175" y="131"/>
+				<OriginPoint x="177" y="359" />
+				<TerminusPoint x="175" y="131" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="true"/>
+					<KeyValuePair Key="Alias" String="true" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 		</GraphModelCastorData>
 	</childrenGraphModel>
-	<Properties>
-		<KeyValuePair Key="Expected Time" Integer="0"/>
-		<KeyValuePair Key="Repeatable" Boolean="false"/>
-		<KeyValuePair Key="Has Timeout" Boolean="false"/>
-		<KeyValuePair Key="Time Out Action" Integer="2"/>
-		<KeyValuePair Key="Agent Name" String=""/>
-		<KeyValuePair Key="Autostart" Boolean="true"/>
-		<KeyValuePair Key="Expected Time Unit" Integer="3"/>
-		<KeyValuePair Key="Maximum Time" Integer="0"/>
-		<KeyValuePair Key="Mail Message" String=""/>
-		<KeyValuePair Key="Mail event" String=""/>
-		<KeyValuePair Key="Maximum Time Unit" Integer="3"/>
-		<KeyValuePair Key="Description" String=""/>
-		<KeyValuePair Key="SchemaVersion" String=""/>
-		<KeyValuePair Key="Show time" Boolean="true"/>
-		<KeyValuePair Key="Viewpoint" String=""/>
-		<KeyValuePair Key="Agent Role" String=""/>
-		<KeyValuePair Key="Timeout Activated" Boolean="false"/>
-		<KeyValuePair Key="SchemaType" String=""/>
-		<KeyValuePair Key="ScriptName" String=""/>
-		<KeyValuePair Key="Ignorable" Boolean="false"/>
-		<KeyValuePair Key="ScriptVersion" String=""/>
-		<KeyValuePair Key="Skippable" Boolean="false"/>
-	</Properties>
-</CompositeActivityDef>
+	<Properties/>
+</CompositeActivityDef>
\ No newline at end of file
diff --git a/src/main/resources/boot/CA/ManageElementaryActDef.xml b/src/main/resources/boot/CA/ManageElementaryActDef.xml
index a1ba712..f74501c 100644
--- a/src/main/resources/boot/CA/ManageElementaryActDef.xml
+++ b/src/main/resources/boot/CA/ManageElementaryActDef.xml
@@ -1,208 +1,278 @@
-<CompositeActivityDef ID="-1" Name="ManageElementaryActDef" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+<CompositeActivityDef ID="-1" Name="ManageElementaryActDef"
+	Height="0" Width="0" IsLayoutable="false" IsComposite="true">
 	<childrenGraphModel>
-		<GraphModelCastorData StartVertexId="13" NextId="26">
-			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
-				<CentrePoint x="358" y="360"/>
-				<OutlinePoint x="328" y="348"/>
-				<OutlinePoint x="388" y="348"/>
-				<OutlinePoint x="388" y="372"/>
-				<OutlinePoint x="328" y="372"/>
+		<GraphModelCastorData StartVertexId="13" NextId="34">
+			<LoopDef ID="30" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="463" y="360" />
+				<OutlinePoint x="433" y="348" />
+				<OutlinePoint x="493" y="348" />
+				<OutlinePoint x="493" y="372" />
+				<OutlinePoint x="433" y="372" />
+				<InEdgeId>31</InEdgeId>
+				<OutEdgeId>32</OutEdgeId>
+				<OutEdgeId>33</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
+				</Properties>
+			</LoopDef>
+			<JoinDef ID="27" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="463" y="132" />
+				<OutlinePoint x="433" y="120" />
+				<OutlinePoint x="493" y="120" />
+				<OutlinePoint x="493" y="144" />
+				<OutlinePoint x="433" y="144" />
+				<InEdgeId>28</InEdgeId>
+				<InEdgeId>33</InEdgeId>
+				<OutEdgeId>29</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<ActivitySlotDef ID="26" Name="MoveLatestVersionToLast slot"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="594" y="253" />
+				<OutlinePoint x="529" y="223" />
+				<OutlinePoint x="659" y="223" />
+				<OutlinePoint x="659" y="283" />
+				<OutlinePoint x="529" y="283" />
+				<InEdgeId>29</InEdgeId>
+				<OutEdgeId>31</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="MoveLatestActivityVersionToLast" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="ViewName" String="ElementaryActivityDef" />
+				</Properties>
+				<activityDef>MoveLatestVersionToLast</activityDef>
+			</ActivitySlotDef>
+			<ActivitySlotDef ID="22" Name="EditDefinition"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="76" y="251" />
+				<OutlinePoint x="11" y="221" />
+				<OutlinePoint x="141" y="221" />
+				<OutlinePoint x="141" y="281" />
+				<OutlinePoint x="11" y="281" />
+				<InEdgeId>24</InEdgeId>
+				<OutEdgeId>25</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="EditDefinition" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="SchemaType" String="ElementaryActivityDef" />
+				</Properties>
+				<activityDef>EditDefinition</activityDef>
+			</ActivitySlotDef>
+			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="358" y="360" />
+				<OutlinePoint x="328" y="348" />
+				<OutlinePoint x="388" y="348" />
+				<OutlinePoint x="388" y="372" />
+				<OutlinePoint x="328" y="372" />
 				<InEdgeId>19</InEdgeId>
 				<OutEdgeId>20</OutEdgeId>
 				<OutEdgeId>21</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
 				</Properties>
 			</LoopDef>
-			<JoinDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="357" y="132"/>
-				<OutlinePoint x="327" y="120"/>
-				<OutlinePoint x="387" y="120"/>
-				<OutlinePoint x="387" y="144"/>
-				<OutlinePoint x="327" y="144"/>
+			<JoinDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="357" y="132" />
+				<OutlinePoint x="327" y="120" />
+				<OutlinePoint x="387" y="120" />
+				<OutlinePoint x="387" y="144" />
+				<OutlinePoint x="327" y="144" />
 				<InEdgeId>17</InEdgeId>
 				<InEdgeId>20</InEdgeId>
 				<OutEdgeId>18</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="265" y="473"/>
-				<OutlinePoint x="235" y="461"/>
-				<OutlinePoint x="295" y="461"/>
-				<OutlinePoint x="295" y="485"/>
-				<OutlinePoint x="235" y="485"/>
+			<AndSplitDef ID="13" Name="" Height="24" Width="60"
+				IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="357" y="41" />
+				<OutlinePoint x="327" y="29" />
+				<OutlinePoint x="387" y="29" />
+				<OutlinePoint x="387" y="53" />
+				<OutlinePoint x="327" y="53" />
+				<OutEdgeId>16</OutEdgeId>
+				<OutEdgeId>17</OutEdgeId>
+				<OutEdgeId>28</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="RoutingScriptName" String="" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
+				</Properties>
+			</AndSplitDef>
+			<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="265" y="473" />
+				<OutlinePoint x="235" y="461" />
+				<OutlinePoint x="295" y="461" />
+				<OutlinePoint x="295" y="485" />
+				<OutlinePoint x="235" y="485" />
 				<InEdgeId>8</InEdgeId>
 				<InEdgeId>21</InEdgeId>
+				<InEdgeId>32</InEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<AndSplitDef ID="13" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="274" y="39"/>
-				<OutlinePoint x="244" y="27"/>
-				<OutlinePoint x="304" y="27"/>
-				<OutlinePoint x="304" y="51"/>
-				<OutlinePoint x="244" y="51"/>
-				<OutEdgeId>16</OutEdgeId>
-				<OutEdgeId>17</OutEdgeId>
-				<Properties/>
-			</AndSplitDef>
-			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
-				<CentrePoint x="177" y="359"/>
-				<OutlinePoint x="147" y="347"/>
-				<OutlinePoint x="207" y="347"/>
-				<OutlinePoint x="207" y="371"/>
-				<OutlinePoint x="147" y="371"/>
+			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="177" y="359" />
+				<OutlinePoint x="147" y="347" />
+				<OutlinePoint x="207" y="347" />
+				<OutlinePoint x="207" y="371" />
+				<OutlinePoint x="147" y="371" />
 				<InEdgeId>25</InEdgeId>
 				<OutEdgeId>7</OutEdgeId>
 				<OutEdgeId>8</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
 				</Properties>
 			</LoopDef>
-			<JoinDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="175" y="131"/>
-				<OutlinePoint x="145" y="119"/>
-				<OutlinePoint x="205" y="119"/>
-				<OutlinePoint x="205" y="143"/>
-				<OutlinePoint x="145" y="143"/>
+			<JoinDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="175" y="131" />
+				<OutlinePoint x="145" y="119" />
+				<OutlinePoint x="205" y="119" />
+				<OutlinePoint x="205" y="143" />
+				<OutlinePoint x="145" y="143" />
 				<InEdgeId>7</InEdgeId>
 				<InEdgeId>16</InEdgeId>
 				<OutEdgeId>24</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<ActivitySlotDef ID="11" Name="AssignNewVersionFromLast_" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="270" y="251"/>
-				<OutlinePoint x="205" y="221"/>
-				<OutlinePoint x="335" y="221"/>
-				<OutlinePoint x="335" y="281"/>
-				<OutlinePoint x="205" y="281"/>
+			<ActivitySlotDef ID="11" Name="AssignNewVersionFromLast_"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="270" y="251" />
+				<OutlinePoint x="205" y="221" />
+				<OutlinePoint x="335" y="221" />
+				<OutlinePoint x="335" y="281" />
+				<OutlinePoint x="205" y="281" />
 				<InEdgeId>18</InEdgeId>
 				<OutEdgeId>19</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="ViewName" String="ElementaryActivityDef"/>
-					<KeyValuePair Key="Name" String="AssignNewActivityVersionFromLast"/>
+					<KeyValuePair Key="Name" String="AssignNewActivityVersionFromLast" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="ViewName" String="ElementaryActivityDef" />
 				</Properties>
 				<activityDef>AssignNewVersionFromLast</activityDef>
 			</ActivitySlotDef>
-			<ActivitySlotDef ID="22" Name="EditDefinition" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="76" y="251"/>
-				<OutlinePoint x="11" y="221"/>
-				<OutlinePoint x="141" y="221"/>
-				<OutlinePoint x="141" y="281"/>
-				<OutlinePoint x="11" y="281"/>
-				<InEdgeId>24</InEdgeId>
-				<OutEdgeId>25</OutEdgeId>
+			<NextDef ID="33" OriginVertexId="30" TerminusVertexId="27">
+				<OriginPoint x="463" y="360" />
+				<TerminusPoint x="463" y="132" />
 				<Properties>
-					<KeyValuePair Key="Name" String="EditDefinition"/>
-					<KeyValuePair Key="SchemaType" String="ElementaryActivityDef"/>
+					<KeyValuePair Key="Alias" String="true" />
 				</Properties>
-				<activityDef>EditDefinition</activityDef>
-			</ActivitySlotDef>
-			<NextDef ID="25" OriginVertexId="22" TerminusVertexId="3">
-				<OriginPoint x="76" y="251"/>
-				<TerminusPoint x="177" y="359"/>
+			</NextDef>
+			<NextDef ID="32" OriginVertexId="30" TerminusVertexId="4">
+				<OriginPoint x="463" y="360" />
+				<TerminusPoint x="265" y="473" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="24" OriginVertexId="2" TerminusVertexId="22">
-				<OriginPoint x="175" y="131"/>
-				<TerminusPoint x="76" y="251"/>
+			<NextDef ID="29" OriginVertexId="27" TerminusVertexId="26">
+				<OriginPoint x="463" y="132" />
+				<TerminusPoint x="594" y="253" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="31" OriginVertexId="26" TerminusVertexId="30">
+				<OriginPoint x="594" y="253" />
+				<TerminusPoint x="463" y="360" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="28" OriginVertexId="13" TerminusVertexId="27">
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="463" y="132" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="25" OriginVertexId="22" TerminusVertexId="3">
+				<OriginPoint x="76" y="251" />
+				<TerminusPoint x="177" y="359" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="19" OriginVertexId="11" TerminusVertexId="15">
-				<OriginPoint x="270" y="251"/>
-				<TerminusPoint x="358" y="360"/>
+			<NextDef ID="24" OriginVertexId="2" TerminusVertexId="22">
+				<OriginPoint x="175" y="131" />
+				<TerminusPoint x="76" y="251" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="21" OriginVertexId="15" TerminusVertexId="4">
-				<OriginPoint x="358" y="360"/>
-				<TerminusPoint x="265" y="473"/>
+				<OriginPoint x="358" y="360" />
+				<TerminusPoint x="265" y="473" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="false"/>
+					<KeyValuePair Key="Alias" String="false" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="18" OriginVertexId="14" TerminusVertexId="11">
-				<OriginPoint x="357" y="132"/>
-				<TerminusPoint x="270" y="251"/>
+			<NextDef ID="19" OriginVertexId="11" TerminusVertexId="15">
+				<OriginPoint x="270" y="251" />
+				<TerminusPoint x="358" y="360" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="20" OriginVertexId="15" TerminusVertexId="14">
-				<OriginPoint x="358" y="360"/>
-				<TerminusPoint x="357" y="132"/>
+				<OriginPoint x="358" y="360" />
+				<TerminusPoint x="357" y="132" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="true"/>
+					<KeyValuePair Key="Alias" String="true" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="8" OriginVertexId="3" TerminusVertexId="4">
-				<OriginPoint x="177" y="359"/>
-				<TerminusPoint x="265" y="473"/>
+			<NextDef ID="18" OriginVertexId="14" TerminusVertexId="11">
+				<OriginPoint x="357" y="132" />
+				<TerminusPoint x="270" y="251" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="false"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="17" OriginVertexId="13" TerminusVertexId="14">
-				<OriginPoint x="274" y="39"/>
-				<TerminusPoint x="357" y="132"/>
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="357" y="132" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="2">
-				<OriginPoint x="177" y="359"/>
-				<TerminusPoint x="175" y="131"/>
+			<NextDef ID="8" OriginVertexId="3" TerminusVertexId="4">
+				<OriginPoint x="177" y="359" />
+				<TerminusPoint x="265" y="473" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="true"/>
+					<KeyValuePair Key="Alias" String="false" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="16" OriginVertexId="13" TerminusVertexId="2">
-				<OriginPoint x="274" y="39"/>
-				<TerminusPoint x="175" y="131"/>
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="175" y="131" />
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="2">
+				<OriginPoint x="177" y="359" />
+				<TerminusPoint x="175" y="131" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 		</GraphModelCastorData>
 	</childrenGraphModel>
-	<Properties>
-		<KeyValuePair Key="Expected Time" Integer="0"/>
-		<KeyValuePair Key="Repeatable" Boolean="false"/>
-		<KeyValuePair Key="Has Timeout" Boolean="false"/>
-		<KeyValuePair Key="Time Out Action" Integer="2"/>
-		<KeyValuePair Key="Agent Name" String=""/>
-		<KeyValuePair Key="Autostart" Boolean="true"/>
-		<KeyValuePair Key="Expected Time Unit" Integer="3"/>
-		<KeyValuePair Key="Maximum Time" Integer="0"/>
-		<KeyValuePair Key="Mail Message" String=""/>
-		<KeyValuePair Key="Mail event" String=""/>
-		<KeyValuePair Key="Maximum Time Unit" Integer="3"/>
-		<KeyValuePair Key="Description" String=""/>
-		<KeyValuePair Key="SchemaVersion" String=""/>
-		<KeyValuePair Key="Show time" Boolean="true"/>
-		<KeyValuePair Key="Viewpoint" String=""/>
-		<KeyValuePair Key="Agent Role" String=""/>
-		<KeyValuePair Key="Timeout Activated" Boolean="false"/>
-		<KeyValuePair Key="SchemaType" String=""/>
-		<KeyValuePair Key="ScriptName" String=""/>
-		<KeyValuePair Key="Ignorable" Boolean="false"/>
-		<KeyValuePair Key="ScriptVersion" String=""/>
-		<KeyValuePair Key="Skippable" Boolean="false"/>
-	</Properties>
-</CompositeActivityDef>
+	<Properties/>
+</CompositeActivityDef>
\ No newline at end of file
diff --git a/src/main/resources/boot/CA/ManageSchema.xml b/src/main/resources/boot/CA/ManageSchema.xml
index cee6b33..e3f3446 100644
--- a/src/main/resources/boot/CA/ManageSchema.xml
+++ b/src/main/resources/boot/CA/ManageSchema.xml
@@ -1,213 +1,278 @@
-<CompositeActivityDef ID="-1" Name="ManageSchema" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+<CompositeActivityDef ID="-1" Name="ManageSchema"
+	Height="0" Width="0" IsLayoutable="false" IsComposite="true">
 	<childrenGraphModel>
-		<GraphModelCastorData StartVertexId="13" NextId="22">
-			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
-				<CentrePoint x="358" y="360"/>
-				<OutlinePoint x="328" y="348"/>
-				<OutlinePoint x="388" y="348"/>
-				<OutlinePoint x="388" y="372"/>
-				<OutlinePoint x="328" y="372"/>
+		<GraphModelCastorData StartVertexId="13" NextId="34">
+			<LoopDef ID="30" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="463" y="360" />
+				<OutlinePoint x="433" y="348" />
+				<OutlinePoint x="493" y="348" />
+				<OutlinePoint x="493" y="372" />
+				<OutlinePoint x="433" y="372" />
+				<InEdgeId>31</InEdgeId>
+				<OutEdgeId>32</OutEdgeId>
+				<OutEdgeId>33</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
+				</Properties>
+			</LoopDef>
+			<JoinDef ID="27" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="463" y="132" />
+				<OutlinePoint x="433" y="120" />
+				<OutlinePoint x="493" y="120" />
+				<OutlinePoint x="493" y="144" />
+				<OutlinePoint x="433" y="144" />
+				<InEdgeId>28</InEdgeId>
+				<InEdgeId>33</InEdgeId>
+				<OutEdgeId>29</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<ActivitySlotDef ID="26" Name="MoveLatestVersionToLast slot"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="594" y="253" />
+				<OutlinePoint x="529" y="223" />
+				<OutlinePoint x="659" y="223" />
+				<OutlinePoint x="659" y="283" />
+				<OutlinePoint x="529" y="283" />
+				<InEdgeId>29</InEdgeId>
+				<OutEdgeId>31</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="MoveLatestSchemaVersionToLast" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="ViewName" String="Schema" />
+				</Properties>
+				<activityDef>MoveLatestVersionToLast</activityDef>
+			</ActivitySlotDef>
+			<ActivitySlotDef ID="22" Name="EditDefinition"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="76" y="251" />
+				<OutlinePoint x="11" y="221" />
+				<OutlinePoint x="141" y="221" />
+				<OutlinePoint x="141" y="281" />
+				<OutlinePoint x="11" y="281" />
+				<InEdgeId>24</InEdgeId>
+				<OutEdgeId>25</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="EditDefinition" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="SchemaType" String="Schema" />
+				</Properties>
+				<activityDef>EditDefinition</activityDef>
+			</ActivitySlotDef>
+			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="358" y="360" />
+				<OutlinePoint x="328" y="348" />
+				<OutlinePoint x="388" y="348" />
+				<OutlinePoint x="388" y="372" />
+				<OutlinePoint x="328" y="372" />
 				<InEdgeId>19</InEdgeId>
 				<OutEdgeId>20</OutEdgeId>
 				<OutEdgeId>21</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
-					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
 				</Properties>
 			</LoopDef>
-			<JoinDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="357" y="132"/>
-				<OutlinePoint x="327" y="120"/>
-				<OutlinePoint x="387" y="120"/>
-				<OutlinePoint x="387" y="144"/>
-				<OutlinePoint x="327" y="144"/>
+			<JoinDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="357" y="132" />
+				<OutlinePoint x="327" y="120" />
+				<OutlinePoint x="387" y="120" />
+				<OutlinePoint x="387" y="144" />
+				<OutlinePoint x="327" y="144" />
 				<InEdgeId>17</InEdgeId>
 				<InEdgeId>20</InEdgeId>
 				<OutEdgeId>18</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<AndSplitDef ID="13" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="274" y="39"/>
-				<OutlinePoint x="244" y="27"/>
-				<OutlinePoint x="304" y="27"/>
-				<OutlinePoint x="304" y="51"/>
-				<OutlinePoint x="244" y="51"/>
+			<AndSplitDef ID="13" Name="" Height="24" Width="60"
+				IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="357" y="41" />
+				<OutlinePoint x="327" y="29" />
+				<OutlinePoint x="387" y="29" />
+				<OutlinePoint x="387" y="53" />
+				<OutlinePoint x="327" y="53" />
 				<OutEdgeId>16</OutEdgeId>
 				<OutEdgeId>17</OutEdgeId>
+				<OutEdgeId>28</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
-					<KeyValuePair Key="RoutingScriptName" String=""/>
+					<KeyValuePair Key="RoutingScriptName" String="" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
 				</Properties>
 			</AndSplitDef>
-			<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="265" y="473"/>
-				<OutlinePoint x="235" y="461"/>
-				<OutlinePoint x="295" y="461"/>
-				<OutlinePoint x="295" y="485"/>
-				<OutlinePoint x="235" y="485"/>
+			<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="265" y="473" />
+				<OutlinePoint x="235" y="461" />
+				<OutlinePoint x="295" y="461" />
+				<OutlinePoint x="295" y="485" />
+				<OutlinePoint x="235" y="485" />
 				<InEdgeId>8</InEdgeId>
 				<InEdgeId>21</InEdgeId>
+				<InEdgeId>32</InEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
-				<CentrePoint x="177" y="359"/>
-				<OutlinePoint x="147" y="347"/>
-				<OutlinePoint x="207" y="347"/>
-				<OutlinePoint x="207" y="371"/>
-				<OutlinePoint x="147" y="371"/>
-				<InEdgeId>6</InEdgeId>
+			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="177" y="359" />
+				<OutlinePoint x="147" y="347" />
+				<OutlinePoint x="207" y="347" />
+				<OutlinePoint x="207" y="371" />
+				<OutlinePoint x="147" y="371" />
+				<InEdgeId>25</InEdgeId>
 				<OutEdgeId>7</OutEdgeId>
 				<OutEdgeId>8</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
-					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
 				</Properties>
 			</LoopDef>
-			<ActivitySlotDef ID="11" Name="AssignNewVersionFromLast_" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="270" y="251"/>
-				<OutlinePoint x="205" y="221"/>
-				<OutlinePoint x="335" y="221"/>
-				<OutlinePoint x="335" y="281"/>
-				<OutlinePoint x="205" y="281"/>
+			<JoinDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="175" y="131" />
+				<OutlinePoint x="145" y="119" />
+				<OutlinePoint x="205" y="119" />
+				<OutlinePoint x="205" y="143" />
+				<OutlinePoint x="145" y="143" />
+				<InEdgeId>7</InEdgeId>
+				<InEdgeId>16</InEdgeId>
+				<OutEdgeId>24</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<ActivitySlotDef ID="11" Name="AssignNewVersionFromLast_"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="270" y="251" />
+				<OutlinePoint x="205" y="221" />
+				<OutlinePoint x="335" y="221" />
+				<OutlinePoint x="335" y="281" />
+				<OutlinePoint x="205" y="281" />
 				<InEdgeId>18</InEdgeId>
 				<OutEdgeId>19</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="ViewName" String="Schema"/>
-					<KeyValuePair Key="Name" String="AssignNewSchemaVersionFromLast"/>
+					<KeyValuePair Key="Name" String="AssignNewSchemaVersionFromLast" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="ViewName" String="Schema" />
 				</Properties>
 				<activityDef>AssignNewVersionFromLast</activityDef>
 			</ActivitySlotDef>
-			<JoinDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="175" y="131"/>
-				<OutlinePoint x="145" y="119"/>
-				<OutlinePoint x="205" y="119"/>
-				<OutlinePoint x="205" y="143"/>
-				<OutlinePoint x="145" y="143"/>
-				<InEdgeId>7</InEdgeId>
-				<InEdgeId>16</InEdgeId>
-				<OutEdgeId>5</OutEdgeId>
+			<NextDef ID="33" OriginVertexId="30" TerminusVertexId="27">
+				<OriginPoint x="463" y="360" />
+				<TerminusPoint x="463" y="132" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Alias" String="true" />
 				</Properties>
-			</JoinDef>
-			<ActivitySlotDef ID="0" Name="EditDefinition" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="93" y="252"/>
-				<OutlinePoint x="28" y="222"/>
-				<OutlinePoint x="158" y="222"/>
-				<OutlinePoint x="158" y="282"/>
-				<OutlinePoint x="28" y="282"/>
-				<InEdgeId>5</InEdgeId>
-				<OutEdgeId>6</OutEdgeId>
-				<Properties>
-					<KeyValuePair Key="SchemaType" String="Schema"/>
-					<KeyValuePair Key="Name" String="EditDefinition"/>
+			</NextDef>
+			<NextDef ID="32" OriginVertexId="30" TerminusVertexId="4">
+				<OriginPoint x="463" y="360" />
+				<TerminusPoint x="265" y="473" />
+				<Properties>
+					<KeyValuePair Key="Alias" String="false" />
 				</Properties>
-				<activityDef>EditDefinition</activityDef>
-			</ActivitySlotDef>
-			<NextDef ID="21" OriginVertexId="15" TerminusVertexId="4">
-				<OriginPoint x="358" y="360"/>
-				<TerminusPoint x="265" y="473"/>
+			</NextDef>
+			<NextDef ID="29" OriginVertexId="27" TerminusVertexId="26">
+				<OriginPoint x="463" y="132" />
+				<TerminusPoint x="594" y="253" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="31" OriginVertexId="26" TerminusVertexId="30">
+				<OriginPoint x="594" y="253" />
+				<TerminusPoint x="463" y="360" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="28" OriginVertexId="13" TerminusVertexId="27">
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="463" y="132" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="25" OriginVertexId="22" TerminusVertexId="3">
+				<OriginPoint x="76" y="251" />
+				<TerminusPoint x="177" y="359" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="false"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="19" OriginVertexId="11" TerminusVertexId="15">
-				<OriginPoint x="270" y="251"/>
-				<TerminusPoint x="358" y="360"/>
+			<NextDef ID="24" OriginVertexId="2" TerminusVertexId="22">
+				<OriginPoint x="175" y="131" />
+				<TerminusPoint x="76" y="251" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="20" OriginVertexId="15" TerminusVertexId="14">
-				<OriginPoint x="358" y="360"/>
-				<TerminusPoint x="357" y="132"/>
+			<NextDef ID="21" OriginVertexId="15" TerminusVertexId="4">
+				<OriginPoint x="358" y="360" />
+				<TerminusPoint x="265" y="473" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="true"/>
+					<KeyValuePair Key="Alias" String="false" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="18" OriginVertexId="14" TerminusVertexId="11">
-				<OriginPoint x="357" y="132"/>
-				<TerminusPoint x="270" y="251"/>
+			<NextDef ID="19" OriginVertexId="11" TerminusVertexId="15">
+				<OriginPoint x="270" y="251" />
+				<TerminusPoint x="358" y="360" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="8" OriginVertexId="3" TerminusVertexId="4">
-				<OriginPoint x="177" y="359"/>
-				<TerminusPoint x="265" y="473"/>
+			<NextDef ID="20" OriginVertexId="15" TerminusVertexId="14">
+				<OriginPoint x="358" y="360" />
+				<TerminusPoint x="357" y="132" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="false"/>
+					<KeyValuePair Key="Alias" String="true" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="17" OriginVertexId="13" TerminusVertexId="14">
-				<OriginPoint x="274" y="39"/>
-				<TerminusPoint x="357" y="132"/>
+			<NextDef ID="18" OriginVertexId="14" TerminusVertexId="11">
+				<OriginPoint x="357" y="132" />
+				<TerminusPoint x="270" y="251" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="2">
-				<OriginPoint x="177" y="359"/>
-				<TerminusPoint x="175" y="131"/>
+			<NextDef ID="17" OriginVertexId="13" TerminusVertexId="14">
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="357" y="132" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="true"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="16" OriginVertexId="13" TerminusVertexId="2">
-				<OriginPoint x="274" y="39"/>
-				<TerminusPoint x="175" y="131"/>
+			<NextDef ID="8" OriginVertexId="3" TerminusVertexId="4">
+				<OriginPoint x="177" y="359" />
+				<TerminusPoint x="265" y="473" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="6" OriginVertexId="0" TerminusVertexId="3">
-				<OriginPoint x="93" y="252"/>
-				<TerminusPoint x="177" y="359"/>
+			<NextDef ID="16" OriginVertexId="13" TerminusVertexId="2">
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="175" y="131" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="5" OriginVertexId="2" TerminusVertexId="0">
-				<OriginPoint x="175" y="131"/>
-				<TerminusPoint x="93" y="252"/>
+			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="2">
+				<OriginPoint x="177" y="359" />
+				<TerminusPoint x="175" y="131" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 		</GraphModelCastorData>
 	</childrenGraphModel>
-	<Properties>
-		<KeyValuePair Key="Expected Time" Integer="0"/>
-		<KeyValuePair Key="Repeatable" Boolean="false"/>
-		<KeyValuePair Key="Has Timeout" Boolean="false"/>
-		<KeyValuePair Key="Time Out Action" Integer="2"/>
-		<KeyValuePair Key="Agent Name" String=""/>
-		<KeyValuePair Key="Autostart" Boolean="true"/>
-		<KeyValuePair Key="Expected Time Unit" Integer="3"/>
-		<KeyValuePair Key="Maximum Time" Integer="0"/>
-		<KeyValuePair Key="Mail Message" String=""/>
-		<KeyValuePair Key="Mail event" String=""/>
-		<KeyValuePair Key="Maximum Time Unit" Integer="3"/>
-		<KeyValuePair Key="Description" String=""/>
-		<KeyValuePair Key="SchemaVersion" String=""/>
-		<KeyValuePair Key="Show time" Boolean="true"/>
-		<KeyValuePair Key="Viewpoint" String=""/>
-		<KeyValuePair Key="Agent Role" String=""/>
-		<KeyValuePair Key="Timeout Activated" Boolean="false"/>
-		<KeyValuePair Key="SchemaType" String=""/>
-		<KeyValuePair Key="ScriptName" String=""/>
-		<KeyValuePair Key="Ignorable" Boolean="false"/>
-		<KeyValuePair Key="ScriptVersion" String=""/>
-		<KeyValuePair Key="Skippable" Boolean="false"/>
-	</Properties>
-</CompositeActivityDef>
+	<Properties/>
+</CompositeActivityDef>
\ No newline at end of file
diff --git a/src/main/resources/boot/CA/ManageScript.xml b/src/main/resources/boot/CA/ManageScript.xml
index f42d1b7..8e6464f 100644
--- a/src/main/resources/boot/CA/ManageScript.xml
+++ b/src/main/resources/boot/CA/ManageScript.xml
@@ -1,214 +1,278 @@
-<CompositeActivityDef ID="-1" Name="ManageScript" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+<CompositeActivityDef ID="-1" Name="ManageScript"
+	Height="0" Width="0" IsLayoutable="false" IsComposite="true">
 	<childrenGraphModel>
-		<GraphModelCastorData StartVertexId="11" NextId="27">
-			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
-				<CentrePoint x="425" y="291"/>
-				<OutlinePoint x="395" y="279"/>
-				<OutlinePoint x="455" y="279"/>
-				<OutlinePoint x="455" y="303"/>
-				<OutlinePoint x="395" y="303"/>
-				<InEdgeId>24</InEdgeId>
-				<OutEdgeId>25</OutEdgeId>
-				<OutEdgeId>26</OutEdgeId>
+		<GraphModelCastorData StartVertexId="13" NextId="34">
+			<LoopDef ID="30" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="463" y="360" />
+				<OutlinePoint x="433" y="348" />
+				<OutlinePoint x="493" y="348" />
+				<OutlinePoint x="493" y="372" />
+				<OutlinePoint x="433" y="372" />
+				<InEdgeId>31</InEdgeId>
+				<OutEdgeId>32</OutEdgeId>
+				<OutEdgeId>33</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
-					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
 				</Properties>
 			</LoopDef>
-			<LoopDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
-				<CentrePoint x="184" y="289"/>
-				<OutlinePoint x="154" y="277"/>
-				<OutlinePoint x="214" y="277"/>
-				<OutlinePoint x="214" y="301"/>
-				<OutlinePoint x="154" y="301"/>
-				<InEdgeId>21</InEdgeId>
-				<OutEdgeId>22</OutEdgeId>
-				<OutEdgeId>23</OutEdgeId>
+			<JoinDef ID="27" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="463" y="132" />
+				<OutlinePoint x="433" y="120" />
+				<OutlinePoint x="493" y="120" />
+				<OutlinePoint x="493" y="144" />
+				<OutlinePoint x="433" y="144" />
+				<InEdgeId>28</InEdgeId>
+				<InEdgeId>33</InEdgeId>
+				<OutEdgeId>29</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
-					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
-			</LoopDef>
-			<JoinDef ID="13" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="425" y="80"/>
-				<OutlinePoint x="395" y="68"/>
-				<OutlinePoint x="455" y="68"/>
-				<OutlinePoint x="455" y="92"/>
-				<OutlinePoint x="395" y="92"/>
-				<InEdgeId>18</InEdgeId>
-				<InEdgeId>25</InEdgeId>
+			</JoinDef>
+			<ActivitySlotDef ID="26" Name="MoveLatestVersionToLast slot"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="594" y="253" />
+				<OutlinePoint x="529" y="223" />
+				<OutlinePoint x="659" y="223" />
+				<OutlinePoint x="659" y="283" />
+				<OutlinePoint x="529" y="283" />
+				<InEdgeId>29</InEdgeId>
+				<OutEdgeId>31</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="MoveLatestScriptVersionToLast" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="ViewName" String="Script" />
+				</Properties>
+				<activityDef>MoveLatestVersionToLast</activityDef>
+			</ActivitySlotDef>
+			<ActivitySlotDef ID="22" Name="EditDefinition"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="76" y="251" />
+				<OutlinePoint x="11" y="221" />
+				<OutlinePoint x="141" y="221" />
+				<OutlinePoint x="141" y="281" />
+				<OutlinePoint x="11" y="281" />
+				<InEdgeId>24</InEdgeId>
+				<OutEdgeId>25</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="EditDefinition" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="SchemaType" String="Script" />
+				</Properties>
+				<activityDef>EditDefinition</activityDef>
+			</ActivitySlotDef>
+			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="358" y="360" />
+				<OutlinePoint x="328" y="348" />
+				<OutlinePoint x="388" y="348" />
+				<OutlinePoint x="388" y="372" />
+				<OutlinePoint x="328" y="372" />
+				<InEdgeId>19</InEdgeId>
 				<OutEdgeId>20</OutEdgeId>
+				<OutEdgeId>21</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
 				</Properties>
-			</JoinDef>
-			<JoinDef ID="12" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="184" y="80"/>
-				<OutlinePoint x="154" y="68"/>
-				<OutlinePoint x="214" y="68"/>
-				<OutlinePoint x="214" y="92"/>
-				<OutlinePoint x="154" y="92"/>
+			</LoopDef>
+			<JoinDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="357" y="132" />
+				<OutlinePoint x="327" y="120" />
+				<OutlinePoint x="387" y="120" />
+				<OutlinePoint x="387" y="144" />
+				<OutlinePoint x="327" y="144" />
 				<InEdgeId>17</InEdgeId>
-				<InEdgeId>23</InEdgeId>
-				<OutEdgeId>19</OutEdgeId>
+				<InEdgeId>20</InEdgeId>
+				<OutEdgeId>18</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<AndSplitDef ID="11" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="305" y="26"/>
-				<OutlinePoint x="275" y="14"/>
-				<OutlinePoint x="335" y="14"/>
-				<OutlinePoint x="335" y="38"/>
-				<OutlinePoint x="275" y="38"/>
+			<AndSplitDef ID="13" Name="" Height="24" Width="60"
+				IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="357" y="41" />
+				<OutlinePoint x="327" y="29" />
+				<OutlinePoint x="387" y="29" />
+				<OutlinePoint x="387" y="53" />
+				<OutlinePoint x="327" y="53" />
+				<OutEdgeId>16</OutEdgeId>
 				<OutEdgeId>17</OutEdgeId>
-				<OutEdgeId>18</OutEdgeId>
+				<OutEdgeId>28</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
-					<KeyValuePair Key="RoutingScriptName" String=""/>
+					<KeyValuePair Key="RoutingScriptName" String="" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
 				</Properties>
 			</AndSplitDef>
-			<ActivitySlotDef ID="0" Name="EditDefinition" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="115" y="182"/>
-				<OutlinePoint x="50" y="152"/>
-				<OutlinePoint x="180" y="152"/>
-				<OutlinePoint x="180" y="212"/>
-				<OutlinePoint x="50" y="212"/>
-				<InEdgeId>19</InEdgeId>
-				<OutEdgeId>21</OutEdgeId>
+			<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="265" y="473" />
+				<OutlinePoint x="235" y="461" />
+				<OutlinePoint x="295" y="461" />
+				<OutlinePoint x="295" y="485" />
+				<OutlinePoint x="235" y="485" />
+				<InEdgeId>8</InEdgeId>
+				<InEdgeId>21</InEdgeId>
+				<InEdgeId>32</InEdgeId>
 				<Properties>
-					<KeyValuePair Key="SchemaType" String="Script"/>
-					<KeyValuePair Key="Name" String="EditDefinition"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
-				<activityDef>EditDefinition</activityDef>
-			</ActivitySlotDef>
-			<ActivitySlotDef ID="9" Name="AssignNewVersionFromLast_" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="344" y="184"/>
-				<OutlinePoint x="279" y="154"/>
-				<OutlinePoint x="409" y="154"/>
-				<OutlinePoint x="409" y="214"/>
-				<OutlinePoint x="279" y="214"/>
-				<InEdgeId>20</InEdgeId>
+			</JoinDef>
+			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="177" y="359" />
+				<OutlinePoint x="147" y="347" />
+				<OutlinePoint x="207" y="347" />
+				<OutlinePoint x="207" y="371" />
+				<OutlinePoint x="147" y="371" />
+				<InEdgeId>25</InEdgeId>
+				<OutEdgeId>7</OutEdgeId>
+				<OutEdgeId>8</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
+				</Properties>
+			</LoopDef>
+			<JoinDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="175" y="131" />
+				<OutlinePoint x="145" y="119" />
+				<OutlinePoint x="205" y="119" />
+				<OutlinePoint x="205" y="143" />
+				<OutlinePoint x="145" y="143" />
+				<InEdgeId>7</InEdgeId>
+				<InEdgeId>16</InEdgeId>
 				<OutEdgeId>24</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="ViewName" String="Script"/>
-					<KeyValuePair Key="Name" String="AssignNewVersionFromLast"/>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<ActivitySlotDef ID="11" Name="AssignNewVersionFromLast_"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="270" y="251" />
+				<OutlinePoint x="205" y="221" />
+				<OutlinePoint x="335" y="221" />
+				<OutlinePoint x="335" y="281" />
+				<OutlinePoint x="205" y="281" />
+				<InEdgeId>18</InEdgeId>
+				<OutEdgeId>19</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="AssignNewScriptVersionFromLast" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="ViewName" String="Script" />
 				</Properties>
 				<activityDef>AssignNewVersionFromLast</activityDef>
 			</ActivitySlotDef>
-			<JoinDef ID="16" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="293" y="399"/>
-				<OutlinePoint x="263" y="387"/>
-				<OutlinePoint x="323" y="387"/>
-				<OutlinePoint x="323" y="411"/>
-				<OutlinePoint x="263" y="411"/>
-				<InEdgeId>22</InEdgeId>
-				<InEdgeId>26</InEdgeId>
+			<NextDef ID="33" OriginVertexId="30" TerminusVertexId="27">
+				<OriginPoint x="463" y="360" />
+				<TerminusPoint x="463" y="132" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Alias" String="true" />
 				</Properties>
-			</JoinDef>
-			<NextDef ID="26" OriginVertexId="15" TerminusVertexId="16">
-				<OriginPoint x="425" y="291"/>
-				<TerminusPoint x="293" y="399"/>
+			</NextDef>
+			<NextDef ID="32" OriginVertexId="30" TerminusVertexId="4">
+				<OriginPoint x="463" y="360" />
+				<TerminusPoint x="265" y="473" />
+				<Properties>
+					<KeyValuePair Key="Alias" String="false" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="29" OriginVertexId="27" TerminusVertexId="26">
+				<OriginPoint x="463" y="132" />
+				<TerminusPoint x="594" y="253" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="31" OriginVertexId="26" TerminusVertexId="30">
+				<OriginPoint x="594" y="253" />
+				<TerminusPoint x="463" y="360" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="28" OriginVertexId="13" TerminusVertexId="27">
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="463" y="132" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="25" OriginVertexId="22" TerminusVertexId="3">
+				<OriginPoint x="76" y="251" />
+				<TerminusPoint x="177" y="359" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="false"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="25" OriginVertexId="15" TerminusVertexId="13">
-				<OriginPoint x="425" y="291"/>
-				<TerminusPoint x="425" y="80"/>
+			<NextDef ID="24" OriginVertexId="2" TerminusVertexId="22">
+				<OriginPoint x="175" y="131" />
+				<TerminusPoint x="76" y="251" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="true"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="24" OriginVertexId="9" TerminusVertexId="15">
-				<OriginPoint x="344" y="184"/>
-				<TerminusPoint x="425" y="291"/>
+			<NextDef ID="21" OriginVertexId="15" TerminusVertexId="4">
+				<OriginPoint x="358" y="360" />
+				<TerminusPoint x="265" y="473" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="23" OriginVertexId="14" TerminusVertexId="12">
-				<OriginPoint x="184" y="289"/>
-				<TerminusPoint x="184" y="80"/>
+			<NextDef ID="19" OriginVertexId="11" TerminusVertexId="15">
+				<OriginPoint x="270" y="251" />
+				<TerminusPoint x="358" y="360" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="true"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="22" OriginVertexId="14" TerminusVertexId="16">
-				<OriginPoint x="184" y="289"/>
-				<TerminusPoint x="293" y="399"/>
+			<NextDef ID="20" OriginVertexId="15" TerminusVertexId="14">
+				<OriginPoint x="358" y="360" />
+				<TerminusPoint x="357" y="132" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="false"/>
+					<KeyValuePair Key="Alias" String="true" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="19" OriginVertexId="12" TerminusVertexId="0">
-				<OriginPoint x="184" y="80"/>
-				<TerminusPoint x="115" y="182"/>
+			<NextDef ID="18" OriginVertexId="14" TerminusVertexId="11">
+				<OriginPoint x="357" y="132" />
+				<TerminusPoint x="270" y="251" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="21" OriginVertexId="0" TerminusVertexId="14">
-				<OriginPoint x="115" y="182"/>
-				<TerminusPoint x="184" y="289"/>
+			<NextDef ID="17" OriginVertexId="13" TerminusVertexId="14">
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="357" y="132" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="20" OriginVertexId="13" TerminusVertexId="9">
-				<OriginPoint x="425" y="80"/>
-				<TerminusPoint x="344" y="184"/>
+			<NextDef ID="8" OriginVertexId="3" TerminusVertexId="4">
+				<OriginPoint x="177" y="359" />
+				<TerminusPoint x="265" y="473" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="18" OriginVertexId="11" TerminusVertexId="13">
-				<OriginPoint x="305" y="26"/>
-				<TerminusPoint x="425" y="80"/>
+			<NextDef ID="16" OriginVertexId="13" TerminusVertexId="2">
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="175" y="131" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="17" OriginVertexId="11" TerminusVertexId="12">
-				<OriginPoint x="305" y="26"/>
-				<TerminusPoint x="184" y="80"/>
+			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="2">
+				<OriginPoint x="177" y="359" />
+				<TerminusPoint x="175" y="131" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 		</GraphModelCastorData>
 	</childrenGraphModel>
-	<Properties>
-		<KeyValuePair Key="Expected Time" Integer="0"/>
-		<KeyValuePair Key="Has Timeout" Boolean="false"/>
-		<KeyValuePair Key="Repeatable" Boolean="false"/>
-		<KeyValuePair Key="Time Out Action" Integer="2"/>
-		<KeyValuePair Key="Agent Name" String=""/>
-		<KeyValuePair Key="Expected Time Unit" Integer="3"/>
-		<KeyValuePair Key="Autostart" Boolean="true"/>
-		<KeyValuePair Key="Maximum Time" Integer="0"/>
-		<KeyValuePair Key="Mail Message" String=""/>
-		<KeyValuePair Key="Mail event" String=""/>
-		<KeyValuePair Key="Maximum Time Unit" Integer="3"/>
-		<KeyValuePair Key="Description" String=""/>
-		<KeyValuePair Key="SchemaVersion" String=""/>
-		<KeyValuePair Key="Prefill" Boolean="false"/>
-		<KeyValuePair Key="Show time" Boolean="true"/>
-		<KeyValuePair Key="Agent Role" String=""/>
-		<KeyValuePair Key="Viewpoint" String=""/>
-		<KeyValuePair Key="Timeout Activated" Boolean="false"/>
-		<KeyValuePair Key="SchemaType" String=""/>
-		<KeyValuePair Key="Ignorable" Boolean="false"/>
-		<KeyValuePair Key="ScriptName" String=""/>
-		<KeyValuePair Key="Skippable" Boolean="false"/>
-		<KeyValuePair Key="ScriptVersion" String=""/>
-	</Properties>
-</CompositeActivityDef>
+	<Properties/>
+</CompositeActivityDef>
\ No newline at end of file
diff --git a/src/main/resources/boot/CA/ManageStateMachine.xml b/src/main/resources/boot/CA/ManageStateMachine.xml
index 16b5de7..b7571b7 100644
--- a/src/main/resources/boot/CA/ManageStateMachine.xml
+++ b/src/main/resources/boot/CA/ManageStateMachine.xml
@@ -1,213 +1,278 @@
-<CompositeActivityDef ID="-1" Name="ManageStateMachine" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+<CompositeActivityDef ID="-1" Name="ManageStateMachine"
+	Height="0" Width="0" IsLayoutable="false" IsComposite="true">
 	<childrenGraphModel>
-		<GraphModelCastorData StartVertexId="13" NextId="22">
-			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
-				<CentrePoint x="358" y="360"/>
-				<OutlinePoint x="328" y="348"/>
-				<OutlinePoint x="388" y="348"/>
-				<OutlinePoint x="388" y="372"/>
-				<OutlinePoint x="328" y="372"/>
+		<GraphModelCastorData StartVertexId="13" NextId="34">
+			<LoopDef ID="30" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="463" y="360" />
+				<OutlinePoint x="433" y="348" />
+				<OutlinePoint x="493" y="348" />
+				<OutlinePoint x="493" y="372" />
+				<OutlinePoint x="433" y="372" />
+				<InEdgeId>31</InEdgeId>
+				<OutEdgeId>32</OutEdgeId>
+				<OutEdgeId>33</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
+				</Properties>
+			</LoopDef>
+			<JoinDef ID="27" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="463" y="132" />
+				<OutlinePoint x="433" y="120" />
+				<OutlinePoint x="493" y="120" />
+				<OutlinePoint x="493" y="144" />
+				<OutlinePoint x="433" y="144" />
+				<InEdgeId>28</InEdgeId>
+				<InEdgeId>33</InEdgeId>
+				<OutEdgeId>29</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<ActivitySlotDef ID="26" Name="MoveLatestVersionToLast slot"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="594" y="253" />
+				<OutlinePoint x="529" y="223" />
+				<OutlinePoint x="659" y="223" />
+				<OutlinePoint x="659" y="283" />
+				<OutlinePoint x="529" y="283" />
+				<InEdgeId>29</InEdgeId>
+				<OutEdgeId>31</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="MoveLatestStateMachineVersionToLast" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="ViewName" String="StateMachine" />
+				</Properties>
+				<activityDef>MoveLatestVersionToLast</activityDef>
+			</ActivitySlotDef>
+			<ActivitySlotDef ID="22" Name="EditDefinition"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="76" y="251" />
+				<OutlinePoint x="11" y="221" />
+				<OutlinePoint x="141" y="221" />
+				<OutlinePoint x="141" y="281" />
+				<OutlinePoint x="11" y="281" />
+				<InEdgeId>24</InEdgeId>
+				<OutEdgeId>25</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="EditDefinition" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="SchemaType" String="StateMachine" />
+				</Properties>
+				<activityDef>EditDefinition</activityDef>
+			</ActivitySlotDef>
+			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="358" y="360" />
+				<OutlinePoint x="328" y="348" />
+				<OutlinePoint x="388" y="348" />
+				<OutlinePoint x="388" y="372" />
+				<OutlinePoint x="328" y="372" />
 				<InEdgeId>19</InEdgeId>
 				<OutEdgeId>20</OutEdgeId>
 				<OutEdgeId>21</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
-					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
 				</Properties>
 			</LoopDef>
-			<JoinDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="357" y="132"/>
-				<OutlinePoint x="327" y="120"/>
-				<OutlinePoint x="387" y="120"/>
-				<OutlinePoint x="387" y="144"/>
-				<OutlinePoint x="327" y="144"/>
+			<JoinDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="357" y="132" />
+				<OutlinePoint x="327" y="120" />
+				<OutlinePoint x="387" y="120" />
+				<OutlinePoint x="387" y="144" />
+				<OutlinePoint x="327" y="144" />
 				<InEdgeId>17</InEdgeId>
 				<InEdgeId>20</InEdgeId>
 				<OutEdgeId>18</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<AndSplitDef ID="13" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="274" y="39"/>
-				<OutlinePoint x="244" y="27"/>
-				<OutlinePoint x="304" y="27"/>
-				<OutlinePoint x="304" y="51"/>
-				<OutlinePoint x="244" y="51"/>
+			<AndSplitDef ID="13" Name="" Height="24" Width="60"
+				IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="357" y="41" />
+				<OutlinePoint x="327" y="29" />
+				<OutlinePoint x="387" y="29" />
+				<OutlinePoint x="387" y="53" />
+				<OutlinePoint x="327" y="53" />
 				<OutEdgeId>16</OutEdgeId>
 				<OutEdgeId>17</OutEdgeId>
+				<OutEdgeId>28</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
-					<KeyValuePair Key="RoutingScriptName" String=""/>
+					<KeyValuePair Key="RoutingScriptName" String="" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
 				</Properties>
 			</AndSplitDef>
-			<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="265" y="473"/>
-				<OutlinePoint x="235" y="461"/>
-				<OutlinePoint x="295" y="461"/>
-				<OutlinePoint x="295" y="485"/>
-				<OutlinePoint x="235" y="485"/>
+			<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="265" y="473" />
+				<OutlinePoint x="235" y="461" />
+				<OutlinePoint x="295" y="461" />
+				<OutlinePoint x="295" y="485" />
+				<OutlinePoint x="235" y="485" />
 				<InEdgeId>8</InEdgeId>
 				<InEdgeId>21</InEdgeId>
+				<InEdgeId>32</InEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
-				<CentrePoint x="177" y="359"/>
-				<OutlinePoint x="147" y="347"/>
-				<OutlinePoint x="207" y="347"/>
-				<OutlinePoint x="207" y="371"/>
-				<OutlinePoint x="147" y="371"/>
-				<InEdgeId>6</InEdgeId>
+			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="177" y="359" />
+				<OutlinePoint x="147" y="347" />
+				<OutlinePoint x="207" y="347" />
+				<OutlinePoint x="207" y="371" />
+				<OutlinePoint x="147" y="371" />
+				<InEdgeId>25</InEdgeId>
 				<OutEdgeId>7</OutEdgeId>
 				<OutEdgeId>8</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
-					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
 				</Properties>
 			</LoopDef>
-			<ActivitySlotDef ID="11" Name="AssignNewVersionFromLast_" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="270" y="251"/>
-				<OutlinePoint x="205" y="221"/>
-				<OutlinePoint x="335" y="221"/>
-				<OutlinePoint x="335" y="281"/>
-				<OutlinePoint x="205" y="281"/>
+			<JoinDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="175" y="131" />
+				<OutlinePoint x="145" y="119" />
+				<OutlinePoint x="205" y="119" />
+				<OutlinePoint x="205" y="143" />
+				<OutlinePoint x="145" y="143" />
+				<InEdgeId>7</InEdgeId>
+				<InEdgeId>16</InEdgeId>
+				<OutEdgeId>24</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<ActivitySlotDef ID="11" Name="AssignNewVersionFromLast_"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="270" y="251" />
+				<OutlinePoint x="205" y="221" />
+				<OutlinePoint x="335" y="221" />
+				<OutlinePoint x="335" y="281" />
+				<OutlinePoint x="205" y="281" />
 				<InEdgeId>18</InEdgeId>
 				<OutEdgeId>19</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="ViewName" String="StateMachine"/>
-					<KeyValuePair Key="Name" String="AssignNewSchemaVersionFromLast"/>
+					<KeyValuePair Key="Name" String="AssignNewStateMachineVersionFromLast" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="ViewName" String="StateMachine" />
 				</Properties>
 				<activityDef>AssignNewVersionFromLast</activityDef>
 			</ActivitySlotDef>
-			<JoinDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="175" y="131"/>
-				<OutlinePoint x="145" y="119"/>
-				<OutlinePoint x="205" y="119"/>
-				<OutlinePoint x="205" y="143"/>
-				<OutlinePoint x="145" y="143"/>
-				<InEdgeId>7</InEdgeId>
-				<InEdgeId>16</InEdgeId>
-				<OutEdgeId>5</OutEdgeId>
+			<NextDef ID="33" OriginVertexId="30" TerminusVertexId="27">
+				<OriginPoint x="463" y="360" />
+				<TerminusPoint x="463" y="132" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Alias" String="true" />
 				</Properties>
-			</JoinDef>
-			<ActivitySlotDef ID="0" Name="EditDefinition" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="93" y="252"/>
-				<OutlinePoint x="28" y="222"/>
-				<OutlinePoint x="158" y="222"/>
-				<OutlinePoint x="158" y="282"/>
-				<OutlinePoint x="28" y="282"/>
-				<InEdgeId>5</InEdgeId>
-				<OutEdgeId>6</OutEdgeId>
-				<Properties>
-					<KeyValuePair Key="SchemaType" String="StateMachine"/>
-					<KeyValuePair Key="Name" String="EditDefinition"/>
+			</NextDef>
+			<NextDef ID="32" OriginVertexId="30" TerminusVertexId="4">
+				<OriginPoint x="463" y="360" />
+				<TerminusPoint x="265" y="473" />
+				<Properties>
+					<KeyValuePair Key="Alias" String="false" />
 				</Properties>
-				<activityDef>EditDefinition</activityDef>
-			</ActivitySlotDef>
-			<NextDef ID="21" OriginVertexId="15" TerminusVertexId="4">
-				<OriginPoint x="358" y="360"/>
-				<TerminusPoint x="265" y="473"/>
+			</NextDef>
+			<NextDef ID="29" OriginVertexId="27" TerminusVertexId="26">
+				<OriginPoint x="463" y="132" />
+				<TerminusPoint x="594" y="253" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="31" OriginVertexId="26" TerminusVertexId="30">
+				<OriginPoint x="594" y="253" />
+				<TerminusPoint x="463" y="360" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="28" OriginVertexId="13" TerminusVertexId="27">
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="463" y="132" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="25" OriginVertexId="22" TerminusVertexId="3">
+				<OriginPoint x="76" y="251" />
+				<TerminusPoint x="177" y="359" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="false"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="19" OriginVertexId="11" TerminusVertexId="15">
-				<OriginPoint x="270" y="251"/>
-				<TerminusPoint x="358" y="360"/>
+			<NextDef ID="24" OriginVertexId="2" TerminusVertexId="22">
+				<OriginPoint x="175" y="131" />
+				<TerminusPoint x="76" y="251" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="20" OriginVertexId="15" TerminusVertexId="14">
-				<OriginPoint x="358" y="360"/>
-				<TerminusPoint x="357" y="132"/>
+			<NextDef ID="21" OriginVertexId="15" TerminusVertexId="4">
+				<OriginPoint x="358" y="360" />
+				<TerminusPoint x="265" y="473" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="true"/>
+					<KeyValuePair Key="Alias" String="false" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="18" OriginVertexId="14" TerminusVertexId="11">
-				<OriginPoint x="357" y="132"/>
-				<TerminusPoint x="270" y="251"/>
+			<NextDef ID="19" OriginVertexId="11" TerminusVertexId="15">
+				<OriginPoint x="270" y="251" />
+				<TerminusPoint x="358" y="360" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="8" OriginVertexId="3" TerminusVertexId="4">
-				<OriginPoint x="177" y="359"/>
-				<TerminusPoint x="265" y="473"/>
+			<NextDef ID="20" OriginVertexId="15" TerminusVertexId="14">
+				<OriginPoint x="358" y="360" />
+				<TerminusPoint x="357" y="132" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="false"/>
+					<KeyValuePair Key="Alias" String="true" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="17" OriginVertexId="13" TerminusVertexId="14">
-				<OriginPoint x="274" y="39"/>
-				<TerminusPoint x="357" y="132"/>
+			<NextDef ID="18" OriginVertexId="14" TerminusVertexId="11">
+				<OriginPoint x="357" y="132" />
+				<TerminusPoint x="270" y="251" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="2">
-				<OriginPoint x="177" y="359"/>
-				<TerminusPoint x="175" y="131"/>
+			<NextDef ID="17" OriginVertexId="13" TerminusVertexId="14">
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="357" y="132" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="true"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="16" OriginVertexId="13" TerminusVertexId="2">
-				<OriginPoint x="274" y="39"/>
-				<TerminusPoint x="175" y="131"/>
+			<NextDef ID="8" OriginVertexId="3" TerminusVertexId="4">
+				<OriginPoint x="177" y="359" />
+				<TerminusPoint x="265" y="473" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="6" OriginVertexId="0" TerminusVertexId="3">
-				<OriginPoint x="93" y="252"/>
-				<TerminusPoint x="177" y="359"/>
+			<NextDef ID="16" OriginVertexId="13" TerminusVertexId="2">
+				<OriginPoint x="357" y="41" />
+				<TerminusPoint x="175" y="131" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
-			<NextDef ID="5" OriginVertexId="2" TerminusVertexId="0">
-				<OriginPoint x="175" y="131"/>
-				<TerminusPoint x="93" y="252"/>
+			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="2">
+				<OriginPoint x="177" y="359" />
+				<TerminusPoint x="175" y="131" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 		</GraphModelCastorData>
 	</childrenGraphModel>
-	<Properties>
-		<KeyValuePair Key="Expected Time" Integer="0"/>
-		<KeyValuePair Key="Repeatable" Boolean="false"/>
-		<KeyValuePair Key="Has Timeout" Boolean="false"/>
-		<KeyValuePair Key="Time Out Action" Integer="2"/>
-		<KeyValuePair Key="Agent Name" String=""/>
-		<KeyValuePair Key="Autostart" Boolean="true"/>
-		<KeyValuePair Key="Expected Time Unit" Integer="3"/>
-		<KeyValuePair Key="Maximum Time" Integer="0"/>
-		<KeyValuePair Key="Mail Message" String=""/>
-		<KeyValuePair Key="Mail event" String=""/>
-		<KeyValuePair Key="Maximum Time Unit" Integer="3"/>
-		<KeyValuePair Key="Description" String=""/>
-		<KeyValuePair Key="SchemaVersion" String=""/>
-		<KeyValuePair Key="Show time" Boolean="true"/>
-		<KeyValuePair Key="Viewpoint" String=""/>
-		<KeyValuePair Key="Agent Role" String=""/>
-		<KeyValuePair Key="Timeout Activated" Boolean="false"/>
-		<KeyValuePair Key="SchemaType" String=""/>
-		<KeyValuePair Key="ScriptName" String=""/>
-		<KeyValuePair Key="Ignorable" Boolean="false"/>
-		<KeyValuePair Key="ScriptVersion" String=""/>
-		<KeyValuePair Key="Skippable" Boolean="false"/>
-	</Properties>
-</CompositeActivityDef>
+	<Properties/>
+</CompositeActivityDef>
\ No newline at end of file
diff --git a/src/main/resources/boot/EA/MoveLatestVersionToLast.xml b/src/main/resources/boot/EA/MoveLatestVersionToLast.xml
new file mode 100644
index 0000000..cca4392
--- /dev/null
+++ b/src/main/resources/boot/EA/MoveLatestVersionToLast.xml
@@ -0,0 +1 @@
+<ActivityDef ID="-1" Name="MoveLatestVersionToLast" Height="0" Width="0" IsLayoutable="false" IsComposite="false"><Properties><KeyValuePair Key="OutcomeInit" String=""/><KeyValuePair Key="Description" String=""/><KeyValuePair Key="ScriptVersion" String="0"/><KeyValuePair Key="Viewpoint" String=""/><KeyValuePair Key="Agent Name" String=""/><KeyValuePair Key="SchemaVersion" String=""/><KeyValuePair Key="ScriptName" String="SetLastNumberedVersionToLast"/><KeyValuePair Key="Breakpoint" Boolean="false"/><KeyValuePair Key="StateMachineVersion" Integer="0"/><KeyValuePair Key="Agent Role" String=""/><KeyValuePair Key="Show time" Boolean="true"/><KeyValuePair Key="StateMachineName" String="Default"/><KeyValuePair Key="Version" Integer="0"/><KeyValuePair Key="SchemaType" String=""/></Properties></ActivityDef>
\ No newline at end of file
diff --git a/src/main/resources/boot/SC/SetLastNumberedVersionToLast.xml b/src/main/resources/boot/SC/SetLastNumberedVersionToLast.xml
new file mode 100644
index 0000000..dab9875
--- /dev/null
+++ b/src/main/resources/boot/SC/SetLastNumberedVersionToLast.xml
@@ -0,0 +1,29 @@
+<cristalscript>
+    <output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
+    <script language="javascript" name="SetLastNumberedVersionFromLast"><![CDATA[
+
+		var viewName = job.getActPropString("ViewName");
+		
+		if (viewName == null || viewName.equals("")) 
+			throw "ViewName not specified.";
+			
+		var lastView = -1;
+		var existingViews = item.getContents("/ViewPoint/"+viewName);
+		for (i=0; i<existingViews.length; i++) {
+			var thisView = parseInt(existingViews[i]);
+			if (thisView!=NaN && lastView < thisView) lastView = thisView;
+		}
+		try {
+			var existingLast = agent.unmarshall(item.queryData("/ViewPoint/"+viewName+"/last"));
+		} catch (e) {
+			throw "No last view found.";
+		}
+		
+		var params = new Array(3);
+		params[0] = viewName;
+		params[1] = lastView;
+		params[2] = existingLast.getEventId();
+		agent.execute(item, "WriteViewpoint", params);
+
+		]]></script>
+</cristalscript>
\ No newline at end of file
diff --git a/src/main/resources/module.xml b/src/main/resources/module.xml
index ea700da..b71c82d 100644
--- a/src/main/resources/module.xml
+++ b/src/main/resources/module.xml
@@ -6,7 +6,7 @@
 		<Dependency>CristalXMLDB</Dependency>
 	</Info>
 	<ResourceURL>uk/ac/uwe/cristaldev/resources/</ResourceURL>
-    <Config name="Module.debug">true</Config>
+    <Config name="Module.dev.debug">true</Config>
     <Config name="OutcomeInit.Dev">com.c2kernel.dev.DevObjectOutcomeInitiator</Config>
 	<Imports>
 		<Resource name="NewDevObjectDef" version="0" type="OD">boot/OD/NewDevObjectDef.xsd</Resource>
@@ -17,6 +17,8 @@
 		<Resource name="SetInstanceWorkflow" version="0" type="EA">boot/EA/SetInstanceWorkflow.xml</Resource>
 		<Resource name="CreateNewNumberedVersionFromLast" version="0" type="SC">boot/SC/CreateNewNumberedVersionFromLast.xml</Resource>
 		<Resource name="AssignNewVersionFromLast" version="0" type="EA">boot/EA/AssignNewVersionFromLast.xml</Resource>
+		<Resource name="SetLastNumberedVersionToLast" version="0" type="SC">boot/SC/SetLastNumberedVersionToLast.xml</Resource>
+		<Resource name="MoveLatestVersionToLast" version="0" type="EA">boot/EA/MoveLatestVersionToLast.xml</Resource>		
 		<Resource name="EditDefinition" version="0" type="EA">boot/EA/EditDefinition.xml</Resource>
 		<Resource name="ManageCompositeActDef" version="0" type="CA">boot/CA/ManageCompositeActDef.xml</Resource>
 		<Resource name="ManageElementaryActDef" version="0" type="CA">boot/CA/ManageElementaryActDef.xml</Resource>
-- 
cgit v1.2.3