From 20aab0c365e87cdefadbb2c5c9325c530761a320 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 6 Mar 2014 16:46:11 +0100
Subject: New ModuleFactory - not finished yet. Can collect module info but not
 export. Contents collection to be added. Pretty-printed XML - an example
 module should be easy to read.

---
 .../resources/boot/CA/CompositeActivityFactory.xml | 129 ++++----
 .../boot/CA/ElementaryActivityFactory.xml          | 130 ++++----
 src/main/resources/boot/CA/ItemDescriptionWf.xml   |   2 +-
 src/main/resources/boot/CA/ModuleDevWorkflow.xml   | 358 +++++++++++++++++++++
 src/main/resources/boot/CA/ModuleFactory.xml       | 104 ++++++
 src/main/resources/boot/CA/ScriptFactoryWf.xml     | 235 +++++++-------
 src/main/resources/boot/EA/CreateItem.xml          |  41 +--
 .../resources/boot/EA/CreateNewLocalObjectDef.xml  |  34 +-
 src/main/resources/boot/EA/EditModuleAgents.xml    |  17 +
 .../resources/boot/EA/EditModuleConfiguration.xml  |  17 +
 .../resources/boot/EA/EditPropertyDescription.xml  |  36 ++-
 src/main/resources/boot/EA/ExportModule.xml        |  17 +
 src/main/resources/boot/EA/SetInstanceWorkflow.xml |  36 ++-
 src/main/resources/boot/OD/ChooseWorkflow.xsd      |  10 +-
 src/main/resources/boot/OD/ItemCanvas.xsd          |  17 +-
 src/main/resources/boot/OD/ModuleAgents.xsd        |  39 +++
 src/main/resources/boot/OD/ModuleExportPath.xsd    |  12 +
 src/main/resources/boot/OD/ModuleProperties.xsd    |  72 +++++
 src/main/resources/boot/OD/New.xsd                 |   3 +-
 src/main/resources/boot/OD/NewDevObjectDef.xsd     |  15 +-
 src/main/resources/boot/OD/NewLocalObjectDef.xsd   |  12 +-
 src/main/resources/boot/SC/InstantiateItem.xml     |  33 +-
 .../resources/boot/SC/LocalObjectDefCreator.xml    |   2 +-
 src/main/resources/boot/SC/New.xml                 |   2 +-
 src/main/resources/boot/SC/SetWorkflow.xml         |   2 +-
 src/main/resources/boot/property/CAProp.xml        |   9 +-
 src/main/resources/boot/property/DescProp.xml      |   6 +-
 src/main/resources/boot/property/EAProp.xml        |   9 +-
 src/main/resources/boot/property/ModuleProp.xml    |  10 +
 src/main/resources/boot/property/ODProp.xml        |   9 +-
 src/main/resources/boot/property/SCProp.xml        |   6 +-
 src/main/resources/module.xml                      |  54 +++-
 32 files changed, 1103 insertions(+), 375 deletions(-)
 create mode 100644 src/main/resources/boot/CA/ModuleDevWorkflow.xml
 create mode 100644 src/main/resources/boot/CA/ModuleFactory.xml
 create mode 100644 src/main/resources/boot/EA/EditModuleAgents.xml
 create mode 100644 src/main/resources/boot/EA/EditModuleConfiguration.xml
 create mode 100644 src/main/resources/boot/EA/ExportModule.xml
 create mode 100644 src/main/resources/boot/OD/ModuleAgents.xsd
 create mode 100644 src/main/resources/boot/OD/ModuleExportPath.xsd
 create mode 100644 src/main/resources/boot/OD/ModuleProperties.xsd
 create mode 100644 src/main/resources/boot/property/ModuleProp.xml

diff --git a/src/main/resources/boot/CA/CompositeActivityFactory.xml b/src/main/resources/boot/CA/CompositeActivityFactory.xml
index f94c729..c917a33 100644
--- a/src/main/resources/boot/CA/CompositeActivityFactory.xml
+++ b/src/main/resources/boot/CA/CompositeActivityFactory.xml
@@ -1,106 +1,113 @@
-<CompositeActivityDef ID="-1" Name="CompositeActivityFactory" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+<CompositeActivityDef ID="-1" Name="CompositeActivityFactory"
+	Height="0" Width="0" IsLayoutable="false" IsComposite="true">
 	<childrenGraphModel>
-		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator" StartVertexId="5" NextId="14">
-			<JoinDef ID="6" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="321" y="325"/>
-				<OutlinePoint x="291" y="313"/>
-				<OutlinePoint x="351" y="313"/>
-				<OutlinePoint x="351" y="337"/>
-				<OutlinePoint x="291" y="337"/>
+		<GraphModelCastorData
+			ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"
+			StartVertexId="5" NextId="14">
+			<JoinDef ID="6" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="321" y="325" />
+				<OutlinePoint x="291" y="313" />
+				<OutlinePoint x="351" y="313" />
+				<OutlinePoint x="351" y="337" />
+				<OutlinePoint x="291" y="337" />
 				<InEdgeId>9</InEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<JoinDef ID="5" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="321" y="92"/>
-				<OutlinePoint x="291" y="80"/>
-				<OutlinePoint x="351" y="80"/>
-				<OutlinePoint x="351" y="104"/>
-				<OutlinePoint x="291" y="104"/>
+			<JoinDef ID="5" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="321" y="92" />
+				<OutlinePoint x="291" y="80" />
+				<OutlinePoint x="351" y="80" />
+				<OutlinePoint x="351" y="104" />
+				<OutlinePoint x="291" y="104" />
 				<InEdgeId>7</InEdgeId>
 				<OutEdgeId>12</OutEdgeId>
 				<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="321" y="211"/>
-				<OutlinePoint x="291" y="199"/>
-				<OutlinePoint x="351" y="199"/>
-				<OutlinePoint x="351" y="223"/>
-				<OutlinePoint x="291" y="223"/>
+			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="321" y="211" />
+				<OutlinePoint x="291" y="199" />
+				<OutlinePoint x="351" y="199" />
+				<OutlinePoint x="351" y="223" />
+				<OutlinePoint x="291" y="223" />
 				<InEdgeId>13</InEdgeId>
 				<OutEdgeId>7</OutEdgeId>
 				<OutEdgeId>9</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
 				</Properties>
 			</LoopDef>
-			<ActivitySlotDef ID="10" Name="CreateNewLocalObjectDef_" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="133" y="215"/>
-				<OutlinePoint x="68" y="185"/>
-				<OutlinePoint x="198" y="185"/>
-				<OutlinePoint x="198" y="245"/>
-				<OutlinePoint x="68" y="245"/>
+			<ActivitySlotDef ID="10" Name="CreateNewLocalObjectDef_"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="133" y="215" />
+				<OutlinePoint x="68" y="185" />
+				<OutlinePoint x="198" y="185" />
+				<OutlinePoint x="198" y="245" />
+				<OutlinePoint x="68" y="245" />
 				<InEdgeId>12</InEdgeId>
 				<OutEdgeId>13</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Name" String="CreateNewCompositeActivityDef"/>
+					<KeyValuePair Key="Name" String="CreateNewCompositeActivityDef" />
 					<KeyValuePair Key="Version" Integer="0" />
-					<KeyValuePair Key="NewType" String="CA"/>
+					<KeyValuePair Key="NewType" String="CA" />
 				</Properties>
 				<activityDef>CreateNewLocalObjectDef</activityDef>
 			</ActivitySlotDef>
 			<NextDef ID="13" OriginVertexId="10" TerminusVertexId="3">
-				<OriginPoint x="133" y="215"/>
-				<TerminusPoint x="321" y="211"/>
+				<OriginPoint x="133" y="215" />
+				<TerminusPoint x="321" y="211" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="12" OriginVertexId="5" TerminusVertexId="10">
-				<OriginPoint x="321" y="92"/>
-				<TerminusPoint x="133" y="215"/>
+				<OriginPoint x="321" y="92" />
+				<TerminusPoint x="133" y="215" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="9" OriginVertexId="3" TerminusVertexId="6">
-				<OriginPoint x="321" y="211"/>
-				<TerminusPoint x="321" y="325"/>
+				<OriginPoint x="321" y="211" />
+				<TerminusPoint x="321" y="325" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="false"/>
+					<KeyValuePair Key="Type" String="Straight" />
+					<KeyValuePair Key="Alias" String="false" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="5">
-				<OriginPoint x="321" y="211"/>
-				<TerminusPoint x="321" y="92"/>
+				<OriginPoint x="321" y="211" />
+				<TerminusPoint x="321" y="92" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="true"/>
+					<KeyValuePair Key="Type" String="Straight" />
+					<KeyValuePair Key="Alias" String="true" />
 				</Properties>
 			</NextDef>
 		</GraphModelCastorData>
 	</childrenGraphModel>
 	<Properties>
-		<KeyValuePair Key="Repeatable" Boolean="false"/>
-		<KeyValuePair Key="Agent Name" String=""/>
-		<KeyValuePair Key="Autostart" Boolean="true"/>
-		<KeyValuePair Key="Mail Message" String=""/>
-		<KeyValuePair Key="Mail event" String=""/>
-		<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="SchemaType" String=""/>
-		<KeyValuePair Key="ScriptName" String=""/>
-		<KeyValuePair Key="Ignorable" Boolean="false"/>
-		<KeyValuePair Key="ScriptVersion" String=""/>
-		<KeyValuePair Key="Skippable" Boolean="false"/>
+		<KeyValuePair Key="Repeatable" Boolean="false" />
+		<KeyValuePair Key="Agent Name" String="" />
+		<KeyValuePair Key="Autostart" Boolean="true" />
+		<KeyValuePair Key="Mail Message" String="" />
+		<KeyValuePair Key="Mail event" String="" />
+		<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="SchemaType" String="" />
+		<KeyValuePair Key="ScriptName" String="" />
+		<KeyValuePair Key="Ignorable" Boolean="false" />
+		<KeyValuePair Key="ScriptVersion" String="" />
+		<KeyValuePair Key="Skippable" Boolean="false" />
 	</Properties>
 	<castorNonLayoutableChildren>CreateNewLocalObjectDef</castorNonLayoutableChildren>
 </CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/ElementaryActivityFactory.xml b/src/main/resources/boot/CA/ElementaryActivityFactory.xml
index 796f473..ab736ea 100644
--- a/src/main/resources/boot/CA/ElementaryActivityFactory.xml
+++ b/src/main/resources/boot/CA/ElementaryActivityFactory.xml
@@ -1,105 +1,113 @@
-<CompositeActivityDef ID="-1" Name="ElementaryActivityFactory" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+<CompositeActivityDef ID="-1"
+	Name="ElementaryActivityFactory" Height="0" Width="0" IsLayoutable="false"
+	IsComposite="true">
 	<childrenGraphModel>
