diff --git a/li.strolch.agent/src/test/resources/realmtest/data/DefaultRealm.xml b/li.strolch.agent/src/test/resources/realmtest/data/DefaultRealm.xml
index cb2396975..bb8be57e3 100644
--- a/li.strolch.agent/src/test/resources/realmtest/data/DefaultRealm.xml
+++ b/li.strolch.agent/src/test/resources/realmtest/data/DefaultRealm.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel>
-	<Resource Id="TestType" Name="TestType Template" Type="Template">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Resource>
-	<Order Id="Template" Name="MyTestOrder Template" Type="MyTestOrder">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Order>
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+    <Resource Id="TestType" Name="TestType Template" Type="Template">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Resource>
+    <Order Id="Template" Name="MyTestOrder Template" Type="MyTestOrder">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Order>
 
-	<IncludeFile file="Resources.xml" />
-	<IncludeFile file="Orders.xml" />
+    <IncludeFile file="Resources.xml"/>
+    <IncludeFile file="Orders.xml"/>
 
 </StrolchModel>
\ No newline at end of file
diff --git a/li.strolch.agent/src/test/resources/realmtest/data/MyRealm.xml b/li.strolch.agent/src/test/resources/realmtest/data/MyRealm.xml
index 4c9629d8f..3bcf31401 100644
--- a/li.strolch.agent/src/test/resources/realmtest/data/MyRealm.xml
+++ b/li.strolch.agent/src/test/resources/realmtest/data/MyRealm.xml
@@ -1,46 +1,47 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel>
-	<Resource Id="MyRealmRes" Name="Test Name" Type="TestType">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Resource>
-	<Order Id="MyRealmOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="CREATED">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Order>
-	<Activity Id="MyRealmAct" Name="Test Name" Type="TestType" TimeOrdering="Series">
-		<Policies>
-			<Policy Type="PlanningPolicy" Value="key:SimplePlanning" />
-			<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" />
-		</Policies>
-		<Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use">
-			<Policies>
-				<Policy Type="PlanningPolicy" Value="key:SimplePlanning" />
-				<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" />
-			</Policies>
-			<ValueChange StateId="dummyId" Time="2012-11-30T18:12:05.628+01:00" Value="5" Type="Integer" />
-		</Action>
-		<Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series">
-			<Policies>
-				<Policy Type="PlanningPolicy" Value="key:SimplePlanning" />
-				<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" />
-			</Policies>
-			<Action Id="action_2" Name="Action 2" ResourceId="dummyId" ResourceType="dummyType" State="Planned" Type="Use" />
-			<Action Id="action_3" Name="Action 3" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use" />
-		</Activity>
-	</Activity>
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+    <Resource Id="MyRealmRes" Name="Test Name" Type="TestType">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Resource>
+    <Order Id="MyRealmOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="Created">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Order>
+    <Activity Id="MyRealmAct" Name="Test Name" Type="TestType" TimeOrdering="Series">
+        <Policies>
+            <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
+            <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
+        </Policies>
+        <Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use">
+            <Policies>
+                <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
+                <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
+            </Policies>
+            <ValueChange StateId="dummyId" Time="2012-11-30T18:12:05.628+01:00" Value="5" Type="Integer"/>
+        </Action>
+        <Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series">
+            <Policies>
+                <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
+                <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
+            </Policies>
+            <Action Id="action_2" Name="Action 2" ResourceId="dummyId" ResourceType="dummyType" State="Planned" Type="Use"/>
+            <Action Id="action_3" Name="Action 3" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use"/>
+        </Activity>
+    </Activity>
 </StrolchModel>
diff --git a/li.strolch.agent/src/test/resources/realmtest/data/Orders.xml b/li.strolch.agent/src/test/resources/realmtest/data/Orders.xml
index 55358bcaa..be9537285 100644
--- a/li.strolch.agent/src/test/resources/realmtest/data/Orders.xml
+++ b/li.strolch.agent/src/test/resources/realmtest/data/Orders.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel>
-	<Order Id="MyTestOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="CREATED">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Order>
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+    <Order Id="MyTestOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="Created">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Order>
 </StrolchModel>