-		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator" StartVertexId="5" NextId="14">
-			<JoinDef ID="6" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="321" y="325"/>
-				<OutlinePoint x="291" y="313"/>
-				<OutlinePoint x="351" y="313"/>
-				<OutlinePoint x="351" y="337"/>
-				<OutlinePoint x="291" y="337"/>
+		<GraphModelCastorData
+			ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"
+			StartVertexId="5" NextId="14">
+			<JoinDef ID="6" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="321" y="325" />
+				<OutlinePoint x="291" y="313" />
+				<OutlinePoint x="351" y="313" />
+				<OutlinePoint x="351" y="337" />
+				<OutlinePoint x="291" y="337" />
 				<InEdgeId>9</InEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<JoinDef ID="5" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="321" y="92"/>
-				<OutlinePoint x="291" y="80"/>
-				<OutlinePoint x="351" y="80"/>
-				<OutlinePoint x="351" y="104"/>
-				<OutlinePoint x="291" y="104"/>
+			<JoinDef ID="5" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="321" y="92" />
+				<OutlinePoint x="291" y="80" />
+				<OutlinePoint x="351" y="80" />
+				<OutlinePoint x="351" y="104" />
+				<OutlinePoint x="291" y="104" />
 				<InEdgeId>7</InEdgeId>
 				<OutEdgeId>12</OutEdgeId>
 				<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="321" y="211"/>
-				<OutlinePoint x="291" y="199"/>
-				<OutlinePoint x="351" y="199"/>
-				<OutlinePoint x="351" y="223"/>
-				<OutlinePoint x="291" y="223"/>
+			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="321" y="211" />
+				<OutlinePoint x="291" y="199" />
+				<OutlinePoint x="351" y="199" />
+				<OutlinePoint x="351" y="223" />
+				<OutlinePoint x="291" y="223" />
 				<InEdgeId>13</InEdgeId>
 				<OutEdgeId>7</OutEdgeId>
 				<OutEdgeId>9</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
 				</Properties>
 			</LoopDef>
-			<ActivitySlotDef ID="10" Name="CreateNewLocalObjectDef_" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="133" y="215"/>
-				<OutlinePoint x="68" y="185"/>
-				<OutlinePoint x="198" y="185"/>
-				<OutlinePoint x="198" y="245"/>
-				<OutlinePoint x="68" y="245"/>
+			<ActivitySlotDef ID="10" Name="CreateNewLocalObjectDef_"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="133" y="215" />
+				<OutlinePoint x="68" y="185" />
+				<OutlinePoint x="198" y="185" />
+				<OutlinePoint x="198" y="245" />
+				<OutlinePoint x="68" y="245" />
 				<InEdgeId>12</InEdgeId>
 				<OutEdgeId>13</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Name" String="CreateNewElementaryActivityDef"/>
-					<KeyValuePair Key="NewType" String="EA"/>
+					<KeyValuePair Key="Name" String="CreateNewElementaryActivityDef" />
+					<KeyValuePair Key="NewType" String="EA" />
 				</Properties>
 				<activityDef>CreateNewLocalObjectDef</activityDef>
 			</ActivitySlotDef>
 			<NextDef ID="13" OriginVertexId="10" TerminusVertexId="3">
-				<OriginPoint x="133" y="215"/>
-				<TerminusPoint x="321" y="211"/>
+				<OriginPoint x="133" y="215" />
+				<TerminusPoint x="321" y="211" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="12" OriginVertexId="5" TerminusVertexId="10">
-				<OriginPoint x="321" y="92"/>
-				<TerminusPoint x="133" y="215"/>
+				<OriginPoint x="321" y="92" />
+				<TerminusPoint x="133" y="215" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="9" OriginVertexId="3" TerminusVertexId="6">
-				<OriginPoint x="321" y="211"/>
-				<TerminusPoint x="321" y="325"/>
+				<OriginPoint x="321" y="211" />
+				<TerminusPoint x="321" y="325" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="false"/>
+					<KeyValuePair Key="Type" String="Straight" />
+					<KeyValuePair Key="Alias" String="false" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="5">
-				<OriginPoint x="321" y="211"/>
-				<TerminusPoint x="321" y="92"/>
+				<OriginPoint x="321" y="211" />
+				<TerminusPoint x="321" y="92" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
-					<KeyValuePair Key="Alias" String="true"/>
+					<KeyValuePair Key="Type" String="Straight" />
+					<KeyValuePair Key="Alias" String="true" />
 				</Properties>
 			</NextDef>
 		</GraphModelCastorData>
 	</childrenGraphModel>
 	<Properties>
-		<KeyValuePair Key="Repeatable" Boolean="false"/>
-		<KeyValuePair Key="Agent Name" String=""/>
-		<KeyValuePair Key="Autostart" Boolean="true"/>
-		<KeyValuePair Key="Mail Message" String=""/>
-		<KeyValuePair Key="Mail event" String=""/>
-		<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="SchemaType" String=""/>
-		<KeyValuePair Key="ScriptName" String=""/>
-		<KeyValuePair Key="Ignorable" Boolean="false"/>
-		<KeyValuePair Key="ScriptVersion" String=""/>
-		<KeyValuePair Key="Skippable" Boolean="false"/>
+		<KeyValuePair Key="Repeatable" Boolean="false" />
+		<KeyValuePair Key="Agent Name" String="" />
+		<KeyValuePair Key="Autostart" Boolean="true" />
+		<KeyValuePair Key="Mail Message" String="" />
+		<KeyValuePair Key="Mail event" String="" />
+		<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="SchemaType" String="" />
+		<KeyValuePair Key="ScriptName" String="" />
+		<KeyValuePair Key="Ignorable" Boolean="false" />
+		<KeyValuePair Key="ScriptVersion" String="" />
+		<KeyValuePair Key="Skippable" Boolean="false" />
 	</Properties>
 	<castorNonLayoutableChildren>CreateNewLocalObjectDef</castorNonLayoutableChildren>
 </CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/ItemDescriptionWf.xml b/src/main/resources/boot/CA/ItemDescriptionWf.xml
index 2e69e60..34e38c7 100644
--- a/src/main/resources/boot/CA/ItemDescriptionWf.xml
+++ b/src/main/resources/boot/CA/ItemDescriptionWf.xml
@@ -177,7 +177,7 @@
 				<Properties>
 					<KeyValuePair Key="Name" String="SetInstanceWorkflow" />
 					<KeyValuePair Key="Version" Integer="0" />
-					<KeyValuePair Key="Skippable" Boolean="true"/>
+					<KeyValuePair Key="Skippable" Boolean="true" />
 				</Properties>
 				<activityDef>SetInstanceWorkflow</activityDef>
 			</ActivitySlotDef>
diff --git a/src/main/resources/boot/CA/ModuleDevWorkflow.xml b/src/main/resources/boot/CA/ModuleDevWorkflow.xml
new file mode 100644
index 0000000..ddc74d3
--- /dev/null
+++ b/src/main/resources/boot/CA/ModuleDevWorkflow.xml
@@ -0,0 +1,358 @@
+<CompositeActivityDef ID="-1" Name="ModuleDevWorkflow"
+	Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+	<childrenGraphModel>
+		<GraphModelCastorData StartVertexId="0" NextId="38">
+			<JoinDef ID="26" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="337" y="715" />
+				<OutlinePoint x="307" y="703" />
+				<OutlinePoint x="367" y="703" />
+				<OutlinePoint x="367" y="727" />
+				<OutlinePoint x="307" y="727" />
+				<InEdgeId>32</InEdgeId>
+				<InEdgeId>33</InEdgeId>
+				<InEdgeId>34</InEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<ActivitySlotDef ID="24" Name="ExportModule slot"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="452" y="532" />
+				<OutlinePoint x="387" y="502" />
+				<OutlinePoint x="517" y="502" />
+				<OutlinePoint x="517" y="562" />
+				<OutlinePoint x="387" y="562" />
+				<InEdgeId>30</InEdgeId>
+				<OutEdgeId>31</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="ExportModule" />
+					<KeyValuePair Key="Version" Integer="0" />
+				</Properties>
+				<activityDef>ExportModule</activityDef>
+			</ActivitySlotDef>
+			<ActivitySlotDef ID="23" Name="EditModuleAgents slot"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="275" y="526" />
+				<OutlinePoint x="210" y="496" />
+				<OutlinePoint x="340" y="496" />
+				<OutlinePoint x="340" y="556" />
+				<OutlinePoint x="210" y="556" />
+				<InEdgeId>28</InEdgeId>
+				<OutEdgeId>29</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="EditModuleAgents" />
+					<KeyValuePair Key="Viewpoint" String="last" />
+					<KeyValuePair Key="Version" Integer="0" />
+				</Properties>
+				<activityDef>EditModuleAgents</activityDef>
+			</ActivitySlotDef>
+			<ActivitySlotDef ID="22" Name="EditModuleConfiguration slot"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="100" y="527" />
+				<OutlinePoint x="35" y="497" />
+				<OutlinePoint x="165" y="497" />
+				<OutlinePoint x="165" y="557" />
+				<OutlinePoint x="35" y="557" />
+				<InEdgeId>25</InEdgeId>
+				<OutEdgeId>27</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="EditModuleConfiguration" />
+					<KeyValuePair Key="Viewpoint" String="last" />
+					<KeyValuePair Key="Version" Integer="0" />
+				</Properties>
+				<activityDef>EditModuleConfiguration</activityDef>
+			</ActivitySlotDef>
+			<LoopDef ID="19" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="206" y="593" />
+				<OutlinePoint x="176" y="581" />
+				<OutlinePoint x="236" y="581" />
+				<OutlinePoint x="236" y="605" />
+				<OutlinePoint x="176" y="605" />
+				<InEdgeId>27</InEdgeId>
+				<OutEdgeId>32</OutEdgeId>
+				<OutEdgeId>35</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
+				</Properties>
+			</LoopDef>
+			<LoopDef ID="21" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="556" y="592" />
+				<OutlinePoint x="526" y="580" />
+				<OutlinePoint x="586" y="580" />
+				<OutlinePoint x="586" y="604" />
+				<OutlinePoint x="526" y="604" />
+				<InEdgeId>31</InEdgeId>
+				<OutEdgeId>34</OutEdgeId>
+				<OutEdgeId>37</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
+				</Properties>
+			</LoopDef>
+			<JoinDef ID="9" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="314" y="376" />
+				<OutlinePoint x="284" y="364" />
+				<OutlinePoint x="344" y="364" />
+				<OutlinePoint x="344" y="388" />
+				<OutlinePoint x="284" y="388" />
+				<InEdgeId>17</InEdgeId>
+				<InEdgeId>36</InEdgeId>
+				<OutEdgeId>28</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<LoopDef ID="20" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="375" y="595" />
+				<OutlinePoint x="345" y="583" />
+				<OutlinePoint x="405" y="583" />
+				<OutlinePoint x="405" y="607" />
+				<OutlinePoint x="345" y="607" />
+				<InEdgeId>29</InEdgeId>
+				<OutEdgeId>33</OutEdgeId>
+				<OutEdgeId>36</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
+				</Properties>
+			</LoopDef>
+			<JoinDef ID="8" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="156" y="375" />
+				<OutlinePoint x="126" y="363" />
+				<OutlinePoint x="186" y="363" />
+				<OutlinePoint x="186" y="387" />
+				<OutlinePoint x="126" y="387" />
+				<InEdgeId>16</InEdgeId>
+				<InEdgeId>35</InEdgeId>
+				<OutEdgeId>25</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<AndSplitDef ID="14" Name="" Height="24" Width="60"
+				IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="185" y="313" />
+				<OutlinePoint x="155" y="301" />
+				<OutlinePoint x="215" y="301" />
+				<OutlinePoint x="215" y="325" />
+				<OutlinePoint x="155" y="325" />
+				<InEdgeId>15</InEdgeId>
+				<OutEdgeId>16</OutEdgeId>
+				<OutEdgeId>17</OutEdgeId>
+				<OutEdgeId>18</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="RoutingScriptName" String="" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
+				</Properties>
+			</AndSplitDef>
+			<JoinDef ID="5" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="185" y="230" />
+				<OutlinePoint x="155" y="218" />
+				<OutlinePoint x="215" y="218" />
+				<OutlinePoint x="215" y="242" />
+				<OutlinePoint x="155" y="242" />
+				<InEdgeId>6</InEdgeId>
+				<InEdgeId>7</InEdgeId>
+				<OutEdgeId>15</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<ActivitySlotDef ID="2" Name="EditModuleAgents slot"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="277" y="137" />
+				<OutlinePoint x="212" y="107" />
+				<OutlinePoint x="342" y="107" />
+				<OutlinePoint x="342" y="167" />
+				<OutlinePoint x="212" y="167" />
+				<InEdgeId>4</InEdgeId>
+				<OutEdgeId>7</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="SetModuleAgents" />
+					<KeyValuePair Key="Version" Integer="0" />
+				</Properties>
+				<activityDef>EditModuleAgents</activityDef>
+			</ActivitySlotDef>
+			<JoinDef ID="10" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="473" y="378" />
+				<OutlinePoint x="443" y="366" />
+				<OutlinePoint x="503" y="366" />
+				<OutlinePoint x="503" y="390" />
+				<OutlinePoint x="443" y="390" />
+				<InEdgeId>18</InEdgeId>
+				<InEdgeId>37</InEdgeId>
+				<OutEdgeId>30</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<ActivitySlotDef ID="1" Name="EditModuleConfiguration slot"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="91" y="137" />
+				<OutlinePoint x="26" y="107" />
+				<OutlinePoint x="156" y="107" />
+				<OutlinePoint x="156" y="167" />
+				<OutlinePoint x="26" y="167" />
+				<InEdgeId>3</InEdgeId>
+				<OutEdgeId>6</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="SetModuleConfiguration" />
+					<KeyValuePair Key="Version" Integer="0" />
+				</Properties>
+				<activityDef>EditModuleConfiguration</activityDef>
+			</ActivitySlotDef>
+			<AndSplitDef ID="0" Name="" Height="24" Width="60"
+				IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="184" y="44" />
+				<OutlinePoint x="154" y="32" />
+				<OutlinePoint x="214" y="32" />
+				<OutlinePoint x="214" y="56" />
+				<OutlinePoint x="154" y="56" />
+				<OutEdgeId>3</OutEdgeId>
+				<OutEdgeId>4</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="RoutingScriptName" String="" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
+				</Properties>
+			</AndSplitDef>
+			<NextDef ID="37" OriginVertexId="21" TerminusVertexId="10">
+				<OriginPoint x="556" y="592" />
+				<TerminusPoint x="473" y="378" />
+				<Properties>
+					<KeyValuePair Key="Alias" String="true" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="36" OriginVertexId="20" TerminusVertexId="9">
+				<OriginPoint x="375" y="595" />
+				<TerminusPoint x="314" y="376" />
+				<Properties>
+					<KeyValuePair Key="Alias" String="true" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="35" OriginVertexId="19" TerminusVertexId="8">
+				<OriginPoint x="206" y="593" />
+				<TerminusPoint x="156" y="375" />
+				<Properties>
+					<KeyValuePair Key="Alias" String="true" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="34" OriginVertexId="21" TerminusVertexId="26">
+				<OriginPoint x="556" y="592" />
+				<TerminusPoint x="337" y="715" />
+				<Properties>
+					<KeyValuePair Key="Alias" String="false" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="33" OriginVertexId="20" TerminusVertexId="26">
+				<OriginPoint x="375" y="595" />
+				<TerminusPoint x="337" y="715" />
+				<Properties>
+					<KeyValuePair Key="Alias" String="false" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="32" OriginVertexId="19" TerminusVertexId="26">
+				<OriginPoint x="206" y="593" />
+				<TerminusPoint x="337" y="715" />
+				<Properties>
+					<KeyValuePair Key="Alias" String="false" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="31" OriginVertexId="24" TerminusVertexId="21">
+				<OriginPoint x="452" y="532" />
+				<TerminusPoint x="556" y="592" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="30" OriginVertexId="10" TerminusVertexId="24">
+				<OriginPoint x="473" y="378" />
+				<TerminusPoint x="452" y="532" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="18" OriginVertexId="14" TerminusVertexId="10">
+				<OriginPoint x="185" y="313" />
+				<TerminusPoint x="473" y="378" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="17" OriginVertexId="14" TerminusVertexId="9">
+				<OriginPoint x="185" y="313" />
+				<TerminusPoint x="314" y="376" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="16" OriginVertexId="14" TerminusVertexId="8">
+				<OriginPoint x="185" y="313" />
+				<TerminusPoint x="156" y="375" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="15" OriginVertexId="5" TerminusVertexId="14">
+				<OriginPoint x="185" y="230" />
+				<TerminusPoint x="185" y="313" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="29" OriginVertexId="23" TerminusVertexId="20">
+				<OriginPoint x="275" y="526" />
+				<TerminusPoint x="375" y="595" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="7" OriginVertexId="2" TerminusVertexId="5">
+				<OriginPoint x="277" y="137" />
+				<TerminusPoint x="185" y="230" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="28" OriginVertexId="9" TerminusVertexId="23">
+				<OriginPoint x="314" y="376" />
+				<TerminusPoint x="275" y="526" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="6" OriginVertexId="1" TerminusVertexId="5">
+				<OriginPoint x="91" y="137" />
+				<TerminusPoint x="185" y="230" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="27" OriginVertexId="22" TerminusVertexId="19">
+				<OriginPoint x="100" y="527" />
+				<TerminusPoint x="206" y="593" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="25" OriginVertexId="8" TerminusVertexId="22">
+				<OriginPoint x="156" y="375" />
+				<TerminusPoint x="100" y="527" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="4" OriginVertexId="0" TerminusVertexId="2">
+				<OriginPoint x="184" y="44" />
+				<TerminusPoint x="277" y="137" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="3" OriginVertexId="0" TerminusVertexId="1">
+				<OriginPoint x="184" y="44" />
+				<TerminusPoint x="91" y="137" />
+				<Properties />
+			</NextDef>
+		</GraphModelCastorData>
+	</childrenGraphModel>
+	<Properties>
+		<KeyValuePair Key="StateMachineVersion" Integer="0" />
+		<KeyValuePair Key="Description" String="" />
+		<KeyValuePair Key="Agent Role" String="" />
+		<KeyValuePair Key="Show time" Boolean="true" />
+		<KeyValuePair Key="ScriptVersion" String="" />
+		<KeyValuePair Key="Viewpoint" String="" />
+		<KeyValuePair Key="Agent Name" String="" />
+		<KeyValuePair Key="StateMachineName" String="Default" />
+		<KeyValuePair Key="SchemaVersion" String="" />
+		<KeyValuePair Key="ScriptName" String="" />
+		<KeyValuePair Key="Breakpoint" Boolean="false" />
+		<KeyValuePair Key="SchemaType" String="" />
+	</Properties>
+</CompositeActivityDef>
\ No newline at end of file
diff --git a/src/main/resources/boot/CA/ModuleFactory.xml b/src/main/resources/boot/CA/ModuleFactory.xml
new file mode 100644
index 0000000..cf3b371
--- /dev/null
+++ b/src/main/resources/boot/CA/ModuleFactory.xml
@@ -0,0 +1,104 @@
+<CompositeActivityDef ID="-1" Name="ModuleFactory"
+	Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+	<childrenGraphModel>
+		<GraphModelCastorData StartVertexId="0" NextId="10">
+			<ActivitySlotDef ID="5" Name="CreateItem slot"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="97" y="181" />
+				<OutlinePoint x="32" y="151" />
+				<OutlinePoint x="162" y="151" />
+				<OutlinePoint x="162" y="211" />
+				<OutlinePoint x="32" y="211" />
+				<InEdgeId>6</InEdgeId>
+				<OutEdgeId>7</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="CreateNewModule" />
+					<KeyValuePair Key="Description"
+						String="Create a new Module to export Items to another server" />
+					<KeyValuePair Key="Root" String="/desc/modules/" />
+					<KeyValuePair Key="Version" Integer="0" />
+				</Properties>
+				<activityDef>CreateItem</activityDef>
+			</ActivitySlotDef>
+			<LoopDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="251" y="175" />
+				<OutlinePoint x="221" y="163" />
+				<OutlinePoint x="281" y="163" />
+				<OutlinePoint x="281" y="187" />
+				<OutlinePoint x="221" y="187" />
+				<InEdgeId>7</InEdgeId>
+				<OutEdgeId>8</OutEdgeId>
+				<OutEdgeId>9</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
+				</Properties>
+			</LoopDef>
+			<JoinDef ID="1" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="254" y="294" />
+				<OutlinePoint x="224" y="282" />
+				<OutlinePoint x="284" y="282" />
+				<OutlinePoint x="284" y="306" />
+				<OutlinePoint x="224" y="306" />
+				<InEdgeId>9</InEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<JoinDef ID="0" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="250" y="63" />
+				<OutlinePoint x="220" y="51" />
+				<OutlinePoint x="280" y="51" />
+				<OutlinePoint x="280" y="75" />
+				<OutlinePoint x="220" y="75" />
+				<InEdgeId>8</InEdgeId>
+				<OutEdgeId>6</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<NextDef ID="6" OriginVertexId="0" TerminusVertexId="5">
+				<OriginPoint x="250" y="63" />
+				<TerminusPoint x="97" y="181" />
+				<Properties />
+			</NextDef>
+			<NextDef ID="9" OriginVertexId="2" TerminusVertexId="1">
+				<OriginPoint x="251" y="175" />
+				<TerminusPoint x="254" y="294" />
+				<Properties>
+					<KeyValuePair Key="Alias" String="false" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="8" OriginVertexId="2" TerminusVertexId="0">
+				<OriginPoint x="251" y="175" />
+				<TerminusPoint x="250" y="63" />
+				<Properties>
+					<KeyValuePair Key="Alias" String="true" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="7" OriginVertexId="5" TerminusVertexId="2">
+				<OriginPoint x="97" y="181" />
+				<TerminusPoint x="251" y="175" />
+				<Properties />
+			</NextDef>
+		</GraphModelCastorData>
+	</childrenGraphModel>
+	<Properties>
+		<KeyValuePair Key="StateMachineVersion" Integer="0" />
+		<KeyValuePair Key="Description" String="" />
+		<KeyValuePair Key="Agent Role" String="" />
+		<KeyValuePair Key="Show time" Boolean="true" />
+		<KeyValuePair Key="ScriptVersion" String="" />
+		<KeyValuePair Key="Viewpoint" String="" />
+		<KeyValuePair Key="Agent Name" String="" />
+		<KeyValuePair Key="StateMachineName" String="Default" />
+		<KeyValuePair Key="SchemaVersion" String="" />
+		<KeyValuePair Key="ScriptName" String="" />
+		<KeyValuePair Key="Breakpoint" Boolean="false" />
+		<KeyValuePair Key="SchemaType" String="" />
+	</Properties>
+</CompositeActivityDef>
\ No newline at end of file
diff --git a/src/main/resources/boot/CA/ScriptFactoryWf.xml b/src/main/resources/boot/CA/ScriptFactoryWf.xml
index d5a02cc..0eb7cb6 100644
--- a/src/main/resources/boot/CA/ScriptFactoryWf.xml
+++ b/src/main/resources/boot/CA/ScriptFactoryWf.xml
@@ -1,198 +1,207 @@
-<CompositeActivityDef ID="-1" Name="ScriptFactoryWf" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+<CompositeActivityDef ID="-1" Name="ScriptFactoryWf"
+	Height="0" Width="0" IsLayoutable="false" IsComposite="true">
 	<childrenGraphModel>
 		<GraphModelCastorData StartVertexId="14" NextId="25">