diff --git a/li.strolch.agent/src/test/resources/realmtest/data/OtherRealm.xml b/li.strolch.agent/src/test/resources/realmtest/data/OtherRealm.xml
index fe81b9865..51464b078 100644
--- a/li.strolch.agent/src/test/resources/realmtest/data/OtherRealm.xml
+++ b/li.strolch.agent/src/test/resources/realmtest/data/OtherRealm.xml
@@ -1,46 +1,47 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel>
-	<Resource Id="OtherRealmRes" Name="Test Name" Type="TestType">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Resource>
-	<Order Id="OtherRealmOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="CREATED">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Order>
-	<Activity Id="OtherRealmAct" Name="Test Name" Type="TestType" TimeOrdering="Series">
-		<Policies>
-			<Policy Type="PlanningPolicy" Value="key:SimplePlanning" />
-			<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" />
-		</Policies>
-		<Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use">
-			<Policies>
-				<Policy Type="PlanningPolicy" Value="key:SimplePlanning" />
-				<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" />
-			</Policies>
-			<ValueChange StateId="dummyId" Time="2012-11-30T18:12:05.628+01:00" Value="5" Type="Integer" />
-		</Action>
-		<Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series">
-			<Policies>
-				<Policy Type="PlanningPolicy" Value="key:SimplePlanning" />
-				<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" />
-			</Policies>
-			<Action Id="action_2" Name="Action 2" ResourceId="dummyId" ResourceType="dummyType" State="Planned" Type="Use" />
-			<Action Id="action_3" Name="Action 3" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use" />
-		</Activity>
-	</Activity>
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+    <Resource Id="OtherRealmRes" Name="Test Name" Type="TestType">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Resource>
+    <Order Id="OtherRealmOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="Created">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Order>
+    <Activity Id="OtherRealmAct" Name="Test Name" Type="TestType" TimeOrdering="Series">
+        <Policies>
+            <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
+            <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
+        </Policies>
+        <Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use">
+            <Policies>
+                <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
+                <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
+            </Policies>
+            <ValueChange StateId="dummyId" Time="2012-11-30T18:12:05.628+01:00" Value="5" Type="Integer"/>
+        </Action>
+        <Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series">
+            <Policies>
+                <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
+                <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
+            </Policies>
+            <Action Id="action_2" Name="Action 2" ResourceId="dummyId" ResourceType="dummyType" State="Planned" Type="Use"/>
+            <Action Id="action_3" Name="Action 3" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use"/>
+        </Activity>
+    </Activity>
 </StrolchModel>
diff --git a/li.strolch.agent/src/test/resources/realmtest/data/Resources.xml b/li.strolch.agent/src/test/resources/realmtest/data/Resources.xml
index e6259cb83..c3bba8703 100644
--- a/li.strolch.agent/src/test/resources/realmtest/data/Resources.xml
+++ b/li.strolch.agent/src/test/resources/realmtest/data/Resources.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel>
-	<Resource Id="MyTestResource" Name="Test Name" Type="TestType">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Resource>
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+    <Resource Id="MyTestResource" Name="Test Name" Type="TestType">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Resource>
 </StrolchModel>
diff --git a/li.strolch.agent/src/test/resources/transienttest/data/Activities.xml b/li.strolch.agent/src/test/resources/transienttest/data/Activities.xml
index 2476fd78b..d895e646f 100644
--- a/li.strolch.agent/src/test/resources/transienttest/data/Activities.xml
+++ b/li.strolch.agent/src/test/resources/transienttest/data/Activities.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel>
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
 
     <Activity Id="activity_1" Name="Activity" Type="ActivityType" TimeOrdering="Series">
         <Policies>