-			<JoinDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="485" y="120"/>
-				<OutlinePoint x="455" y="108"/>
-				<OutlinePoint x="515" y="108"/>
-				<OutlinePoint x="515" y="132"/>
-				<OutlinePoint x="455" y="132"/>
+			<JoinDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="485" y="120" />
+				<OutlinePoint x="455" y="108" />
+				<OutlinePoint x="515" y="108" />
+				<OutlinePoint x="515" y="132" />
+				<OutlinePoint x="455" y="132" />
 				<InEdgeId>20</InEdgeId>
 				<InEdgeId>23</InEdgeId>
 				<OutEdgeId>21</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<JoinDef ID="6" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="411" y="336"/>
-				<OutlinePoint x="381" y="324"/>
-				<OutlinePoint x="441" y="324"/>
-				<OutlinePoint x="441" y="348"/>
-				<OutlinePoint x="381" y="348"/>
+			<JoinDef ID="6" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="411" y="336" />
+				<OutlinePoint x="381" y="324" />
+				<OutlinePoint x="441" y="324" />
+				<OutlinePoint x="441" y="348" />
+				<OutlinePoint x="381" y="348" />
 				<InEdgeId>9</InEdgeId>
 				<InEdgeId>24</InEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Join"/>
+					<KeyValuePair Key="Type" String="Join" />
 				</Properties>
 			</JoinDef>
-			<AndSplitDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="413" y="49"/>
-				<OutlinePoint x="383" y="37"/>
-				<OutlinePoint x="443" y="37"/>
-				<OutlinePoint x="443" y="61"/>
-				<OutlinePoint x="383" y="61"/>
+			<AndSplitDef ID="14" Name="" Height="24" Width="60"
+				IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="413" y="49" />
+				<OutlinePoint x="383" y="37" />
+				<OutlinePoint x="443" y="37" />
+				<OutlinePoint x="443" y="61" />
+				<OutlinePoint x="383" y="61" />
 				<OutEdgeId>19</OutEdgeId>
 				<OutEdgeId>20</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="RoutingScriptName" String=""/>
+					<KeyValuePair Key="RoutingScriptName" String="" />
 				</Properties>
 			</AndSplitDef>
-			<JoinDef ID="5" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="340" y="120"/>
-				<OutlinePoint x="310" y="108"/>
-				<OutlinePoint x="370" y="108"/>
-				<OutlinePoint x="370" y="132"/>
-				<OutlinePoint x="310" y="132"/>
+			<JoinDef ID="5" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="340" y="120" />
+				<OutlinePoint x="310" y="108" />
+				<OutlinePoint x="370" y="108" />
+				<OutlinePoint x="370" y="132" />
+				<OutlinePoint x="310" y="132" />
 				<InEdgeId>7</InEdgeId>
 				<InEdgeId>19</InEdgeId>
 				<OutEdgeId>12</OutEdgeId>
 				<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="337" y="258"/>
-				<OutlinePoint x="307" y="246"/>
-				<OutlinePoint x="367" y="246"/>
-				<OutlinePoint x="367" y="270"/>
-				<OutlinePoint x="307" y="270"/>
+			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="337" y="258" />
+				<OutlinePoint x="307" y="246" />
+				<OutlinePoint x="367" y="246" />
+				<OutlinePoint x="367" y="270" />
+				<OutlinePoint x="307" y="270" />
 				<InEdgeId>13</InEdgeId>
 				<OutEdgeId>7</OutEdgeId>
 				<OutEdgeId>9</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
 				</Properties>
 			</LoopDef>
-			<ActivitySlotDef ID="10" Name="CreateNewLocalObjectDef_" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="202" y="196"/>
-				<OutlinePoint x="137" y="166"/>
-				<OutlinePoint x="267" y="166"/>
-				<OutlinePoint x="267" y="226"/>
-				<OutlinePoint x="137" y="226"/>
+			<ActivitySlotDef ID="10" Name="CreateNewLocalObjectDef_"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="202" y="196" />
+				<OutlinePoint x="137" y="166" />
+				<OutlinePoint x="267" y="166" />
+				<OutlinePoint x="267" y="226" />
+				<OutlinePoint x="137" y="226" />
 				<InEdgeId>12</InEdgeId>
 				<OutEdgeId>13</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Prefill Version" String="-1"/>
-					<KeyValuePair Key="Name" String="CreateNewScript"/>
-					<KeyValuePair Key="NewType" String="SC"/>
-					<KeyValuePair Key="Prefill" Boolean="false"/>
-					<KeyValuePair Key="Version" Integer="0"/>
+					<KeyValuePair Key="Prefill Version" String="-1" />
+					<KeyValuePair Key="Name" String="CreateNewScript" />
+					<KeyValuePair Key="NewType" String="SC" />
+					<KeyValuePair Key="Prefill" Boolean="false" />
+					<KeyValuePair Key="Version" Integer="0" />
 				</Properties>
 				<activityDef>CreateNewLocalObjectDef</activityDef>
 			</ActivitySlotDef>
-			<ActivitySlotDef ID="18" Name="EditScriptDefinition slot" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
-				<CentrePoint x="604" y="193"/>
-				<OutlinePoint x="539" y="163"/>
-				<OutlinePoint x="669" y="163"/>
-				<OutlinePoint x="669" y="223"/>
-				<OutlinePoint x="539" y="223"/>
+			<ActivitySlotDef ID="18" Name="EditScriptDefinition slot"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="604" y="193" />
+				<OutlinePoint x="539" y="163" />
+				<OutlinePoint x="669" y="163" />
+				<OutlinePoint x="669" y="223" />
+				<OutlinePoint x="539" y="223" />
 				<InEdgeId>21</InEdgeId>
 				<OutEdgeId>22</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Name" String="EditEmptyScript"/>
-					<KeyValuePair Key="Version" Integer="0"/>
+					<KeyValuePair Key="Name" String="EditEmptyScript" />
+					<KeyValuePair Key="Version" Integer="0" />
 				</Properties>
 				<activityDef>EditScriptDefinition</activityDef>
 			</ActivitySlotDef>
-			<LoopDef ID="16" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
-				<CentrePoint x="486" y="258"/>
-				<OutlinePoint x="456" y="246"/>
-				<OutlinePoint x="516" y="246"/>
-				<OutlinePoint x="516" y="270"/>
-				<OutlinePoint x="456" y="270"/>
+			<LoopDef ID="16" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="486" y="258" />
+				<OutlinePoint x="456" y="246" />
+				<OutlinePoint x="516" y="246" />
+				<OutlinePoint x="516" y="270" />
+				<OutlinePoint x="456" y="270" />
 				<InEdgeId>22</InEdgeId>
 				<OutEdgeId>23</OutEdgeId>
 				<OutEdgeId>24</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+					<KeyValuePair Key="RoutingScriptVersion" String="" />
 				</Properties>
 			</LoopDef>
 			<NextDef ID="24" OriginVertexId="16" TerminusVertexId="6">
-				<OriginPoint x="486" y="258"/>
-				<TerminusPoint x="411" y="336"/>
+				<OriginPoint x="486" y="258" />
+				<TerminusPoint x="411" y="336" />
 				<Properties>
-					<KeyValuePair Key="Alias" String="false"/>
+					<KeyValuePair Key="Alias" String="false" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="23" OriginVertexId="16" TerminusVertexId="15">
-				<OriginPoint x="486" y="258"/>
-				<TerminusPoint x="485" y="120"/>
+				<OriginPoint x="486" y="258" />
+				<TerminusPoint x="485" y="120" />
 				<Properties>
-					<KeyValuePair Key="Alias" String="true"/>
+					<KeyValuePair Key="Alias" String="true" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="22" OriginVertexId="18" TerminusVertexId="16">
-				<OriginPoint x="604" y="193"/>
-				<TerminusPoint x="486" y="258"/>
-				<Properties/>
+				<OriginPoint x="604" y="193" />
+				<TerminusPoint x="486" y="258" />
+				<Properties />
 			</NextDef>
 			<NextDef ID="19" OriginVertexId="14" TerminusVertexId="5">
-				<OriginPoint x="413" y="49"/>
-				<TerminusPoint x="340" y="120"/>
-				<Properties/>
+				<OriginPoint x="413" y="49" />
+				<TerminusPoint x="340" y="120" />
+				<Properties />
 			</NextDef>
 			<NextDef ID="21" OriginVertexId="15" TerminusVertexId="18">
-				<OriginPoint x="485" y="120"/>
-				<TerminusPoint x="604" y="193"/>
-				<Properties/>
+				<OriginPoint x="485" y="120" />
+				<TerminusPoint x="604" y="193" />
+				<Properties />
 			</NextDef>
 			<NextDef ID="9" OriginVertexId="3" TerminusVertexId="6">
-				<OriginPoint x="337" y="258"/>
-				<TerminusPoint x="411" y="336"/>
+				<OriginPoint x="337" y="258" />
+				<TerminusPoint x="411" y="336" />
 				<Properties>
-					<KeyValuePair Key="Alias" String="false"/>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="20" OriginVertexId="14" TerminusVertexId="15">
-				<OriginPoint x="413" y="49"/>
-				<TerminusPoint x="485" y="120"/>
-				<Properties/>
+				<OriginPoint x="413" y="49" />
+				<TerminusPoint x="485" y="120" />
+				<Properties />
 			</NextDef>
 			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="5">
-				<OriginPoint x="337" y="258"/>
-				<TerminusPoint x="340" y="120"/>
+				<OriginPoint x="337" y="258" />
+				<TerminusPoint x="340" y="120" />
 				<Properties>
-					<KeyValuePair Key="Alias" String="true"/>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true" />
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="13" OriginVertexId="10" TerminusVertexId="3">
-				<OriginPoint x="202" y="196"/>
-				<TerminusPoint x="337" y="258"/>
+				<OriginPoint x="202" y="196" />
+				<TerminusPoint x="337" y="258" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 			<NextDef ID="12" OriginVertexId="5" TerminusVertexId="10">
-				<OriginPoint x="340" y="120"/>
-				<TerminusPoint x="202" y="196"/>
+				<OriginPoint x="340" y="120" />
+				<TerminusPoint x="202" y="196" />
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Type" String="Straight" />
 				</Properties>
 			</NextDef>
 		</GraphModelCastorData>
 	</childrenGraphModel>
 	<Properties>
-		<KeyValuePair Key="Description" String=""/>
-		<KeyValuePair Key="Ignorable" Boolean="false"/>
-		<KeyValuePair Key="ScriptVersion" String=""/>
-		<KeyValuePair Key="Mail Message" String=""/>
-		<KeyValuePair Key="Agent Name" String=""/>
-		<KeyValuePair Key="Viewpoint" String=""/>
-		<KeyValuePair Key="SchemaVersion" String=""/>
-		<KeyValuePair Key="Skippable" Boolean="false"/>
-		<KeyValuePair Key="ScriptName" String=""/>
-		<KeyValuePair Key="Mail event" String=""/>
-		<KeyValuePair Key="Breakpoint" Boolean="false"/>
-		<KeyValuePair Key="Autostart" Boolean="true"/>
-		<KeyValuePair Key="Repeatable" Boolean="false"/>
-		<KeyValuePair Key="Agent Role" String=""/>
-		<KeyValuePair Key="Show time" Boolean="true"/>
-		<KeyValuePair Key="SchemaType" String=""/>
+		<KeyValuePair Key="Description" String="" />
+		<KeyValuePair Key="Ignorable" Boolean="false" />
+		<KeyValuePair Key="ScriptVersion" String="" />
+		<KeyValuePair Key="Mail Message" String="" />
+		<KeyValuePair Key="Agent Name" String="" />
+		<KeyValuePair Key="Viewpoint" String="" />
+		<KeyValuePair Key="SchemaVersion" String="" />
+		<KeyValuePair Key="Skippable" Boolean="false" />
+		<KeyValuePair Key="ScriptName" String="" />
+		<KeyValuePair Key="Mail event" String="" />
+		<KeyValuePair Key="Breakpoint" Boolean="false" />
+		<KeyValuePair Key="Autostart" Boolean="true" />
+		<KeyValuePair Key="Repeatable" Boolean="false" />
+		<KeyValuePair Key="Agent Role" String="" />
+		<KeyValuePair Key="Show time" Boolean="true" />
+		<KeyValuePair Key="SchemaType" String="" />
 	</Properties>
 </CompositeActivityDef>
\ No newline at end of file
diff --git a/src/main/resources/boot/EA/CreateItem.xml b/src/main/resources/boot/EA/CreateItem.xml
index d54cd4d..a3133bd 100644
--- a/src/main/resources/boot/EA/CreateItem.xml
+++ b/src/main/resources/boot/EA/CreateItem.xml
@@ -1,20 +1,25 @@
-<ActivityDef ID="-1" Name="CreateItem" Height="0" Width="0" IsLayoutable="false" IsComposite="false">
+<ActivityDef ID="-1" Name="CreateItem" Height="0" Width="0"
+	IsLayoutable="false" IsComposite="false">
 	<Properties>
-		<KeyValuePair Key="Description" String="Create a new Item from this Description"/>
-		<KeyValuePair Key="Ignorable" Boolean="false"/>
-		<KeyValuePair Key="ScriptVersion" String="0"/>
-		<KeyValuePair Key="Mail Message" String=""/>
-		<KeyValuePair Key="Viewpoint" String=""/>
-		<KeyValuePair Key="Agent Name" String=""/>
-		<KeyValuePair Key="SchemaVersion" String="0"/>
-		<KeyValuePair Key="Skippable" Boolean="false"/>
-		<KeyValuePair Key="ScriptName" String="InstantiateItem"/>
-		<KeyValuePair Key="Mail event" String=""/>
-		<KeyValuePair Key="Autostart" Boolean="true"/>
-		<KeyValuePair Key="Repeatable" Boolean="false"/>
-		<KeyValuePair Key="Show time" Boolean="true"/>
-		<KeyValuePair Key="Agent Role" String=""/>
-		<KeyValuePair Key="AlwaysUseOutcome" Boolean="false"/>
-		<KeyValuePair Key="SchemaType" String="NewDevObjectDef"/>
+		<KeyValuePair Key="Description"
+			String="Create a new Item from this Description" />
+		<KeyValuePair Key="Ignorable" Boolean="false" />
+		<KeyValuePair Key="ScriptVersion" String="0" />
+		<KeyValuePair Key="Mail Message" String="" />
+		<KeyValuePair Key="Agent Name" String="" />
+		<KeyValuePair Key="Viewpoint" String="" />
+		<KeyValuePair Key="Skippable" Boolean="false" />
+		<KeyValuePair Key="SchemaVersion" String="0" />
+		<KeyValuePair Key="ScriptName" String="InstantiateItem" />
+		<KeyValuePair Key="Mail event" String="" />
+		<KeyValuePair Key="Breakpoint" Boolean="false" />
+		<KeyValuePair Key="Repeatable" Boolean="false" />
+		<KeyValuePair Key="StateMachineVersion" Integer="0" />
+		<KeyValuePair Key="Autostart" Boolean="true" />
+		<KeyValuePair Key="Show time" Boolean="true" />
+		<KeyValuePair Key="Agent Role" String="" />
+		<KeyValuePair Key="AlwaysUseOutcome" Boolean="false" />
+		<KeyValuePair Key="StateMachineName" String="Default" />
+		<KeyValuePair Key="SchemaType" String="NewDevObjectDef" />
 	</Properties>
-</ActivityDef>
+</ActivityDef>
\ No newline at end of file
diff --git a/src/main/resources/boot/EA/CreateNewLocalObjectDef.xml b/src/main/resources/boot/EA/CreateNewLocalObjectDef.xml
index 840c32d..bb36588 100644
--- a/src/main/resources/boot/EA/CreateNewLocalObjectDef.xml
+++ b/src/main/resources/boot/EA/CreateNewLocalObjectDef.xml
@@ -1,19 +1,21 @@
-<ActivityDef ID="11" Name="CreateNewLocalObjectDef" Height="0" Width="0" IsLayoutable="false" IsComposite="false">
+<ActivityDef ID="11" Name="CreateNewLocalObjectDef" Height="0"
+	Width="0" IsLayoutable="false" IsComposite="false">
 	<Properties>
-		<KeyValuePair Key="Repeatable" Boolean="false"/>
-		<KeyValuePair Key="Agent Name" String=""/>
-		<KeyValuePair Key="Autostart" Boolean="true"/>
-		<KeyValuePair Key="Mail Message" String=""/>
-		<KeyValuePair Key="Mail event" String=""/>
-		<KeyValuePair Key="Description" String="Create a new C2KLocalObject Definition"/>
-		<KeyValuePair Key="SchemaVersion" String="0"/>
-		<KeyValuePair Key="Show time" Boolean="true"/>
-		<KeyValuePair Key="Viewpoint" String=""/>
-		<KeyValuePair Key="Agent Role" String="Admin"/>
-		<KeyValuePair Key="SchemaType" String="NewDevObjectDef"/>
-		<KeyValuePair Key="ScriptName" String="LocalObjectDefCreator"/>
-		<KeyValuePair Key="Ignorable" Boolean="false"/>
-		<KeyValuePair Key="ScriptVersion" String="0"/>
-		<KeyValuePair Key="Skippable" Boolean="false"/>
+		<KeyValuePair Key="Repeatable" Boolean="false" />
+		<KeyValuePair Key="Agent Name" String="" />
+		<KeyValuePair Key="Autostart" Boolean="true" />
+		<KeyValuePair Key="Mail Message" String="" />
+		<KeyValuePair Key="Mail event" String="" />
+		<KeyValuePair Key="Description"
+			String="Create a new C2KLocalObject Definition" />
+		<KeyValuePair Key="SchemaVersion" String="0" />
+		<KeyValuePair Key="Show time" Boolean="true" />
+		<KeyValuePair Key="Viewpoint" String="" />
+		<KeyValuePair Key="Agent Role" String="Admin" />
+		<KeyValuePair Key="SchemaType" String="NewDevObjectDef" />
+		<KeyValuePair Key="ScriptName" String="LocalObjectDefCreator" />
+		<KeyValuePair Key="Ignorable" Boolean="false" />
+		<KeyValuePair Key="ScriptVersion" String="0" />
+		<KeyValuePair Key="Skippable" Boolean="false" />
 	</Properties>
 </ActivityDef>
diff --git a/src/main/resources/boot/EA/EditModuleAgents.xml b/src/main/resources/boot/EA/EditModuleAgents.xml
new file mode 100644
index 0000000..6f2aa3f
--- /dev/null
+++ b/src/main/resources/boot/EA/EditModuleAgents.xml
@@ -0,0 +1,17 @@
+<ActivityDef ID="-1" Name="EditModuleAgents" Height="0"
+	Width="0" IsLayoutable="false" IsComposite="false">
+	<Properties>
+		<KeyValuePair Key="StateMachineVersion" Integer="0" />
+		<KeyValuePair Key="Description" String="" />
+		<KeyValuePair Key="Agent Role" String="" />
+		<KeyValuePair Key="Show time" Boolean="true" />
+		<KeyValuePair Key="ScriptVersion" String="" />
+		<KeyValuePair Key="Viewpoint" String="" />
+		<KeyValuePair Key="Agent Name" String="" />
+		<KeyValuePair Key="StateMachineName" String="Default" />
+		<KeyValuePair Key="SchemaVersion" String="0" />
+		<KeyValuePair Key="ScriptName" String="" />
+		<KeyValuePair Key="Breakpoint" Boolean="false" />
+		<KeyValuePair Key="SchemaType" String="ModuleAgents" />
+	</Properties>
+</ActivityDef>
\ No newline at end of file
diff --git a/src/main/resources/boot/EA/EditModuleConfiguration.xml b/src/main/resources/boot/EA/EditModuleConfiguration.xml
new file mode 100644
index 0000000..98b1fcb
--- /dev/null
+++ b/src/main/resources/boot/EA/EditModuleConfiguration.xml
@@ -0,0 +1,17 @@
+<ActivityDef ID="-1" Name="EditModuleConfiguration" Height="0"
+	Width="0" IsLayoutable="false" IsComposite="false">
+	<Properties>
+		<KeyValuePair Key="StateMachineVersion" Integer="0" />
+		<KeyValuePair Key="Description" String="" />
+		<KeyValuePair Key="Agent Role" String="" />
+		<KeyValuePair Key="Show time" Boolean="true" />
+		<KeyValuePair Key="ScriptVersion" String="" />
+		<KeyValuePair Key="Viewpoint" String="" />
+		<KeyValuePair Key="Agent Name" String="" />
+		<KeyValuePair Key="StateMachineName" String="Default" />
+		<KeyValuePair Key="SchemaVersion" String="0" />
+		<KeyValuePair Key="ScriptName" String="" />
+		<KeyValuePair Key="Breakpoint" Boolean="false" />
+		<KeyValuePair Key="SchemaType" String="ModuleProperties" />
+	</Properties>
+</ActivityDef>
\ No newline at end of file
diff --git a/src/main/resources/boot/EA/EditPropertyDescription.xml b/src/main/resources/boot/EA/EditPropertyDescription.xml
index 2cbf763..ea4d1bf 100644
--- a/src/main/resources/boot/EA/EditPropertyDescription.xml
+++ b/src/main/resources/boot/EA/EditPropertyDescription.xml
@@ -1,20 +1,22 @@
-<ActivityDef ID="-1" Name="EditPropertyDescription" Height="0" Width="0" IsLayoutable="false" IsComposite="false">
+<ActivityDef ID="-1" Name="EditPropertyDescription" Height="0"
+	Width="0" IsLayoutable="false" IsComposite="false">
 	<Properties>