diff --git a/li.strolch.agent/src/test/resources/transienttest/data/Enums.xml b/li.strolch.agent/src/test/resources/transienttest/data/Enums.xml
index 57796e146..a94f52973 100644
--- a/li.strolch.agent/src/test/resources/transienttest/data/Enums.xml
+++ b/li.strolch.agent/src/test/resources/transienttest/data/Enums.xml
@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel>
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
 
-	<Resource Id="salutations" Name="Salutations" Type="Enumeration">
-		<ParameterBag Id="en" Name="Salutations" Type="Enumeration">
-			<Parameter Id="mr" Name="Mr" Type="String" Value="Mr" />
-			<Parameter Id="mrs" Name="Mrs" Type="String" Value="Mrs" />
-			<Parameter Id="ms" Name="Ms" Type="String" Value="Ms" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="salutations" Name="Salutations" Type="Enumeration">
+        <ParameterBag Id="en" Name="Salutations" Type="Enumeration">
+            <Parameter Id="mr" Name="Mr" Type="String" Value="Mr"/>
+            <Parameter Id="mrs" Name="Mrs" Type="String" Value="Mrs"/>
+            <Parameter Id="ms" Name="Ms" Type="String" Value="Ms"/>
+        </ParameterBag>
+    </Resource>
 
-	<Resource Id="sex" Name="Sex" Type="Enumeration">
-		<ParameterBag Id="en" Name="Sex" Type="Enumeration">
-			<Parameter Id="male" Name="Male" Type="String" Value="male" />
-			<Parameter Id="female" Name="Female" Type="String" Value="female" />
-			<Parameter Id="both" Name="Both" Type="String" Value="both" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="sex" Name="Sex" Type="Enumeration">
+        <ParameterBag Id="en" Name="Sex" Type="Enumeration">
+            <Parameter Id="male" Name="Male" Type="String" Value="male"/>
+            <Parameter Id="female" Name="Female" Type="String" Value="female"/>
+            <Parameter Id="both" Name="Both" Type="String" Value="both"/>
+        </ParameterBag>
+    </Resource>
 
-	<Resource Id="religions" Name="Religions" Type="Enumeration">
-		<ParameterBag Id="en" Name="Religions" Type="Enumeration">
-			<Parameter Id="Roman Catholic" Name="Roman Catholic" Type="String" Value="Roman Catholic" />
-			<Parameter Id="Protestant" Name="Protestant" Type="String" Value="Protestant" />
-			<Parameter Id="Orthodox" Name="Orthodox" Type="String" Value="Orthodox" />
-			<Parameter Id="Christian" Name="Christian" Type="String" Value="Christian" />
-			<Parameter Id="Muslim" Name="Muslim" Type="String" Value="Muslim" />
-			<Parameter Id="Hindu" Name="Hindu" Type="String" Value="Hindu" />
-			<Parameter Id="Buddhist" Name="Buddhist" Type="String" Value="Buddhist" />
-			<Parameter Id="Jewish" Name="Jewish" Type="String" Value="Jewish" />
-			<Parameter Id="Atheist" Name="Atheist" Type="String" Value="Atheist" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="religions" Name="Religions" Type="Enumeration">
+        <ParameterBag Id="en" Name="Religions" Type="Enumeration">
+            <Parameter Id="Roman Catholic" Name="Roman Catholic" Type="String" Value="Roman Catholic"/>
+            <Parameter Id="Protestant" Name="Protestant" Type="String" Value="Protestant"/>
+            <Parameter Id="Orthodox" Name="Orthodox" Type="String" Value="Orthodox"/>
+            <Parameter Id="Christian" Name="Christian" Type="String" Value="Christian"/>
+            <Parameter Id="Muslim" Name="Muslim" Type="String" Value="Muslim"/>
+            <Parameter Id="Hindu" Name="Hindu" Type="String" Value="Hindu"/>
+            <Parameter Id="Buddhist" Name="Buddhist" Type="String" Value="Buddhist"/>
+            <Parameter Id="Jewish" Name="Jewish" Type="String" Value="Jewish"/>
+            <Parameter Id="Atheist" Name="Atheist" Type="String" Value="Atheist"/>
+        </ParameterBag>
+    </Resource>
 
 </StrolchModel>