-		<KeyValuePair Key="Description" String="Set the initial properties for new instances."/>
-		<KeyValuePair Key="Ignorable" Boolean="false"/>
-		<KeyValuePair Key="ScriptVersion" String=""/>
-		<KeyValuePair Key="Mail Message" String=""/>
-		<KeyValuePair Key="Viewpoint" String="last"/>
-		<KeyValuePair Key="Agent Name" String=""/>
-		<KeyValuePair Key="SchemaVersion" String="0"/>
-		<KeyValuePair Key="Skippable" Boolean="false"/>
-		<KeyValuePair Key="ScriptName" String=""/>
-		<KeyValuePair Key="Mail event" String=""/>
-		<KeyValuePair Key="Autostart" Boolean="true"/>
-		<KeyValuePair Key="Repeatable" Boolean="false"/>
-		<KeyValuePair Key="Show time" Boolean="true"/>
-		<KeyValuePair Key="Agent Role" String=""/>
-		<KeyValuePair Key="AlwaysUseOutcome" Boolean="false"/>
-		<KeyValuePair Key="SchemaType" String="PropertyDescription"/>
+		<KeyValuePair Key="Description"
+			String="Set the initial properties for new instances." />
+		<KeyValuePair Key="Ignorable" Boolean="false" />
+		<KeyValuePair Key="ScriptVersion" String="" />
+		<KeyValuePair Key="Mail Message" String="" />
+		<KeyValuePair Key="Viewpoint" String="last" />
+		<KeyValuePair Key="Agent Name" String="" />
+		<KeyValuePair Key="SchemaVersion" String="0" />
+		<KeyValuePair Key="Skippable" Boolean="false" />
+		<KeyValuePair Key="ScriptName" String="" />
+		<KeyValuePair Key="Mail event" String="" />
+		<KeyValuePair Key="Autostart" Boolean="true" />
+		<KeyValuePair Key="Repeatable" Boolean="false" />
+		<KeyValuePair Key="Show time" Boolean="true" />
+		<KeyValuePair Key="Agent Role" String="" />
+		<KeyValuePair Key="AlwaysUseOutcome" Boolean="false" />
+		<KeyValuePair Key="SchemaType" String="PropertyDescription" />
 	</Properties>
 </ActivityDef>
diff --git a/src/main/resources/boot/EA/ExportModule.xml b/src/main/resources/boot/EA/ExportModule.xml
new file mode 100644
index 0000000..e7cc037
--- /dev/null
+++ b/src/main/resources/boot/EA/ExportModule.xml
@@ -0,0 +1,17 @@
+<ActivityDef ID="-1" Name="ExportModule" Height="0" Width="0"
+	IsLayoutable="false" IsComposite="false">
+	<Properties>
+		<KeyValuePair Key="StateMachineVersion" Integer="0" />
+		<KeyValuePair Key="Description" String="" />
+		<KeyValuePair Key="Agent Role" String="" />
+		<KeyValuePair Key="Show time" Boolean="true" />
+		<KeyValuePair Key="ScriptVersion" String="0" />
+		<KeyValuePair Key="Viewpoint" String="" />
+		<KeyValuePair Key="Agent Name" String="" />
+		<KeyValuePair Key="StateMachineName" String="Default" />
+		<KeyValuePair Key="SchemaVersion" String="0" />
+		<KeyValuePair Key="ScriptName" String="CreateModuleJar" />
+		<KeyValuePair Key="Breakpoint" Boolean="false" />
+		<KeyValuePair Key="SchemaType" String="ModuleExportPath" />
+	</Properties>
+</ActivityDef>
\ No newline at end of file
diff --git a/src/main/resources/boot/EA/SetInstanceWorkflow.xml b/src/main/resources/boot/EA/SetInstanceWorkflow.xml
index a9e7d7b..c589a74 100644
--- a/src/main/resources/boot/EA/SetInstanceWorkflow.xml
+++ b/src/main/resources/boot/EA/SetInstanceWorkflow.xml
@@ -1,20 +1,22 @@
-<ActivityDef ID="-1" Name="SetInstanceWorkflow" Height="0" Width="0" IsLayoutable="false" IsComposite="false">
+<ActivityDef ID="-1" Name="SetInstanceWorkflow" Height="0"
+	Width="0" IsLayoutable="false" IsComposite="false">
 	<Properties>
-		<KeyValuePair Key="Description" String="Choose a CompositeActivityDefinition to use for the workflow of new instances"/>
-		<KeyValuePair Key="Ignorable" Boolean="false"/>
-		<KeyValuePair Key="ScriptVersion" String="0"/>
-		<KeyValuePair Key="Mail Message" String=""/>
-		<KeyValuePair Key="Viewpoint" String="last"/>
-		<KeyValuePair Key="Agent Name" String=""/>
-		<KeyValuePair Key="SchemaVersion" String="0"/>
-		<KeyValuePair Key="Skippable" Boolean="false"/>
-		<KeyValuePair Key="ScriptName" String="SetWorkflow"/>
-		<KeyValuePair Key="Mail event" String=""/>
-		<KeyValuePair Key="Autostart" Boolean="true"/>
-		<KeyValuePair Key="Repeatable" Boolean="false"/>
-		<KeyValuePair Key="Show time" Boolean="true"/>
-		<KeyValuePair Key="Agent Role" String=""/>
-		<KeyValuePair Key="AlwaysUseOutcome" Boolean="false"/>
-		<KeyValuePair Key="SchemaType" String="ChooseWorkflow"/>
+		<KeyValuePair Key="Description"
+			String="Choose a CompositeActivityDefinition to use for the workflow of new instances" />
+		<KeyValuePair Key="Ignorable" Boolean="false" />
+		<KeyValuePair Key="ScriptVersion" String="0" />
+		<KeyValuePair Key="Mail Message" String="" />
+		<KeyValuePair Key="Viewpoint" String="last" />
+		<KeyValuePair Key="Agent Name" String="" />
+		<KeyValuePair Key="SchemaVersion" String="0" />
+		<KeyValuePair Key="Skippable" Boolean="false" />
+		<KeyValuePair Key="ScriptName" String="SetWorkflow" />
+		<KeyValuePair Key="Mail event" String="" />
+		<KeyValuePair Key="Autostart" Boolean="true" />
+		<KeyValuePair Key="Repeatable" Boolean="false" />
+		<KeyValuePair Key="Show time" Boolean="true" />
+		<KeyValuePair Key="Agent Role" String="" />
+		<KeyValuePair Key="AlwaysUseOutcome" Boolean="false" />
+		<KeyValuePair Key="SchemaType" String="ChooseWorkflow" />
 	</Properties>
 </ActivityDef>
diff --git a/src/main/resources/boot/OD/ChooseWorkflow.xsd b/src/main/resources/boot/OD/ChooseWorkflow.xsd
index 1fb6238..fa9ac1f 100644
--- a/src/main/resources/boot/OD/ChooseWorkflow.xsd
+++ b/src/main/resources/boot/OD/ChooseWorkflow.xsd
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified">
 	<xs:element name="ChooseWorkflow">
 		<xs:complexType>
 			<xs:sequence>
 				<xs:element name="WorkflowDefinitionName" type="xs:string">
 					<xs:annotation>
-						<xs:documentation>Give the name of the composite activity description that you would like new instance of this description to run.</xs:documentation>
+						<xs:documentation>Give the name of the composite activity
+							description that you would like new instance of this description
+							to run.</xs:documentation>
 					</xs:annotation>
 				</xs:element>
 				<xs:element name="WorkflowDefinitionVersion" type="xs:string">
 					<xs:annotation>
-						<xs:documentation>Give the version of this activity that you would like to use.</xs:documentation>
+						<xs:documentation>Give the version of this activity that you would
+							like to use.</xs:documentation>
 					</xs:annotation>
 				</xs:element>
 			</xs:sequence>
diff --git a/src/main/resources/boot/OD/ItemCanvas.xsd b/src/main/resources/boot/OD/ItemCanvas.xsd
index 12aefaf..e5fd454 100644
--- a/src/main/resources/boot/OD/ItemCanvas.xsd
+++ b/src/main/resources/boot/OD/ItemCanvas.xsd
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
 	<xs:element name="ItemCanvas">
 		<xs:complexType>
 			<xs:sequence>
@@ -12,21 +13,21 @@
 				<xs:element name="CollectionVertex">
 					<xs:complexType>
 						<xs:sequence>
-						</xs:sequence>					
-					</xs:complexType>				
+						</xs:sequence>
+					</xs:complexType>
 				</xs:element>
 				<xs:element name="CollectionEdge">
 					<xs:complexType>
 						<xs:sequence>
-							
-						</xs:sequence>					
-					</xs:complexType>				
+
+						</xs:sequence>
+					</xs:complexType>
 				</xs:element>
 				<xs:element name="MemberEdge">
 					<xs:complexType>
 						<xs:sequence>
-						</xs:sequence>					
-					</xs:complexType>				
+						</xs:sequence>
+					</xs:complexType>
 				</xs:element>
 			</xs:sequence>
 		</xs:complexType>
diff --git a/src/main/resources/boot/OD/ModuleAgents.xsd b/src/main/resources/boot/OD/ModuleAgents.xsd
new file mode 100644
index 0000000..81481d4
--- /dev/null
+++ b/src/main/resources/boot/OD/ModuleAgents.xsd
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:element name="ModuleAgents">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="Role" maxOccurs="unbounded" minOccurs="0">
+					<xs:complexType>
+						<xs:simpleContent>
+							<xs:extension base="xs:string">
+								<xs:attribute name="jobList" type="xs:boolean" use="required" />
+							</xs:extension>
+						</xs:simpleContent>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="Agent" minOccurs="0" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="Role" type="xs:string" maxOccurs="unbounded" />
+							<xs:element name="Property" type="property" minOccurs="0"
+								maxOccurs="unbounded" />
+						</xs:sequence>
+						<xs:attribute name="name" type="xs:string" use="required" />
+						<xs:attribute name="password" type="xs:string" use="required" />
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:complexType name="property">
+		<xs:simpleContent>
+			<xs:extension base="xs:string">
+				<xs:attribute name="name" type="xs:string" />
+				<xs:attribute name="mutable" type="xs:boolean" default="true"
+					use="optional" />
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+</xs:schema>
diff --git a/src/main/resources/boot/OD/ModuleExportPath.xsd b/src/main/resources/boot/OD/ModuleExportPath.xsd
new file mode 100644
index 0000000..00bc3b0
--- /dev/null
+++ b/src/main/resources/boot/OD/ModuleExportPath.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:element name="ModuleExportPath">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="Path" type="xs:string" maxOccurs="1"
+					minOccurs="1" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/src/main/resources/boot/OD/ModuleProperties.xsd b/src/main/resources/boot/OD/ModuleProperties.xsd
new file mode 100644
index 0000000..b79f49d
--- /dev/null
+++ b/src/main/resources/boot/OD/ModuleProperties.xsd
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:element name="ModuleProperties">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="Info">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="Description" type="xs:string" />
+							<xs:element name="Version" type="xs:string" />
+							<xs:element name="Dependency" type="xs:string"
+								minOccurs="0" maxOccurs="unbounded" />
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="ResourceURL" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="Config" minOccurs="0" maxOccurs="unbounded">
+					<xs:annotation>
+						<xs:documentation>Configuration parameters to add to the Cristal
+							VM on launch. May target either client or server processes.
+						</xs:documentation>
+					</xs:annotation>
+					<xs:complexType>
+						<xs:simpleContent>
+							<xs:extension base="xs:string">
+								<xs:attribute name="name" type="xs:string" use="required" />
+								<xs:attribute ref="target" />
+							</xs:extension>
+						</xs:simpleContent>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="Script" minOccurs="0" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:simpleContent>
+							<xs:extension base="xs:string">
+								<xs:attribute ref="event" />
+								<xs:attribute ref="target" />
+								<xs:attribute name="lang" type="xs:string" />
+							</xs:extension>
+						</xs:simpleContent>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="ns" type="xs:string" use="required">
+				<xs:annotation>
+					<xs:documentation>Prefix for module components</xs:documentation>
+				</xs:annotation>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<xs:attribute name="target">
+		<xs:simpleType>
+			<xs:restriction base="xs:string">
+				<xs:enumeration value="client" />
+				<xs:enumeration value="server" />
+			</xs:restriction>
+		</xs:simpleType>
+	</xs:attribute>
+	<xs:attribute name="event">
+		<xs:simpleType>
+			<xs:restriction base="xs:string">
+				<xs:enumeration value="startup" />
+				<xs:enumeration value="shutdown" />
+				<xs:enumeration value="install" />
+				<xs:enumeration value="uninstall" />
+			</xs:restriction>
+		</xs:simpleType>
+	</xs:attribute>
+</xs:schema>
diff --git a/src/main/resources/boot/OD/New.xsd b/src/main/resources/boot/OD/New.xsd
index 4c5f783..4428f3a 100644
--- a/src/main/resources/boot/OD/New.xsd
+++ b/src/main/resources/boot/OD/New.xsd
@@ -1,3 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
 </xs:schema>