\ No newline at end of file
diff --git a/li.strolch.agent/src/test/resources/transienttest/data/Orders.xml b/li.strolch.agent/src/test/resources/transienttest/data/Orders.xml
index 55358bcaa..be9537285 100644
--- a/li.strolch.agent/src/test/resources/transienttest/data/Orders.xml
+++ b/li.strolch.agent/src/test/resources/transienttest/data/Orders.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel>
-	<Order Id="MyTestOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="CREATED">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Order>
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+    <Order Id="MyTestOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="Created">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Order>
 </StrolchModel>
diff --git a/li.strolch.agent/src/test/resources/transienttest/data/Resources.xml b/li.strolch.agent/src/test/resources/transienttest/data/Resources.xml
index c9fc0ae52..896a949b6 100644
--- a/li.strolch.agent/src/test/resources/transienttest/data/Resources.xml
+++ b/li.strolch.agent/src/test/resources/transienttest/data/Resources.xml
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel>
-	<Resource Id="MyTestResource" Name="Test Name" Type="TestType">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-		<TimedState Id="@booleanState" Name="Boolean State" Type="Boolean">
-			<Value Time="1970-01-01T00:00:00.000+01:00" Value="false" />
-			<Value Time="1970-01-01T00:01:00.000+01:00" Value="true" />
-			<Value Time="1970-01-01T00:02:00.000+01:00" Value="false" />
-		</TimedState>
-		<TimedState Id="@integerState" Name="Integer State" Type="Integer">
-			<Value Time="1970-01-01T00:00:00.000+01:00" Value="1" />
-			<Value Time="1970-01-01T00:01:00.000+01:00" Value="2" />
-			<Value Time="1970-01-01T00:02:00.000+01:00" Value="3" />
-			<Value Time="1970-01-01T00:03:00.000+01:00" Value="2" />
-			<Value Time="1970-01-01T00:04:00.000+01:00" Value="1" />
-			<Value Time="1970-01-01T00:05:00.000+01:00" Value="0" />
-		</TimedState>
-		<TimedState Id="@floatState" Name="Float State" Type="Float">
-			<Value Time="1970-01-01T00:00:00.000+01:00" Value="1.1" />
-			<Value Time="1970-01-01T00:01:00.000+01:00" Value="2.2" />
-			<Value Time="1970-01-01T00:02:00.000+01:00" Value="3.3" />
-			<Value Time="1970-01-01T00:03:00.000+01:00" Value="2.2" />
-			<Value Time="1970-01-01T00:04:00.000+01:00" Value="1.1" />
-			<Value Time="1970-01-01T00:05:00.000+01:00" Value="0.0" />
-		</TimedState>
-		<TimedState Id="@stringSetState" Name="StringSet State" Type="StringSet">
-			<Value Time="1970-01-01T00:00:00.000+01:00" Value="foo" />
-			<Value Time="1970-01-01T00:01:00.000+01:00" Value="foo, bar" />
-			<Value Time="1970-01-01T00:02:00.000+01:00" Value="bar" />
-		</TimedState>
-		<Policies>
-			<Policy Type="PlanningPolicy" Value="key:SimplePlanning" />
-			<Policy Type="ExecutionPolicy" Value="java:li.strolch.policytest.TestSimulatedExecutionPolicy" />
-			<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" />
-		</Policies>
-	</Resource>
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+    <Resource Id="MyTestResource" Name="Test Name" Type="TestType">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+        <TimedState Id="@booleanState" Name="Boolean State" Type="Boolean">
+            <Value Time="1970-01-01T00:00:00.000+01:00" Value="false"/>
+            <Value Time="1970-01-01T00:01:00.000+01:00" Value="true"/>
+            <Value Time="1970-01-01T00:02:00.000+01:00" Value="false"/>
+        </TimedState>
+        <TimedState Id="@integerState" Name="Integer State" Type="Integer">
+            <Value Time="1970-01-01T00:00:00.000+01:00" Value="1"/>
+            <Value Time="1970-01-01T00:01:00.000+01:00" Value="2"/>
+            <Value Time="1970-01-01T00:02:00.000+01:00" Value="3"/>
+            <Value Time="1970-01-01T00:03:00.000+01:00" Value="2"/>
+            <Value Time="1970-01-01T00:04:00.000+01:00" Value="1"/>
+            <Value Time="1970-01-01T00:05:00.000+01:00" Value="0"/>
+        </TimedState>
+        <TimedState Id="@floatState" Name="Float State" Type="Float">
+            <Value Time="1970-01-01T00:00:00.000+01:00" Value="1.1"/>
+            <Value Time="1970-01-01T00:01:00.000+01:00" Value="2.2"/>
+            <Value Time="1970-01-01T00:02:00.000+01:00" Value="3.3"/>
+            <Value Time="1970-01-01T00:03:00.000+01:00" Value="2.2"/>
+            <Value Time="1970-01-01T00:04:00.000+01:00" Value="1.1"/>
+            <Value Time="1970-01-01T00:05:00.000+01:00" Value="0.0"/>
+        </TimedState>
+        <TimedState Id="@stringSetState" Name="StringSet State" Type="StringSet">
+            <Value Time="1970-01-01T00:00:00.000+01:00" Value="foo"/>
+            <Value Time="1970-01-01T00:01:00.000+01:00" Value="foo, bar"/>
+            <Value Time="1970-01-01T00:02:00.000+01:00" Value="bar"/>
+        </TimedState>
+        <Policies>
+            <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
+            <Policy Type="ExecutionPolicy" Value="java:li.strolch.policytest.TestSimulatedExecutionPolicy"/>
+            <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
+        </Policies>
+    </Resource>
 </StrolchModel>