diff --git a/src/main/resources/boot/OD/NewDevObjectDef.xsd b/src/main/resources/boot/OD/NewDevObjectDef.xsd
index 637581e..2176828 100644
--- a/src/main/resources/boot/OD/NewDevObjectDef.xsd
+++ b/src/main/resources/boot/OD/NewDevObjectDef.xsd
@@ -1,20 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2006 sp1 U (http://www.altova.com) by Andrew Branson (CERN) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<!-- edited with XMLSpy v2006 sp1 U (http://www.altova.com) by Andrew Branson 
+	(CERN) -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
 	<xs:element name="NewDevObjectDef">
 		<xs:complexType>
 			<xs:sequence>
 				<xs:element name="ObjectName" type="xs:string">
 					<xs:annotation>
-						<xs:documentation>Please give a name for your new object.</xs:documentation>
+						<xs:documentation>Please give a name for your new object.
+						</xs:documentation>
 					</xs:annotation>
 				</xs:element>
 				<xs:element name="SubFolder" type="xs:string">
 					<xs:annotation>
-						<xs:documentation>If you want to  store your object in a subfolder, give the subpath here.</xs:documentation>
+						<xs:documentation>If you want to store your object in a subfolder,
+							give the subpath here.</xs:documentation>
 					</xs:annotation>
 				</xs:element>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/src/main/resources/boot/OD/NewLocalObjectDef.xsd b/src/main/resources/boot/OD/NewLocalObjectDef.xsd
index 0186872..2df4037 100644
--- a/src/main/resources/boot/OD/NewLocalObjectDef.xsd
+++ b/src/main/resources/boot/OD/NewLocalObjectDef.xsd
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2006 sp1 U (http://www.altova.com) by Andrew Branson (CERN) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<!-- edited with XMLSpy v2006 sp1 U (http://www.altova.com) by Andrew Branson 
+	(CERN) -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
 	<xs:element name="NewLocalObjectDef">
 		<xs:complexType>
 			<xs:sequence>
 				<xs:element name="ObjectName" type="xs:string">
 					<xs:annotation>
-						<xs:documentation>Please give a name for your new object.</xs:documentation>
+						<xs:documentation>Please give a name for your new object.
+						</xs:documentation>
 					</xs:annotation>
 				</xs:element>
 				<xs:element name="SubFolder" type="xs:string">
 					<xs:annotation>
-						<xs:documentation>If you want to  store your object in a subfolder, give the subpath here.</xs:documentation>
+						<xs:documentation>If you want to store your object in a subfolder,
+							give the subpath here.</xs:documentation>
 					</xs:annotation>
 				</xs:element>
 			</xs:sequence>
diff --git a/src/main/resources/boot/SC/InstantiateItem.xml b/src/main/resources/boot/SC/InstantiateItem.xml
index 1ad7b6c..d4920f4 100644
--- a/src/main/resources/boot/SC/InstantiateItem.xml
+++ b/src/main/resources/boot/SC/InstantiateItem.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cristalscript>
-	<output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
-	<script language="javascript" name="InstantiateItem"><![CDATA[
-		importClass(Packages.com.c2kernel.lookup.DomainPath);
-
+<cristalscript>
+	<output name="errors" type="com.c2kernel.scripting.ErrorInfo" />
+	<script language="javascript" name="InstantiateItem"><![CDATA[
+		importClass(Packages.com.c2kernel.lookup.DomainPath);
+
 		// Get parameters from outcome
 		var name = job.getOutcome().getField("ObjectName");
 		var folder = job.getOutcome().getField("SubFolder");
-		var domPath = "/" + (folder != null?folder:"");
-		
		// Create new Item
+		var root = job.getActPropString("Root");
+		var domPath = (root != null?root:"") + "/" + (folder != null?folder:"");
+		
+		// Create new Item
 		var params = new Array(2);
 		params[0] = name;
 		params[1] = domPath;
@@ -18,11 +19,11 @@
 		} catch (e) {
 			throw "Could not create "+name+": "+e.message;
 		}
-		
-		// If this script is running in the Cristal GUI, open the new item.
-		//try {
-		//	Packages.com.c2kernel.gui.MainFrame.treeBrowser.push(new DomainPath(domPath+"/"+name));
-		//} catch (e) { }
-
-		]]></script>
-</cristalscript>
+		
+		// If this script is running in the Cristal GUI, open the new item.
+		//try {
+		//	Packages.com.c2kernel.gui.MainFrame.treeBrowser.push(new DomainPath(domPath+"/"+name));
+		//} catch (e) { }
+
+		]]></script>
+</cristalscript>
\ No newline at end of file
diff --git a/src/main/resources/boot/SC/LocalObjectDefCreator.xml b/src/main/resources/boot/SC/LocalObjectDefCreator.xml
index d47789d..de082dc 100644
--- a/src/main/resources/boot/SC/LocalObjectDefCreator.xml
+++ b/src/main/resources/boot/SC/LocalObjectDefCreator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cristalscript>
-	<output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
+	<output name="errors" type="com.c2kernel.scripting.ErrorInfo" />
 	<script language="javascript" name="LocalObjectDefCreator"><![CDATA[
 		importClass(Packages.com.c2kernel.process.Gateway);
 		importClass(Packages.com.c2kernel.process.Bootstrap);
diff --git a/src/main/resources/boot/SC/New.xml b/src/main/resources/boot/SC/New.xml
index a07a7b9..385f410 100644
--- a/src/main/resources/boot/SC/New.xml
+++ b/src/main/resources/boot/SC/New.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cristalscript>
-	<output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
+	<output name="errors" type="com.c2kernel.scripting.ErrorInfo" />
 	<script language="javascript" name=""><![CDATA[
 
 		]]></script>
diff --git a/src/main/resources/boot/SC/SetWorkflow.xml b/src/main/resources/boot/SC/SetWorkflow.xml
index 684b813..704d732 100644
--- a/src/main/resources/boot/SC/SetWorkflow.xml
+++ b/src/main/resources/boot/SC/SetWorkflow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cristalscript>
-	<output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
+	<output name="errors" type="com.c2kernel.scripting.ErrorInfo" />
 	<script language="javascript" name="SetWorkflow"><![CDATA[
 
		importClass(Packages.com.c2kernel.lookup.DomainPath);
 
diff --git a/src/main/resources/boot/property/CAProp.xml b/src/main/resources/boot/property/CAProp.xml
index d5b2bea..acd6b90 100644
--- a/src/main/resources/boot/property/CAProp.xml
+++ b/src/main/resources/boot/property/CAProp.xml
@@ -1,5 +1,8 @@
 <AllProperties>
-	<PropertyDescription Name="Name" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>
-	<PropertyDescription Name="Complexity" IsClassIdentifier="true" DefaultValue="Composite" IsMutable="false"/>
-	<PropertyDescription Name="Type" IsClassIdentifier="true" DefaultValue="ActivityDesc" IsMutable="false"/>
+	<PropertyDescription Name="Name" IsClassIdentifier="false"
+		DefaultValue="" IsMutable="false" />
+	<PropertyDescription Name="Complexity"
+		IsClassIdentifier="true" DefaultValue="Composite" IsMutable="false" />
+	<PropertyDescription Name="Type" IsClassIdentifier="true"
+		DefaultValue="ActivityDesc" IsMutable="false" />
 </AllProperties>
diff --git a/src/main/resources/boot/property/DescProp.xml b/src/main/resources/boot/property/DescProp.xml
index f092d1d..bfe02df 100644
--- a/src/main/resources/boot/property/DescProp.xml
+++ b/src/main/resources/boot/property/DescProp.xml
@@ -1,4 +1,6 @@
 <AllProperties>
-	<PropertyDescription DefaultValue="" IsClassIdentifier="false" IsMutable="true" Name="Name" />
-	<PropertyDescription DefaultValue="ItemDescription"	IsClassIdentifier="true" IsMutable="false" Name="Type" />
+	<PropertyDescription DefaultValue=""
+		IsClassIdentifier="false" IsMutable="true" Name="Name" />
+	<PropertyDescription DefaultValue="ItemDescription"
+		IsClassIdentifier="true" IsMutable="false" Name="Type" />
 </AllProperties>
\ No newline at end of file
diff --git a/src/main/resources/boot/property/EAProp.xml b/src/main/resources/boot/property/EAProp.xml
index 2500a86..aced7f3 100644
--- a/src/main/resources/boot/property/EAProp.xml
+++ b/src/main/resources/boot/property/EAProp.xml
@@ -1,5 +1,8 @@
 <AllProperties>
-	<PropertyDescription Name="Name" IsClassIdentifier="false" DefaultValue="" IsMutable="true"/>
-	<PropertyDescription Name="Complexity" IsClassIdentifier="true" DefaultValue="Elementary" IsMutable="false"/>
-	<PropertyDescription Name="Type" IsClassIdentifier="true" DefaultValue="ActivityDesc" IsMutable="false"/>
+	<PropertyDescription Name="Name" IsClassIdentifier="false"
+		DefaultValue="" IsMutable="true" />
+	<PropertyDescription Name="Complexity"
+		IsClassIdentifier="true" DefaultValue="Elementary" IsMutable="false" />
+	<PropertyDescription Name="Type" IsClassIdentifier="true"
+		DefaultValue="ActivityDesc" IsMutable="false" />
 </AllProperties>
diff --git a/src/main/resources/boot/property/ModuleProp.xml b/src/main/resources/boot/property/ModuleProp.xml
new file mode 100644
index 0000000..aafb131
--- /dev/null
+++ b/src/main/resources/boot/property/ModuleProp.xml
@@ -0,0 +1,10 @@
+<AllProperties>
+	<PropertyDescription DefaultValue=""
+		IsClassIdentifier="false" IsMutable="true" Name="Name" />
+	<PropertyDescription DefaultValue=""
+		IsClassIdentifier="false" IsMutable="true" Name="Version" />
+	<PropertyDescription DefaultValue=""
+		IsClassIdentifier="false" IsMutable="true" Name="Namespace" />
+	<PropertyDescription DefaultValue="Module"
+		IsClassIdentifier="true" IsMutable="false" Name="Type" />
+</AllProperties>
\ No newline at end of file
diff --git a/src/main/resources/boot/property/ODProp.xml b/src/main/resources/boot/property/ODProp.xml
index 2ade1de..bd7257d 100644
--- a/src/main/resources/boot/property/ODProp.xml
+++ b/src/main/resources/boot/property/ODProp.xml
@@ -1,5 +1,8 @@
 <AllProperties>
-	<PropertyDescription Name="Name" IsClassIdentifier="false" DefaultValue="" IsMutable="true"/>
-	<PropertyDescription Name="Type" IsClassIdentifier="true" DefaultValue="OutcomeDesc" IsMutable="false"/>
-	<PropertyDescription Name="Breakapart" IsClassIdentifier="false" DefaultValue="0" IsMutable="false"/>
+	<PropertyDescription Name="Name" IsClassIdentifier="false"
+		DefaultValue="" IsMutable="true" />
+	<PropertyDescription Name="Type" IsClassIdentifier="true"
+		DefaultValue="OutcomeDesc" IsMutable="false" />
+	<PropertyDescription Name="Breakapart"
+		IsClassIdentifier="false" DefaultValue="0" IsMutable="false" />
 </AllProperties>
diff --git a/src/main/resources/boot/property/SCProp.xml b/src/main/resources/boot/property/SCProp.xml
index 3bb1e7b..f1f586f 100644
--- a/src/main/resources/boot/property/SCProp.xml
+++ b/src/main/resources/boot/property/SCProp.xml
@@ -1,4 +1,6 @@
 <AllProperties>
-	<PropertyDescription Name="Name" IsClassIdentifier="false" DefaultValue="" IsMutable="true"/>
-	<PropertyDescription Name="Type" IsClassIdentifier="true" DefaultValue="Script" IsMutable="false"/>
+	<PropertyDescription Name="Name" IsClassIdentifier="false"
+		DefaultValue="" IsMutable="true" />
+	<PropertyDescription Name="Type" IsClassIdentifier="true"
+		DefaultValue="Script" IsMutable="false" />
 </AllProperties>
diff --git a/src/main/resources/module.xml b/src/main/resources/module.xml
index 2869639..45cb984 100644
--- a/src/main/resources/module.xml
+++ b/src/main/resources/module.xml
@@ -7,23 +7,31 @@
 	<ResourceURL>uk/ac/uwe/cristaldev/resources/</ResourceURL>
     <Config name="Module.debug">true</Config>
 	<Imports>
-		<Resource name="NewLocalObjectDef" type="OD">boot/OD/NewLocalObjectDef.xsd</Resource>
-		<Resource name="NewDevObjectDef" type="OD">boot/OD/NewDevObjectDef.xsd</Resource>
-		<Resource name="ChooseWorkflow" type="OD">boot/OD/ChooseWorkflow.xsd</Resource>
-		<Resource name="CreateNewLocalObjectDef" type="EA">boot/EA/CreateNewLocalObjectDef.xml</Resource>
-		<Resource name="EditPropertyDescription" type="EA">boot/EA/EditPropertyDescription.xml</Resource>
-		<Resource name="CreateItem" type="EA">boot/EA/CreateItem.xml</Resource>
-		<Resource name="SetInstanceWorkflow" type="EA">boot/EA/SetInstanceWorkflow.xml</Resource>
-		<Resource name="CompositeActivityFactory" type="CA">boot/CA/CompositeActivityFactory.xml</Resource>
-		<Resource name="ElementaryActivityFactory" type="CA">boot/CA/ElementaryActivityFactory.xml</Resource>
-		<Resource name="SchemaFactoryWf" type="CA">boot/CA/SchemaFactoryWf.xml</Resource>
-		<Resource name="ScriptFactoryWf" type="CA">boot/CA/ScriptFactoryWf.xml</Resource>
-		<Resource name="ItemDescriptionWf" type="CA">boot/CA/ItemDescriptionWf.xml</Resource>
-		<Resource name="ItemDescriptionFactoryWf" type="CA">boot/CA/ItemDescriptionFactoryWf.xml</Resource>
-		<Resource name="ReadOnlyItemDescriptionWf" type="CA">boot/CA/ReadOnlyItemDescriptionWf.xml</Resource>
-		<Resource name="LocalObjectDefCreator" type="SC">boot/SC/LocalObjectDefCreator.xml</Resource>
-		<Resource name="InstantiateItem" type="SC">boot/SC/InstantiateItem.xml</Resource>
-		<Resource name="SetWorkflow" type="SC">boot/SC/SetWorkflow.xml</Resource>
+		<Resource name="NewLocalObjectDef" version="0" type="OD">boot/OD/NewLocalObjectDef.xsd</Resource>
+		<Resource name="NewDevObjectDef" version="0" type="OD">boot/OD/NewDevObjectDef.xsd</Resource>
+		<Resource name="ChooseWorkflow" version="0" type="OD">boot/OD/ChooseWorkflow.xsd</Resource>
+		<Resource name="CreateNewLocalObjectDef" version="0" type="EA">boot/EA/CreateNewLocalObjectDef.xml</Resource>
+		<Resource name="EditPropertyDescription" version="0" type="EA">boot/EA/EditPropertyDescription.xml</Resource>
+		<Resource name="CreateItem" version="0" type="EA">boot/EA/CreateItem.xml</Resource>
+		<Resource name="SetInstanceWorkflow" version="0" type="EA">boot/EA/SetInstanceWorkflow.xml</Resource>
+		<Resource name="CompositeActivityFactory" version="0" type="CA">boot/CA/CompositeActivityFactory.xml</Resource>
+		<Resource name="ElementaryActivityFactory" version="0" type="CA">boot/CA/ElementaryActivityFactory.xml</Resource>
+		<Resource name="SchemaFactoryWf" version="0" type="CA">boot/CA/SchemaFactoryWf.xml</Resource>
+		<Resource name="ScriptFactoryWf" version="0" type="CA">boot/CA/ScriptFactoryWf.xml</Resource>
+		<Resource name="ItemDescriptionWf" version="0" type="CA">boot/CA/ItemDescriptionWf.xml</Resource>
+		<Resource name="ItemDescriptionFactoryWf" version="0" type="CA">boot/CA/ItemDescriptionFactoryWf.xml</Resource>
+		<Resource name="ReadOnlyItemDescriptionWf" version="0" type="CA">boot/CA/ReadOnlyItemDescriptionWf.xml</Resource>
+		<Resource name="LocalObjectDefCreator" version="0" type="SC">boot/SC/LocalObjectDefCreator.xml</Resource>
+		<Resource name="InstantiateItem" version="0" type="SC">boot/SC/InstantiateItem.xml</Resource>
+		<Resource name="SetWorkflow" version="0" type="SC">boot/SC/SetWorkflow.xml</Resource>
+		<Resource name="ModuleFactory" version="0" type="CA">boot/CA/ModuleFactory.xml</Resource>
+		<Resource name="ModuleExportPath" version="0" type="OD">boot/OD/ModuleExportPath.xsd</Resource>
+		<Resource name="ExportModule" version="0" type="EA">boot/EA/ExportModule.xml</Resource>
+		<Resource name="ModuleAgents" version="0" type="OD">boot/OD/ModuleAgents.xsd</Resource>
+		<Resource name="EditModuleAgents" version="0" type="EA">boot/EA/EditModuleAgents.xml</Resource>
+		<Resource name="ModuleProperties" version="0" type="OD">boot/OD/ModuleProperties.xsd</Resource>
+		<Resource name="EditModuleConfiguration" version="0" type="EA">boot/EA/EditModuleConfiguration.xml</Resource>
+		<Resource name="ModuleDevWorkflow" version="0" type="CA">boot/CA/ModuleDevWorkflow.xml</Resource>
 		<Item name="ScriptFactory" initialPath="/desc/dev" workflow="ScriptFactoryWf">
 			<Property name="LocalObjectType">Script</Property>
 			<Property name="Type">Factory</Property>
@@ -98,6 +106,18 @@
 				<CollectionProperties/>
 			</Dependency>
 		</Item>
+		<Item name="ModuleFactory" initialPath="/desc/dev" workflow="ModuleFactory">
+			<Property name="Type">Factory</Property>
+			<Outcome viewname="last" schema="PropertyDescription" version="0">boot/property/ModuleProp.xml</Outcome>
+			<Dependency name="workflow" isDescription="false">
+				<DependencyMember itemPath="/desc/ActivityDesc/system/dev/ModuleDevWorkflow">
+					<MemberProperties>
+						<KeyValuePair Key="Version" String="0"/>
+					</MemberProperties>
+				</DependencyMember>
+				<CollectionProperties/>
+			</Dependency>
+		</Item>
 		<Role jobList="false">User</Role>
 		<Agent name="dev" password="test">
 			<Role>Admin</Role>
-- 
cgit v1.2.3