diff --git a/li.strolch.agent/src/test/resources/transienttest/data/StrolchModel.xml b/li.strolch.agent/src/test/resources/transienttest/data/StrolchModel.xml
index 96af9e88d..958307b3c 100644
--- a/li.strolch.agent/src/test/resources/transienttest/data/StrolchModel.xml
+++ b/li.strolch.agent/src/test/resources/transienttest/data/StrolchModel.xml
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel>
-	<Resource Id="TestType" Name="TestType Template" Type="Template">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Resource>
-	<Order Id="Template" Name="MyTestOrder Template" Type="MyTestOrder">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Order>
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+    <Resource Id="TestType" Name="TestType Template" Type="Template">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Resource>
+    <Order Id="Template" Name="MyTestOrder Template" Type="MyTestOrder">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Order>
 
-	<IncludeFile file="Enums.xml" />
-	<IncludeFile file="Resources.xml" />
-	<IncludeFile file="Orders.xml" />
-	<IncludeFile file="Activities.xml" />
+    <IncludeFile file="Enums.xml"/>
+    <IncludeFile file="Resources.xml"/>
+    <IncludeFile file="Orders.xml"/>
+    <IncludeFile file="Activities.xml"/>
 
 </StrolchModel>
\ No newline at end of file
diff --git a/li.strolch.agent/src/test/resources/versioningtest/data/Activities.xml b/li.strolch.agent/src/test/resources/versioningtest/data/Activities.xml
index 9ae9da51b..febae2cdc 100644
--- a/li.strolch.agent/src/test/resources/versioningtest/data/Activities.xml
+++ b/li.strolch.agent/src/test/resources/versioningtest/data/Activities.xml
@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel>
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
 
-	<Activity Id="activity_1" Name="Activity" Type="ActivityType" TimeOrdering="Series">
-		<Policies>
-			<Policy Type="PlanningPolicy" Value="key:SimplePlanning" />
-			<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" />
-		</Policies>
-		<Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use">
-			<Policies>
-				<Policy Type="PlanningPolicy" Value="key:SimplePlanning" />
-				<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" />
-			</Policies>
-			<ValueChange StateId="dummyId" Time="2012-11-30T18:12:05.628+01:00" Value="5" Type="Integer" />
-		</Action>
-		<Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series">
-			<Policies>
-				<Policy Type="PlanningPolicy" Value="key:SimplePlanning" />
-				<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" />
-			</Policies>
-			<Action Id="action_2" Name="Action 2" ResourceId="dummyId" ResourceType="dummyType" State="Planned" Type="Use" />
-			<Action Id="action_3" Name="Action 3" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use" />
-		</Activity>
-	</Activity>
+    <Activity Id="activity_1" Name="Activity" Type="ActivityType" TimeOrdering="Series">
+        <Policies>
+            <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
+            <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
+        </Policies>
+        <Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use">
+            <Policies>
+                <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
+                <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
+            </Policies>
+            <ValueChange StateId="dummyId" Time="2012-11-30T18:12:05.628+01:00" Value="5" Type="Integer"/>
+        </Action>
+        <Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series">
+            <Policies>
+                <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
+                <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
+            </Policies>
+            <Action Id="action_2" Name="Action 2" ResourceId="dummyId" ResourceType="dummyType" State="Planned" Type="Use"/>
+            <Action Id="action_3" Name="Action 3" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use"/>
+        </Activity>
+    </Activity>
 
 </StrolchModel>
\ No newline at end of file
diff --git a/li.strolch.agent/src/test/resources/versioningtest/data/Orders.xml b/li.strolch.agent/src/test/resources/versioningtest/data/Orders.xml
index 55358bcaa..be9537285 100644
--- a/li.strolch.agent/src/test/resources/versioningtest/data/Orders.xml
+++ b/li.strolch.agent/src/test/resources/versioningtest/data/Orders.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel>
-	<Order Id="MyTestOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="CREATED">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Order>
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+    <Order Id="MyTestOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="Created">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Order>
 </StrolchModel>
diff --git a/li.strolch.agent/src/test/resources/versioningtest/data/Resources.xml b/li.strolch.agent/src/test/resources/versioningtest/data/Resources.xml
index e6259cb83..c3bba8703 100644
--- a/li.strolch.agent/src/test/resources/versioningtest/data/Resources.xml
+++ b/li.strolch.agent/src/test/resources/versioningtest/data/Resources.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel>
-	<Resource Id="MyTestResource" Name="Test Name" Type="TestType">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Resource>
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+    <Resource Id="MyTestResource" Name="Test Name" Type="TestType">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Resource>
 </StrolchModel>
diff --git a/li.strolch.agent/src/test/resources/versioningtest/data/StrolchModel.xml b/li.strolch.agent/src/test/resources/versioningtest/data/StrolchModel.xml
index d99577e39..876e74423 100644
--- a/li.strolch.agent/src/test/resources/versioningtest/data/StrolchModel.xml
+++ b/li.strolch.agent/src/test/resources/versioningtest/data/StrolchModel.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel>
-	<Resource Id="TestType" Name="TestType Template" Type="Template">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Resource>
-	<Order Id="MyTestOrder" Name="MyTestOrder Template" Type="Template">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Order>
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+    <Resource Id="TestType" Name="TestType Template" Type="Template">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Resource>
+    <Order Id="MyTestOrder" Name="MyTestOrder Template" Type="Template">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
+            <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
+            <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
+            <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
+            <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
+            <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Order>
 
-	<IncludeFile file="Resources.xml" />
-	<IncludeFile file="Orders.xml" />
-	<IncludeFile file="Activities.xml" />
+    <IncludeFile file="Resources.xml"/>
+    <IncludeFile file="Orders.xml"/>
+    <IncludeFile file="Activities.xml"/>
 
 </StrolchModel>
\ No newline at end of file