From 20632279f910c9411d73a72d6a620d9f18738208 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Tue, 26 Jun 2018 18:20:07 +0200
Subject: [PATCH] [Project] Updated Strolch model files to include schema
 definition

---
 .../cachedruntime/data/StrolchModel.xml       |  47 +-
 .../data/StrolchModel.xml                     |  47 +-
 .../cachedruntime/data/DefaultRealm.xml       |  47 +-
 .../withPrivilegeRuntime/data/Enums.xml       |  43 +-
 .../withPrivilegeRuntime/data/Orders.xml      |  25 +-
 .../withPrivilegeRuntime/data/Resources.xml   |  25 +-
 .../data/StrolchModel.xml                     |  53 +--
 .../executiontest/data/StrolchModel.xml       | 253 ++++++-----
 .../migrationstest/data/StrolchModel.xml      |  47 +-
 .../migrations/data/defaultRealm/0.1.0.xml    |  25 +-
 .../migrations/data/defaultRealm/0.1.1.xml    |  25 +-
 .../migrations/data/defaultRealm/0.5.2.xml    |  25 +-
 .../migrations/data/defaultRealm/1.0.0.xml    |  25 +-
 .../migrations/data/defaultRealm/1.0.5.xml    |  25 +-
 .../migrations/data/defaultRealm/1.1.1.xml    |  25 +-
 .../reporttest/data/StrolchModel.xml          | 429 +++++++++---------
 .../resources/svctest/data/Activities.xml     | 155 +++----
 .../src/test/resources/svctest/data/Enums.xml |  57 +--
 .../test/resources/svctest/data/Orders.xml    | 117 ++---
 .../test/resources/svctest/data/Resources.xml | 143 +++---
 .../resources/svctest/data/StrolchModel.xml   |  11 +-
 .../resources/transienttest/data/Enums.xml    |  57 +--
 .../resources/transienttest/data/Orders.xml   |  25 +-
 .../transienttest/data/Resources.xml          |  25 +-
 .../transienttest/data/StrolchModel.xml       |  53 +--
 25 files changed, 918 insertions(+), 891 deletions(-)

diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedruntime/data/StrolchModel.xml b/li.strolch.persistence.postgresql/src/test/resources/cachedruntime/data/StrolchModel.xml
index 8faa85b0d..35086cfa0 100644
--- a/li.strolch.persistence.postgresql/src/test/resources/cachedruntime/data/StrolchModel.xml
+++ b/li.strolch.persistence.postgresql/src/test/resources/cachedruntime/data/StrolchModel.xml
@@ -1,25 +1,26 @@
 <?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>
+<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>
 </StrolchModel>
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedruntimeVersioning/data/StrolchModel.xml b/li.strolch.persistence.postgresql/src/test/resources/cachedruntimeVersioning/data/StrolchModel.xml
index 8faa85b0d..35086cfa0 100644
--- a/li.strolch.persistence.postgresql/src/test/resources/cachedruntimeVersioning/data/StrolchModel.xml
+++ b/li.strolch.persistence.postgresql/src/test/resources/cachedruntimeVersioning/data/StrolchModel.xml
@@ -1,25 +1,26 @@
 <?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>
+<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>
 </StrolchModel>
diff --git a/li.strolch.persistence.xml/src/test/resources/cachedruntime/data/DefaultRealm.xml b/li.strolch.persistence.xml/src/test/resources/cachedruntime/data/DefaultRealm.xml
index 58efd20e0..0d2df8fd2 100644
--- a/li.strolch.persistence.xml/src/test/resources/cachedruntime/data/DefaultRealm.xml
+++ b/li.strolch.persistence.xml/src/test/resources/cachedruntime/data/DefaultRealm.xml
@@ -1,27 +1,28 @@
 <?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="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>
+    <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>
\ No newline at end of file
diff --git a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Enums.xml b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Enums.xml
index 8e7afdc99..da846aef8 100644
--- a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Enums.xml
+++ b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Enums.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">
 
-	<Resource Id="salutation" Name="Salutations" Type="Enumeration">
-		<ParameterBag Id="en" Name="Salutations" Type="Enumeration">
-			<Parameter Id="mr" Name="Mr" Type="String" Value="Mr" />
-			<Parameter Id="ms" Name="Ms" Type="String" Value="Ms" />
-			<Parameter Id="mrs" Name="Mrs" Type="String" Value="Mrs" />
-		</ParameterBag>
-		<ParameterBag Id="de" Name="Salutations" Type="Enumeration">
-			<Parameter Id="mr" Name="Mr" Type="String" Value="Herr" />
-			<Parameter Id="ms" Name="Ms" Type="String" Value="Frau" />
-			<Parameter Id="mrs" Name="Mrs" Type="String" Value="Frau" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="salutation" Name="Salutations" Type="Enumeration">
+        <ParameterBag Id="en" Name="Salutations" Type="Enumeration">
+            <Parameter Id="mr" Name="Mr" Type="String" Value="Mr"/>
+            <Parameter Id="ms" Name="Ms" Type="String" Value="Ms"/>
+            <Parameter Id="mrs" Name="Mrs" Type="String" Value="Mrs"/>
+        </ParameterBag>
+        <ParameterBag Id="de" Name="Salutations" Type="Enumeration">
+            <Parameter Id="mr" Name="Mr" Type="String" Value="Herr"/>
+            <Parameter Id="ms" Name="Ms" Type="String" Value="Frau"/>
+            <Parameter Id="mrs" Name="Mrs" Type="String" Value="Frau"/>
+        </ParameterBag>
+    </Resource>
 
-	<Resource Id="sex" Name="Sex" Type="Enumeration">
-		<ParameterBag Id="en" Name="Sex" Type="Enumeration">
-			<Parameter Id="undefined" Name="Undefined" Type="String" Value="undefined" />
-			<Parameter Id="both" Name="Both" Type="String" Value="both" />
-			<Parameter Id="female" Name="Female" Type="String" Value="female" />
-			<Parameter Id="male" Name="Male" Type="String" Value="male" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="sex" Name="Sex" Type="Enumeration">
+        <ParameterBag Id="en" Name="Sex" Type="Enumeration">
+            <Parameter Id="undefined" Name="Undefined" Type="String" Value="undefined"/>
+            <Parameter Id="both" Name="Both" Type="String" Value="both"/>
+            <Parameter Id="female" Name="Female" Type="String" Value="female"/>
+            <Parameter Id="male" Name="Male" Type="String" Value="male"/>
+        </ParameterBag>
+    </Resource>
 
 </StrolchModel>
\ No newline at end of file
diff --git a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Orders.xml b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Orders.xml
index 55358bcaa..be9537285 100644
--- a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Orders.xml
+++ b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/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.rest/src/test/resources/withPrivilegeRuntime/data/Resources.xml b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Resources.xml
index e6259cb83..c3bba8703 100644
--- a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Resources.xml
+++ b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/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.rest/src/test/resources/withPrivilegeRuntime/data/StrolchModel.xml b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/StrolchModel.xml
index bc5e3d9a6..905670c26 100644
--- a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/StrolchModel.xml
+++ b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/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="TestType" Name="MyTestOrder Template" Type="Template" Date="2012-11-30T18:12:05.628+01:00">
-		<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="TestType" Name="MyTestOrder Template" Type="Template" Date="2012-11-30T18:12:05.628+01:00">
+        <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="Enums.xml" />
+    <IncludeFile file="Resources.xml"/>
+    <IncludeFile file="Orders.xml"/>
+    <IncludeFile file="Enums.xml"/>
 
 </StrolchModel>
\ No newline at end of file
diff --git a/li.strolch.service/src/test/resources/executiontest/data/StrolchModel.xml b/li.strolch.service/src/test/resources/executiontest/data/StrolchModel.xml
index da8b300fd..742b3ec7c 100644
--- a/li.strolch.service/src/test/resources/executiontest/data/StrolchModel.xml
+++ b/li.strolch.service/src/test/resources/executiontest/data/StrolchModel.xml
@@ -1,143 +1,144 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns="https://strolch.li/xsd/StrolchModel-1.4.xsd">
+<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="bicycle" Name="Bicycle" Type="Product">
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="key:DurationExecution" />
-			<Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation" />
-		</Policies>
-	</Resource>
+    <Resource Id="bicycle" Name="Bicycle" Type="Product">
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="key:DurationExecution"/>
+            <Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation"/>
+        </Policies>
+    </Resource>
 
-	<Resource Id="article1" Name="Article 1" Type="Article">
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="key:DurationExecution" />
-			<Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation" />
-		</Policies>
-	</Resource>
+    <Resource Id="article1" Name="Article 1" Type="Article">
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="key:DurationExecution"/>
+            <Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation"/>
+        </Policies>
+    </Resource>
 
-	<Resource Id="article2" Name="Article 2" Type="Article">
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="key:DurationExecution" />
-			<Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation" />
-		</Policies>
-	</Resource>
+    <Resource Id="article2" Name="Article 2" Type="Article">
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="key:DurationExecution"/>
+            <Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation"/>
+        </Policies>
+    </Resource>
 
-	<Resource Id="article3" Name="Article 3" Type="Article">
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="key:DurationExecution" />
-			<Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation" />
-		</Policies>
-	</Resource>
+    <Resource Id="article3" Name="Article 3" Type="Article">
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="key:DurationExecution"/>
+            <Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation"/>
+        </Policies>
+    </Resource>
 
-	<Resource Id="conveyor1" Name="Conveyor 1" Type="Conveyor">
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="key:DurationExecution" />
-			<Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation" />
-		</Policies>
-	</Resource>
+    <Resource Id="conveyor1" Name="Conveyor 1" Type="Conveyor">
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="key:DurationExecution"/>
+            <Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation"/>
+        </Policies>
+    </Resource>
 
-	<Resource Id="conveyor2" Name="Conveyor 2" Type="Conveyor">
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="key:DurationExecution" />
-			<Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation" />
-		</Policies>
-	</Resource>
+    <Resource Id="conveyor2" Name="Conveyor 2" Type="Conveyor">
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="key:DurationExecution"/>
+            <Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation"/>
+        </Policies>
+    </Resource>
 
-	<Resource Id="machine1" Name="Machine" Type="Machine">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="reserved" Name="Reservation" Type="Boolean" Value="false" />
-		</ParameterBag>
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.ReservationExection" />
-			<Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation" />
-		</Policies>
-	</Resource>
+    <Resource Id="machine1" Name="Machine" Type="Machine">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="reserved" Name="Reservation" Type="Boolean" Value="false"/>
+        </ParameterBag>
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.ReservationExection"/>
+            <Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation"/>
+        </Policies>
+    </Resource>
 
-	<Resource Id="conveyor3" Name="Conveyor 3" Type="Conveyor">
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="key:DurationExecution" />
-			<Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation" />
-		</Policies>
-	</Resource>
+    <Resource Id="conveyor3" Name="Conveyor 3" Type="Conveyor">
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="key:DurationExecution"/>
+            <Policy Type="ConfirmationPolicy" Value="key:DefaultConfirmation"/>
+        </Policies>
+    </Resource>
 
-	<Activity Id="produceMachine1" Name="Activity" Type="ToStock" TimeOrdering="Series">
-		<ParameterBag Name="objectives" Id="Objectives" Type="Objectives">
-			<Parameter Name="Duration" Id="duration" Value="PT0.3S" Type="Duration" />
-		</ParameterBag>
-		<Action Id="reserve" Name="Reserve" ResourceId="machine1" ResourceType="Machine" Type="Reserve" />
-		<Action Id="produce" Name="Produce" ResourceId="machine1" ResourceType="Machine" Type="Produce" />
-		<Action Id="release" Name="Release" ResourceId="machine1" ResourceType="Machine" Type="Release" />
-	</Activity>
+    <Activity Id="produceMachine1" Name="Activity" Type="ToStock" TimeOrdering="Series">
+        <ParameterBag Name="objectives" Id="Objectives" Type="Objectives">
+            <Parameter Name="Duration" Id="duration" Value="PT0.3S" Type="Duration"/>
+        </ParameterBag>
+        <Action Id="reserve" Name="Reserve" ResourceId="machine1" ResourceType="Machine" Type="Reserve"/>
+        <Action Id="produce" Name="Produce" ResourceId="machine1" ResourceType="Machine" Type="Produce"/>
+        <Action Id="release" Name="Release" ResourceId="machine1" ResourceType="Machine" Type="Release"/>
+    </Activity>
 
-	<Activity Id="produceMachine2" Name="Activity" Type="ToStock" TimeOrdering="Series">
-		<ParameterBag Name="objectives" Id="Objectives" Type="Objectives">
-			<Parameter Name="Duration" Id="duration" Value="PT0.1S" Type="Duration" />
-		</ParameterBag>
-		<Action Id="reserve" Name="Reserve" ResourceId="machine1" ResourceType="Machine" Type="Reserve" />
-		<Action Id="produce" Name="Produce" ResourceId="machine1" ResourceType="Machine" Type="Produce" />
-		<Action Id="release" Name="Release" ResourceId="machine1" ResourceType="Machine" Type="Release" />
-	</Activity>
+    <Activity Id="produceMachine2" Name="Activity" Type="ToStock" TimeOrdering="Series">
+        <ParameterBag Name="objectives" Id="Objectives" Type="Objectives">
+            <Parameter Name="Duration" Id="duration" Value="PT0.1S" Type="Duration"/>
+        </ParameterBag>
+        <Action Id="reserve" Name="Reserve" ResourceId="machine1" ResourceType="Machine" Type="Reserve"/>
+        <Action Id="produce" Name="Produce" ResourceId="machine1" ResourceType="Machine" Type="Produce"/>
+        <Action Id="release" Name="Release" ResourceId="machine1" ResourceType="Machine" Type="Release"/>
+    </Activity>
 
-	<Activity Id="produceBicycle" Name="Activity" Type="ToStock" TimeOrdering="Series">
-		<ParameterBag Name="objectives" Id="Objectives" Type="Objectives">
-			<Parameter Name="Duration" Id="duration" Value="PT0.2S" Type="Duration" />
-		</ParameterBag>
-		<Action Id="produce" Name="Produce" ResourceId="bicycle" ResourceType="Product" Type="Produce" />
-	</Activity>
+    <Activity Id="produceBicycle" Name="Activity" Type="ToStock" TimeOrdering="Series">
+        <ParameterBag Name="objectives" Id="Objectives" Type="Objectives">
+            <Parameter Name="Duration" Id="duration" Value="PT0.2S" Type="Duration"/>
+        </ParameterBag>
+        <Action Id="produce" Name="Produce" ResourceId="bicycle" ResourceType="Product" Type="Produce"/>
+    </Activity>
 
-	<Activity Id="conveyors" Name="Activity" Type="ToStock" TimeOrdering="Series">
-		<ParameterBag Name="objectives" Id="Objectives" Type="Objectives">
-			<Parameter Name="Duration" Id="duration" Value="PT0.3S" Type="Duration" />
-		</ParameterBag>
-		<Action Id="action_1" Name="Action 1" ResourceId="conveyor1" ResourceType="Conveyor" Type="Use" />
-		<Action Id="action_2" Name="Action 2" ResourceId="conveyor2" ResourceType="Conveyor" Type="Use" />
-		<Action Id="action_3" Name="Action 3" ResourceId="conveyor3" ResourceType="Conveyor" Type="Use" />
-	</Activity>
+    <Activity Id="conveyors" Name="Activity" Type="ToStock" TimeOrdering="Series">
+        <ParameterBag Name="objectives" Id="Objectives" Type="Objectives">
+            <Parameter Name="Duration" Id="duration" Value="PT0.3S" Type="Duration"/>
+        </ParameterBag>
+        <Action Id="action_1" Name="Action 1" ResourceId="conveyor1" ResourceType="Conveyor" Type="Use"/>
+        <Action Id="action_2" Name="Action 2" ResourceId="conveyor2" ResourceType="Conveyor" Type="Use"/>
+        <Action Id="action_3" Name="Action 3" ResourceId="conveyor3" ResourceType="Conveyor" Type="Use"/>
+    </Activity>
 
-	<Activity Id="parallel" Name="Activity" Type="ToStock" TimeOrdering="Parallel">
-		<ParameterBag Name="objectives" Id="Objectives" Type="Objectives">
-			<Parameter Name="Duration" Id="duration" Value="PT0.2S" Type="Duration" />
-		</ParameterBag>
-		<Activity Id="sub1" Name="Sub Activity 1" Type="Sub" TimeOrdering="Parallel">
-			<Action Id="action_1" Name="Action 1" ResourceId="conveyor1" ResourceType="Conveyor" Type="Use" />
-			<Action Id="action_2" Name="Action 2" ResourceId="conveyor2" ResourceType="Conveyor" Type="Use" />
-			<Action Id="action_3" Name="Action 3" ResourceId="conveyor3" ResourceType="Conveyor" Type="Use" />
-		</Activity>
-		<Activity Id="sub2" Name="Sub Activity 2" Type="Sub" TimeOrdering="Series">
-			<Action Id="action_1" Name="Action 1" ResourceId="conveyor1" ResourceType="Conveyor" Type="Use" />
-			<Action Id="action_2" Name="Action 2" ResourceId="conveyor2" ResourceType="Conveyor" Type="Use" />
-			<Action Id="action_3" Name="Action 3" ResourceId="conveyor3" ResourceType="Conveyor" Type="Use" />
-		</Activity>
-		<Action Id="action_1" Name="Action 1" ResourceId="article1" ResourceType="Article" Type="Use" />
-		<Action Id="action_2" Name="Action 2" ResourceId="article2" ResourceType="Article" Type="Use" />
-		<Action Id="action_3" Name="Action 3" ResourceId="article3" ResourceType="Article" Type="Use" />
-	</Activity>
+    <Activity Id="parallel" Name="Activity" Type="ToStock" TimeOrdering="Parallel">
+        <ParameterBag Name="objectives" Id="Objectives" Type="Objectives">
+            <Parameter Name="Duration" Id="duration" Value="PT0.2S" Type="Duration"/>
+        </ParameterBag>
+        <Activity Id="sub1" Name="Sub Activity 1" Type="Sub" TimeOrdering="Parallel">
+            <Action Id="action_1" Name="Action 1" ResourceId="conveyor1" ResourceType="Conveyor" Type="Use"/>
+            <Action Id="action_2" Name="Action 2" ResourceId="conveyor2" ResourceType="Conveyor" Type="Use"/>
+            <Action Id="action_3" Name="Action 3" ResourceId="conveyor3" ResourceType="Conveyor" Type="Use"/>
+        </Activity>
+        <Activity Id="sub2" Name="Sub Activity 2" Type="Sub" TimeOrdering="Series">
+            <Action Id="action_1" Name="Action 1" ResourceId="conveyor1" ResourceType="Conveyor" Type="Use"/>
+            <Action Id="action_2" Name="Action 2" ResourceId="conveyor2" ResourceType="Conveyor" Type="Use"/>
+            <Action Id="action_3" Name="Action 3" ResourceId="conveyor3" ResourceType="Conveyor" Type="Use"/>
+        </Activity>
+        <Action Id="action_1" Name="Action 1" ResourceId="article1" ResourceType="Article" Type="Use"/>
+        <Action Id="action_2" Name="Action 2" ResourceId="article2" ResourceType="Article" Type="Use"/>
+        <Action Id="action_3" Name="Action 3" ResourceId="article3" ResourceType="Article" Type="Use"/>
+    </Activity>
 
-	<Activity Id="deep" Name="Activity" Type="ToStock" TimeOrdering="Series">
-		<ParameterBag Name="objectives" Id="Objectives" Type="Objectives">
-			<Parameter Name="Duration" Id="duration" Value="PT0.1S" Type="Duration" />
-		</ParameterBag>
-		<Activity Id="sub1" Name="Sub Activity 1" Type="Sub" TimeOrdering="Series">
-			<Action Id="action_1" Name="Action 1" ResourceId="conveyor1" ResourceType="Conveyor" Type="Use" />
-			<Action Id="action_2" Name="Action 2" ResourceId="conveyor2" ResourceType="Conveyor" Type="Use" />
-			<Action Id="action_3" Name="Action 3" ResourceId="conveyor3" ResourceType="Conveyor" Type="Use" />
-		</Activity>
-		<Activity Id="sub2" Name="Sub Activity 2" Type="Sub" TimeOrdering="Series">
-			<Action Id="action_1" Name="Action 1" ResourceId="conveyor1" ResourceType="Conveyor" Type="Use" />
-			<Action Id="action_2" Name="Action 2" ResourceId="conveyor2" ResourceType="Conveyor" Type="Use" />
-			<Action Id="action_3" Name="Action 3" ResourceId="conveyor3" ResourceType="Conveyor" Type="Use" />
-		</Activity>
-		<Action Id="action_1" Name="Action 1" ResourceId="conveyor1" ResourceType="Conveyor" Type="Use" />
-		<Action Id="action_2" Name="Action 2" ResourceId="conveyor2" ResourceType="Conveyor" Type="Use" />
-		<Action Id="action_3" Name="Action 3" ResourceId="conveyor3" ResourceType="Conveyor" Type="Use" />
-	</Activity>
+    <Activity Id="deep" Name="Activity" Type="ToStock" TimeOrdering="Series">
+        <ParameterBag Name="objectives" Id="Objectives" Type="Objectives">
+            <Parameter Name="Duration" Id="duration" Value="PT0.1S" Type="Duration"/>
+        </ParameterBag>
+        <Activity Id="sub1" Name="Sub Activity 1" Type="Sub" TimeOrdering="Series">
+            <Action Id="action_1" Name="Action 1" ResourceId="conveyor1" ResourceType="Conveyor" Type="Use"/>
+            <Action Id="action_2" Name="Action 2" ResourceId="conveyor2" ResourceType="Conveyor" Type="Use"/>
+            <Action Id="action_3" Name="Action 3" ResourceId="conveyor3" ResourceType="Conveyor" Type="Use"/>
+        </Activity>
+        <Activity Id="sub2" Name="Sub Activity 2" Type="Sub" TimeOrdering="Series">
+            <Action Id="action_1" Name="Action 1" ResourceId="conveyor1" ResourceType="Conveyor" Type="Use"/>
+            <Action Id="action_2" Name="Action 2" ResourceId="conveyor2" ResourceType="Conveyor" Type="Use"/>
+            <Action Id="action_3" Name="Action 3" ResourceId="conveyor3" ResourceType="Conveyor" Type="Use"/>
+        </Activity>
+        <Action Id="action_1" Name="Action 1" ResourceId="conveyor1" ResourceType="Conveyor" Type="Use"/>
+        <Action Id="action_2" Name="Action 2" ResourceId="conveyor2" ResourceType="Conveyor" Type="Use"/>
+        <Action Id="action_3" Name="Action 3" ResourceId="conveyor3" ResourceType="Conveyor" Type="Use"/>
+    </Activity>
 
 </StrolchModel>
\ No newline at end of file
diff --git a/li.strolch.service/src/test/resources/migrationstest/data/StrolchModel.xml b/li.strolch.service/src/test/resources/migrationstest/data/StrolchModel.xml
index 58470ca2a..25402ffac 100644
--- a/li.strolch.service/src/test/resources/migrationstest/data/StrolchModel.xml
+++ b/li.strolch.service/src/test/resources/migrationstest/data/StrolchModel.xml
@@ -1,26 +1,27 @@
 <?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>
 
 </StrolchModel>
\ No newline at end of file
diff --git a/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.0.xml b/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.0.xml
index e6259cb83..c3bba8703 100644
--- a/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.0.xml
+++ b/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.0.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.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.1.xml b/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.1.xml
index e6259cb83..c3bba8703 100644
--- a/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.1.xml
+++ b/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.1.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.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.5.2.xml b/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.5.2.xml
index e6259cb83..c3bba8703 100644
--- a/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.5.2.xml
+++ b/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.5.2.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.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.0.xml b/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.0.xml
index e6259cb83..c3bba8703 100644
--- a/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.0.xml
+++ b/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.0.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.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.5.xml b/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.5.xml
index e6259cb83..c3bba8703 100644
--- a/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.5.xml
+++ b/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.5.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.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.1.1.xml b/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.1.1.xml
index e6259cb83..c3bba8703 100644
--- a/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.1.1.xml
+++ b/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.1.1.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.service/src/test/resources/reporttest/data/StrolchModel.xml b/li.strolch.service/src/test/resources/reporttest/data/StrolchModel.xml
index 49ab38278..d7aa7ecdb 100644
--- a/li.strolch.service/src/test/resources/reporttest/data/StrolchModel.xml
+++ b/li.strolch.service/src/test/resources/reporttest/data/StrolchModel.xml
@@ -1,242 +1,245 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.4.xsd">
+<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="stockReport" Name="Stock Report" Type="Report">
+    <Resource Id="stockReport" Name="Stock Report" Type="Report">
 
-		<ParameterBag Id="parameters" Name="parameters" Type="Parameters">
-			<Parameter Id="objectType" Name="Object Type" Type="String" Interpretation="Resource-Ref" Uom="Slot" Value="Slot" />
-			<Parameter Id="hideObjectTypeFromFilterCriteria" Name="Hide objectType from filter criteria" Type="Boolean" Value="true" />
-			<Parameter Id="dateRangeSel" Name="Date Range Selector" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="Bags/parameters/expirationDate" />
-			<Parameter Id="descending" Name="Descending order" Type="Boolean" Value="true" />
-		</ParameterBag>
+        <ParameterBag Id="parameters" Name="parameters" Type="Parameters">
+            <Parameter Id="objectType" Name="Object Type" Type="String" Interpretation="Resource-Ref" Uom="Slot" Value="Slot"/>
+            <Parameter Id="hideObjectTypeFromFilterCriteria" Name="Hide objectType from filter criteria" Type="Boolean" Value="true"/>
+            <Parameter Id="dateRangeSel" Name="Date Range Selector" Type="String" Interpretation="Resource-Ref" Uom="Product"
+                       Value="Bags/parameters/expirationDate"/>
+            <Parameter Id="descending" Name="Descending order" Type="Boolean" Value="true"/>
+        </ParameterBag>
 
-		<ParameterBag Id="ordering" Name="Ordering" Type="Ordering">
-			<Parameter Id="quantity" Name="Quantity" Type="String" Interpretation="Resource-Ref" Uom="Slot" Value="Bags/parameters/quantity" />
-		</ParameterBag>
+        <ParameterBag Id="ordering" Name="Ordering" Type="Ordering">
+            <Parameter Id="quantity" Name="Quantity" Type="String" Interpretation="Resource-Ref" Uom="Slot" Value="Bags/parameters/quantity"/>
+        </ParameterBag>
 
-		<ParameterBag Id="quantityFilter" Name="Filter" Type="Filter">
-			<Parameter Id="policy" Name="Filter Policy" Type="String" Interpretation="ReportFilterPolicy" Uom="key:GreaterThan" Value="0.0" />
-			<Parameter Id="fieldRef" Name="Field reference" Type="String" Interpretation="Resource-Ref" Uom="Slot" Value="Bags/parameters/quantity" />
-		</ParameterBag>
-		<ParameterBag Id="noProductFilter" Name="Filter" Type="Filter">
-			<Parameter Id="policy" Name="Filter Policy" Type="String" Interpretation="ReportFilterPolicy" Uom="key:Equals" Value="!" />
-			<Parameter Id="fieldRef" Name="Field reference" Type="String" Interpretation="Resource-Ref" Uom="Slot" Value="Bags/relations/product" />
-		</ParameterBag>
+        <ParameterBag Id="quantityFilter" Name="Filter" Type="Filter">
+            <Parameter Id="policy" Name="Filter Policy" Type="String" Interpretation="ReportFilterPolicy" Uom="key:GreaterThan" Value="0.0"/>
+            <Parameter Id="fieldRef" Name="Field reference" Type="String" Interpretation="Resource-Ref" Uom="Slot" Value="Bags/parameters/quantity"/>
+        </ParameterBag>
+        <ParameterBag Id="noProductFilter" Name="Filter" Type="Filter">
+            <Parameter Id="policy" Name="Filter Policy" Type="String" Interpretation="ReportFilterPolicy" Uom="key:Equals" Value="!"/>
+            <Parameter Id="fieldRef" Name="Field reference" Type="String" Interpretation="Resource-Ref" Uom="Slot" Value="Bags/relations/product"/>
+        </ParameterBag>
 
-		<ParameterBag Id="columns" Name="Display Columns" Type="Display">
-			<Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="$name" />
-			<Parameter Id="storage" Name="Storage" Type="String" Interpretation="Resource-Ref" Uom="Storage" Value="$name" />
-			<Parameter Id="section" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="$name" />
-			<Parameter Id="slot" Name="Slot" Type="String" Interpretation="Resource-Ref" Uom="Slot" Value="$name" />
-			<Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="$name" />
-			<Parameter Id="quantity" Name="Quantity" Type="String" Interpretation="Resource-Ref" Uom="Slot" Value="Bags/parameters/quantity" />
-			<Parameter Id="maxQuantity" Name="Max Quantity" Type="String" Interpretation="Resource-Ref" Uom="Slot" Value="Bags/parameters/maxQuantity" />
-			<Parameter Id="minQuantity" Name="Min Quantity" Type="String" Interpretation="Resource-Ref" Uom="Storage" Value="$search:parent:Bags/parameters/minQuantity" />
-		</ParameterBag>
+        <ParameterBag Id="columns" Name="Display Columns" Type="Display">
+            <Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="$name"/>
+            <Parameter Id="storage" Name="Storage" Type="String" Interpretation="Resource-Ref" Uom="Storage" Value="$name"/>
+            <Parameter Id="section" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="$name"/>
+            <Parameter Id="slot" Name="Slot" Type="String" Interpretation="Resource-Ref" Uom="Slot" Value="$name"/>
+            <Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="$name"/>
+            <Parameter Id="quantity" Name="Quantity" Type="String" Interpretation="Resource-Ref" Uom="Slot" Value="Bags/parameters/quantity"/>
+            <Parameter Id="maxQuantity" Name="Max Quantity" Type="String" Interpretation="Resource-Ref" Uom="Slot" Value="Bags/parameters/maxQuantity"/>
+            <Parameter Id="minQuantity" Name="Min Quantity" Type="String" Interpretation="Resource-Ref" Uom="Storage"
+                       Value="$search:parent:Bags/parameters/minQuantity"/>
+        </ParameterBag>
 
-		<ParameterBag Id="joins" Name="Joins" Type="Joins">
-			<Parameter Id="Product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="Slot" />
-			<Parameter Id="Section" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="Slot" />
-			<Parameter Id="Storage" Name="Storage" Type="String" Interpretation="Resource-Ref" Uom="Storage" Value="Section" />
-			<Parameter Id="Location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="Storage" />
-		</ParameterBag>
+        <ParameterBag Id="joins" Name="Joins" Type="Joins">
+            <Parameter Id="Product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="Slot"/>
+            <Parameter Id="Section" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="Slot"/>
+            <Parameter Id="Storage" Name="Storage" Type="String" Interpretation="Resource-Ref" Uom="Storage" Value="Section"/>
+            <Parameter Id="Location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="Storage"/>
+        </ParameterBag>
 
-		<Policies>
-			<Policy Type="ReportPolicy" Value="java:li.strolch.report.policy.GenericReport" />
-		</Policies>
+        <Policies>
+            <Policy Type="ReportPolicy" Value="java:li.strolch.report.policy.GenericReport"/>
+        </Policies>
 
-	</Resource>
+    </Resource>
 
-	<Resource Id="fromStockReport" Name="FromStock Report" Type="Report">
+    <Resource Id="fromStockReport" Name="FromStock Report" Type="Report">
 
-		<ParameterBag Id="parameters" Name="parameters" Type="Parameters">
-			<Parameter Id="objectType" Name="Object Type" Type="String" Interpretation="Order-Ref" Uom="FromStock" Value="FromStock" />
-			<Parameter Id="dateRangeSel" Name="Date Range Selector" Type="String" Interpretation="Order-Ref" Uom="FromStock" Value="$date" />
-			<Parameter Id="descending" Name="Descending order" Type="Boolean" Value="true" />
-		</ParameterBag>
+        <ParameterBag Id="parameters" Name="parameters" Type="Parameters">
+            <Parameter Id="objectType" Name="Object Type" Type="String" Interpretation="Order-Ref" Uom="FromStock" Value="FromStock"/>
+            <Parameter Id="dateRangeSel" Name="Date Range Selector" Type="String" Interpretation="Order-Ref" Uom="FromStock" Value="$date"/>
+            <Parameter Id="descending" Name="Descending order" Type="Boolean" Value="true"/>
+        </ParameterBag>
 
-		<ParameterBag Id="ordering" Name="Ordering" Type="Ordering">
-			<Parameter Id="quantity" Name="Quantity" Type="String" Interpretation="Order-Ref" Uom="FromStock" Value="Bags/parameters/quantity" />
-		</ParameterBag>
+        <ParameterBag Id="ordering" Name="Ordering" Type="Ordering">
+            <Parameter Id="quantity" Name="Quantity" Type="String" Interpretation="Order-Ref" Uom="FromStock" Value="Bags/parameters/quantity"/>
+        </ParameterBag>
 
-		<ParameterBag Id="columns" Name="Display Columns" Type="Display">
-			<Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="$name" />
-			<Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="$name" />
-			<Parameter Id="quantity" Name="Quantity" Type="String" Interpretation="Order-Ref" Uom="FromStock" Value="Bags/parameters/quantity" />
-			<Parameter Id="date" Name="Date" Type="String" Interpretation="Order-Ref" Uom="FromStock" Value="$date" />
-			<Parameter Id="state" Name="State" Type="String" Interpretation="Order-Ref" Uom="FromStock" Value="$state" />
-			<Parameter Id="id" Name="Id" Type="String" Interpretation="Order-Ref" Uom="FromStock" Value="$id" />
-		</ParameterBag>
+        <ParameterBag Id="columns" Name="Display Columns" Type="Display">
+            <Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="$name"/>
+            <Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="$name"/>
+            <Parameter Id="quantity" Name="Quantity" Type="String" Interpretation="Order-Ref" Uom="FromStock" Value="Bags/parameters/quantity"/>
+            <Parameter Id="date" Name="Date" Type="String" Interpretation="Order-Ref" Uom="FromStock" Value="$date"/>
+            <Parameter Id="state" Name="State" Type="String" Interpretation="Order-Ref" Uom="FromStock" Value="$state"/>
+            <Parameter Id="id" Name="Id" Type="String" Interpretation="Order-Ref" Uom="FromStock" Value="$id"/>
+        </ParameterBag>
 
-		<ParameterBag Id="joins" Name="Joins" Type="Joins">
-			<Parameter Id="Product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="FromStock" />
-			<Parameter Id="Location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="FromStock" />
-		</ParameterBag>
+        <ParameterBag Id="joins" Name="Joins" Type="Joins">
+            <Parameter Id="Product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="FromStock"/>
+            <Parameter Id="Location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="FromStock"/>
+        </ParameterBag>
 
-		<Policies>
-			<Policy Type="ReportPolicy" Value="java:li.strolch.report.policy.GenericReport" />
-		</Policies>
+        <Policies>
+            <Policy Type="ReportPolicy" Value="java:li.strolch.report.policy.GenericReport"/>
+        </Policies>
 
-	</Resource>
+    </Resource>
 
-	<Resource Id="product01" Name="Product 01" Type="Product">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="expirationDate" Name="Expiration Date" Type="Date" Value="2017-02-01T10:00:00.000+01:00" />
-		</ParameterBag>
-	</Resource>
-	<Resource Id="product02" Name="Product 02" Type="Product">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="expirationDate" Name="Expiration Date" Type="Date" Value="2017-03-01T10:00:00.000+01:00" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="product01" Name="Product 01" Type="Product">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="expirationDate" Name="Expiration Date" Type="Date" Value="2017-02-01T10:00:00.000+01:00"/>
+        </ParameterBag>
+    </Resource>
+    <Resource Id="product02" Name="Product 02" Type="Product">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="expirationDate" Name="Expiration Date" Type="Date" Value="2017-03-01T10:00:00.000+01:00"/>
+        </ParameterBag>
+    </Resource>
 
-	<Order Id="fromStock01" Name="From Stock" Type="FromStock" Date="2017-02-01T10:00:00.000+01:00" State="EXECUTED">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="quantity" Name="quantity" Type="Float" Value="4.0" />
-		</ParameterBag>
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="location01" />
-			<Parameter Id="product" Name="Product" Type="String" Value="product01" Interpretation="Resource-Ref" Uom="Product" />
-		</ParameterBag>
-	</Order>
-	<Order Id="fromStock02" Name="From Stock" Type="FromStock" Date="2017-02-01T10:00:00.000+01:00" State="EXECUTED">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="quantity" Name="quantity" Type="Float" Value="6.0" />
-		</ParameterBag>
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="location01" />
-			<Parameter Id="product" Name="Product" Type="String" Value="product01" Interpretation="Resource-Ref" Uom="Product" />
-		</ParameterBag>
-	</Order>
-	<Order Id="fromStock03" Name="From Stock" Type="FromStock" Date="2017-03-01T10:00:00.000+01:00" State="CREATED">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="quantity" Name="quantity" Type="Float" Value="8.0" />
-		</ParameterBag>
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="location02" />
-			<Parameter Id="product" Name="Product" Type="String" Value="product02" Interpretation="Resource-Ref" Uom="Product" />
-		</ParameterBag>
-	</Order>
-	<Order Id="fromStock04" Name="From Stock" Type="FromStock" Date="2017-03-01T10:00:00.000+01:00" State="CREATED">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="quantity" Name="quantity" Type="Float" Value="12.0" />
-		</ParameterBag>
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="location02" />
-			<Parameter Id="product" Name="Product" Type="String" Value="product02" Interpretation="Resource-Ref" Uom="Product" />
-		</ParameterBag>
-	</Order>
+    <Order Id="fromStock01" Name="From Stock" Type="FromStock" Date="2017-02-01T10:00:00.000+01:00" State="EXECUTED">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="quantity" Name="quantity" Type="Float" Value="4.0"/>
+        </ParameterBag>
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="location01"/>
+            <Parameter Id="product" Name="Product" Type="String" Value="product01" Interpretation="Resource-Ref" Uom="Product"/>
+        </ParameterBag>
+    </Order>
+    <Order Id="fromStock02" Name="From Stock" Type="FromStock" Date="2017-02-01T10:00:00.000+01:00" State="EXECUTED">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="quantity" Name="quantity" Type="Float" Value="6.0"/>
+        </ParameterBag>
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="location01"/>
+            <Parameter Id="product" Name="Product" Type="String" Value="product01" Interpretation="Resource-Ref" Uom="Product"/>
+        </ParameterBag>
+    </Order>
+    <Order Id="fromStock03" Name="From Stock" Type="FromStock" Date="2017-03-01T10:00:00.000+01:00" State="CREATED">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="quantity" Name="quantity" Type="Float" Value="8.0"/>
+        </ParameterBag>
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="location02"/>
+            <Parameter Id="product" Name="Product" Type="String" Value="product02" Interpretation="Resource-Ref" Uom="Product"/>
+        </ParameterBag>
+    </Order>
+    <Order Id="fromStock04" Name="From Stock" Type="FromStock" Date="2017-03-01T10:00:00.000+01:00" State="CREATED">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="quantity" Name="quantity" Type="Float" Value="12.0"/>
+        </ParameterBag>
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="location02"/>
+            <Parameter Id="product" Name="Product" Type="String" Value="product02" Interpretation="Resource-Ref" Uom="Product"/>
+        </ParameterBag>
+    </Order>
 
-	<Resource Id="location01" Name="Location 01" Type="Location">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="description" Name="Description" Type="String" Value="Just a location" />
-		</ParameterBag>
-	</Resource>
-	<Resource Id="location02" Name="Location 02" Type="Location">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="description" Name="Description" Type="String" Value="Just a location" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="location01" Name="Location 01" Type="Location">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="description" Name="Description" Type="String" Value="Just a location"/>
+        </ParameterBag>
+    </Resource>
+    <Resource Id="location02" Name="Location 02" Type="Location">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="description" Name="Description" Type="String" Value="Just a location"/>
+        </ParameterBag>
+    </Resource>
 
-	<Resource Id="storage00" Name="Storage 00" Type="Storage">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="minQuantity" Name="Min Quantity" Type="Float" Value="4.0" />
-		</ParameterBag>
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="location00" />
-		</ParameterBag>
-	</Resource>
-	<Resource Id="storage01" Name="Storage 01" Type="Storage">
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="parent" Name="Parent" Type="String" Interpretation="Resource-Ref" Uom="Storage" Value="storage00" />
-			<Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="location01" />
-		</ParameterBag>
-	</Resource>
-	<Resource Id="storage02" Name="Storage 02" Type="Storage">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="minQuantity" Name="Min Quantity" Type="Float" Value="6.0" />
-		</ParameterBag>
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="parent" Name="Parent" Type="String" Interpretation="Resource-Ref" Uom="Storage" Value="storage00" />
-			<Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="location02" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="storage00" Name="Storage 00" Type="Storage">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="minQuantity" Name="Min Quantity" Type="Float" Value="4.0"/>
+        </ParameterBag>
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="location00"/>
+        </ParameterBag>
+    </Resource>
+    <Resource Id="storage01" Name="Storage 01" Type="Storage">
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="parent" Name="Parent" Type="String" Interpretation="Resource-Ref" Uom="Storage" Value="storage00"/>
+            <Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="location01"/>
+        </ParameterBag>
+    </Resource>
+    <Resource Id="storage02" Name="Storage 02" Type="Storage">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="minQuantity" Name="Min Quantity" Type="Float" Value="6.0"/>
+        </ParameterBag>
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="parent" Name="Parent" Type="String" Interpretation="Resource-Ref" Uom="Storage" Value="storage00"/>
+            <Parameter Id="location" Name="Location" Type="String" Interpretation="Resource-Ref" Uom="Location" Value="location02"/>
+        </ParameterBag>
+    </Resource>
 
-	<Resource Id="section001" Name="Section 001" Type="Section">
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="parentStorage" Name="Storage" Type="String" Interpretation="Resource-Ref" Uom="Storage" Value="storage01" />
-		</ParameterBag>
-	</Resource>
-	<Resource Id="section002" Name="Section 002" Type="Section">
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="parentStorage" Name="Storage" Type="String" Interpretation="Resource-Ref" Uom="Storage" Value="storage02" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="section001" Name="Section 001" Type="Section">
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="parentStorage" Name="Storage" Type="String" Interpretation="Resource-Ref" Uom="Storage" Value="storage01"/>
+        </ParameterBag>
+    </Resource>
+    <Resource Id="section002" Name="Section 002" Type="Section">
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="parentStorage" Name="Storage" Type="String" Interpretation="Resource-Ref" Uom="Storage" Value="storage02"/>
+        </ParameterBag>
+    </Resource>
 
-	<Resource Id="slot001" Name="Slot 1" Type="Slot">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="quantity" Name="Quantity" Type="Float" Value="20.0" />
-			<Parameter Id="maxQuantity" Name="max. quantity of items" Type="Float" Value="40.0" />
-		</ParameterBag>
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="parentSection" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="section001" />
-			<Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="product01" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="slot001" Name="Slot 1" Type="Slot">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="quantity" Name="Quantity" Type="Float" Value="20.0"/>
+            <Parameter Id="maxQuantity" Name="max. quantity of items" Type="Float" Value="40.0"/>
+        </ParameterBag>
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="parentSection" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="section001"/>
+            <Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="product01"/>
+        </ParameterBag>
+    </Resource>
 
-	<Resource Id="slot002" Name="Slot 2" Type="Slot">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="quantity" Name="Quantity" Type="Float" Value="18.0" />
-			<Parameter Id="maxQuantity" Name="max. quantity of items" Type="Float" Value="20.0" />
-		</ParameterBag>
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="parentSection" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="section001" />
-			<Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="product02" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="slot002" Name="Slot 2" Type="Slot">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="quantity" Name="Quantity" Type="Float" Value="18.0"/>
+            <Parameter Id="maxQuantity" Name="max. quantity of items" Type="Float" Value="20.0"/>
+        </ParameterBag>
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="parentSection" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="section001"/>
+            <Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="product02"/>
+        </ParameterBag>
+    </Resource>
 
-	<Resource Id="slot003" Name="Slot 3" Type="Slot">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="quantity" Name="Quantity" Type="Float" Value="11.0" />
-			<Parameter Id="maxQuantity" Name="max. quantity of items" Type="Float" Value="40.0" />
-		</ParameterBag>
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="parentSection" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="section002" />
-			<Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="product01" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="slot003" Name="Slot 3" Type="Slot">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="quantity" Name="Quantity" Type="Float" Value="11.0"/>
+            <Parameter Id="maxQuantity" Name="max. quantity of items" Type="Float" Value="40.0"/>
+        </ParameterBag>
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="parentSection" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="section002"/>
+            <Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="product01"/>
+        </ParameterBag>
+    </Resource>
 
-	<Resource Id="slot004" Name="Slot 4" Type="Slot">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="quantity" Name="Quantity" Type="Float" Value="16.0" />
-			<Parameter Id="maxQuantity" Name="max. quantity of items" Type="Float" Value="20.0" />
-		</ParameterBag>
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="parentSection" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="section002" />
-			<Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="product02" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="slot004" Name="Slot 4" Type="Slot">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="quantity" Name="Quantity" Type="Float" Value="16.0"/>
+            <Parameter Id="maxQuantity" Name="max. quantity of items" Type="Float" Value="20.0"/>
+        </ParameterBag>
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="parentSection" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="section002"/>
+            <Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="product02"/>
+        </ParameterBag>
+    </Resource>
 
-	<Resource Id="slot005" Name="Slot 4" Type="Slot">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="quantity" Name="Quantity" Type="Float" Value="0.0" />
-			<Parameter Id="maxQuantity" Name="max. quantity of items" Type="Float" Value="20.0" />
-		</ParameterBag>
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="parentSection" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="section002" />
-			<Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="product02" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="slot005" Name="Slot 4" Type="Slot">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="quantity" Name="Quantity" Type="Float" Value="0.0"/>
+            <Parameter Id="maxQuantity" Name="max. quantity of items" Type="Float" Value="20.0"/>
+        </ParameterBag>
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="parentSection" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="section002"/>
+            <Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="product02"/>
+        </ParameterBag>
+    </Resource>
 
-	<Resource Id="slot006" Name="Slot 4" Type="Slot">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="quantity" Name="Quantity" Type="Float" Value="22.0" />
-			<Parameter Id="maxQuantity" Name="max. quantity of items" Type="Float" Value="20.0" />
-		</ParameterBag>
-		<ParameterBag Id="relations" Name="Relations" Type="Parameters">
-			<Parameter Id="parentSection" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="section002" />
-			<Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value="" />
-		</ParameterBag>
-	</Resource>
+    <Resource Id="slot006" Name="Slot 4" Type="Slot">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="quantity" Name="Quantity" Type="Float" Value="22.0"/>
+            <Parameter Id="maxQuantity" Name="max. quantity of items" Type="Float" Value="20.0"/>
+        </ParameterBag>
+        <ParameterBag Id="relations" Name="Relations" Type="Parameters">
+            <Parameter Id="parentSection" Name="Section" Type="String" Interpretation="Resource-Ref" Uom="Section" Value="section002"/>
+            <Parameter Id="product" Name="Product" Type="String" Interpretation="Resource-Ref" Uom="Product" Value=""/>
+        </ParameterBag>
+    </Resource>
 
 </StrolchModel>
\ No newline at end of file
diff --git a/li.strolch.service/src/test/resources/svctest/data/Activities.xml b/li.strolch.service/src/test/resources/svctest/data/Activities.xml
index c4cd5194f..7f47584e8 100644
--- a/li.strolch.service/src/test/resources/svctest/data/Activities.xml
+++ b/li.strolch.service/src/test/resources/svctest/data/Activities.xml
@@ -1,86 +1,87 @@
 <?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="produceBicycle" Name="Activity" Type="ToStock" TimeOrdering="Series">
-		<Action Id="produce" Name="Produce" ResourceId="bicycle" ResourceType="Product" Type="Produce" />
-	</Activity>
+    <Activity Id="produceBicycle" Name="Activity" Type="ToStock" TimeOrdering="Series">
+        <Action Id="produce" Name="Produce" ResourceId="bicycle" ResourceType="Product" Type="Produce"/>
+    </Activity>
 
-	<Activity Id="conveyors" Name="Activity" Type="ToStock" TimeOrdering="Series">
-		<Action Id="action_1" Name="Action 1" ResourceId="conveyor1" ResourceType="Conveyor" Type="Use" />
-		<Action Id="action_2" Name="Action 2" ResourceId="conveyor2" ResourceType="Conveyor" Type="Use" />
-		<Action Id="action_3" Name="Action 3" ResourceId="conveyor3" ResourceType="Conveyor" Type="Use" />
-	</Activity>
+    <Activity Id="conveyors" Name="Activity" Type="ToStock" TimeOrdering="Series">
+        <Action Id="action_1" Name="Action 1" ResourceId="conveyor1" ResourceType="Conveyor" Type="Use"/>
+        <Action Id="action_2" Name="Action 2" ResourceId="conveyor2" ResourceType="Conveyor" Type="Use"/>
+        <Action Id="action_3" Name="Action 3" ResourceId="conveyor3" ResourceType="Conveyor" Type="Use"/>
+    </Activity>
 
-	<Activity Id="parallel" Name="Activity" Type="ToStock" TimeOrdering="Parallel">
-		<Action Id="action_1" Name="Action 1" ResourceId="article1" ResourceType="Article" Type="Use" />
-		<Action Id="action_2" Name="Action 2" ResourceId="article2" ResourceType="Article" Type="Use" />
-		<Action Id="action_3" Name="Action 3" ResourceId="article3" ResourceType="Article" Type="Use" />
-	</Activity>
+    <Activity Id="parallel" Name="Activity" Type="ToStock" TimeOrdering="Parallel">
+        <Action Id="action_1" Name="Action 1" ResourceId="article1" ResourceType="Article" Type="Use"/>
+        <Action Id="action_2" Name="Action 2" ResourceId="article2" ResourceType="Article" Type="Use"/>
+        <Action Id="action_3" Name="Action 3" ResourceId="article3" ResourceType="Article" Type="Use"/>
+    </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>
+    <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_2" 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_2" 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_3" 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_3" 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.service/src/test/resources/svctest/data/Enums.xml b/li.strolch.service/src/test/resources/svctest/data/Enums.xml
index eb80fda34..45cd9ad04 100644
--- a/li.strolch.service/src/test/resources/svctest/data/Enums.xml
+++ b/li.strolch.service/src/test/resources/svctest/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="Anglican" Type="String" Value="Anglican" />
-			<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="Anglican" Type="String" Value="Anglican"/>
+            <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.service/src/test/resources/svctest/data/Orders.xml b/li.strolch.service/src/test/resources/svctest/data/Orders.xml
index 45edd36f4..2f3c1c5cf 100644
--- a/li.strolch.service/src/test/resources/svctest/data/Orders.xml
+++ b/li.strolch.service/src/test/resources/svctest/data/Orders.xml
@@ -1,60 +1,61 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel>
-	<Order Id="myCarOrder" Name="Car Production Order" Type="ProductionOrder" 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>
-	<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>
-	<Order Id="@1" 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>
-	<Order Id="@2" 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>
-	<Order Id="@3" 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>
-		<ParameterBag Id="@bag02" Name="Test Bag" Type="TestBag" />
-	</Order>
-	<Order Id="@4" Name="Test Name" Type="Something" Date="2013-11-20T07:42:57.699+01:00" State="CREATED" />
+<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="myCarOrder" Name="Car Production Order" Type="ProductionOrder" 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>
+    <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>
+    <Order Id="@1" 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>
+    <Order Id="@2" 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>
+    <Order Id="@3" 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>
+        <ParameterBag Id="@bag02" Name="Test Bag" Type="TestBag"/>
+    </Order>
+    <Order Id="@4" Name="Test Name" Type="Something" Date="2013-11-20T07:42:57.699+01:00" State="Created"/>
 </StrolchModel>
diff --git a/li.strolch.service/src/test/resources/svctest/data/Resources.xml b/li.strolch.service/src/test/resources/svctest/data/Resources.xml
index bc55d2ff9..6962d7875 100644
--- a/li.strolch.service/src/test/resources/svctest/data/Resources.xml
+++ b/li.strolch.service/src/test/resources/svctest/data/Resources.xml
@@ -1,82 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns="https://strolch.li/xsd/StrolchModel-1.4.xsd">
+<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="yellow" Name="Yellow Ball" Type="Ball">
-		<ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
-			<Parameter Id="owner" Name="Owner" Type="String" Value="eitch" />
-		</ParameterBag>
-		<ParameterBag Id="something" Name="Something" Type="Something" />
-		<TimedState Id="@state1" Name="State" Type="Float" />
-		<TimedState Id="@state2" Name="State" Type="Float">
-			<Value Time="1970-01-01T00:00:00.000+01:00" Value="0.0" />
-			<Value Time="1970-01-01T00:01:00.000+01:00" Value="1.0" />
-			<Value Time="1970-01-01T00:02:00.000+01:00" Value="2.0" />
-			<Value Time="1970-01-01T00:03:00.000+01:00" Value="1.0" />
-		</TimedState>
-		<TimedState Id="@state3" Name="State" Type="Integer" />
-		<TimedState Id="@state4" Name="State" Type="Integer">
-			<Value Time="1970-01-01T00:00:00.000+01:00" Value="0" />
-			<Value Time="1970-01-01T00:01:00.000+01:00" Value="1" />
-			<Value Time="1970-01-01T00:02:00.000+01:00" Value="2" />
-			<Value Time="1970-01-01T00:03:00.000+01:00" Value="1" />
-		</TimedState>
-		<TimedState Id="@state5" Name="State" Type="Boolean" />
-		<TimedState Id="@state6" Name="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" />
-			<Value Time="1970-01-01T00:03:00.000+01:00" Value="true" />
-		</TimedState>
-	</Resource>
-	<Resource Id="something" Name="Something" Type="Something" />
+    <Resource Id="yellow" Name="Yellow Ball" Type="Ball">
+        <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
+            <Parameter Id="owner" Name="Owner" Type="String" Value="eitch"/>
+        </ParameterBag>
+        <ParameterBag Id="something" Name="Something" Type="Something"/>
+        <TimedState Id="@state1" Name="State" Type="Float"/>
+        <TimedState Id="@state2" Name="State" Type="Float">
+            <Value Time="1970-01-01T00:00:00.000+01:00" Value="0.0"/>
+            <Value Time="1970-01-01T00:01:00.000+01:00" Value="1.0"/>
+            <Value Time="1970-01-01T00:02:00.000+01:00" Value="2.0"/>
+            <Value Time="1970-01-01T00:03:00.000+01:00" Value="1.0"/>
+        </TimedState>
+        <TimedState Id="@state3" Name="State" Type="Integer"/>
+        <TimedState Id="@state4" Name="State" Type="Integer">
+            <Value Time="1970-01-01T00:00:00.000+01:00" Value="0"/>
+            <Value Time="1970-01-01T00:01:00.000+01:00" Value="1"/>
+            <Value Time="1970-01-01T00:02:00.000+01:00" Value="2"/>
+            <Value Time="1970-01-01T00:03:00.000+01:00" Value="1"/>
+        </TimedState>
+        <TimedState Id="@state5" Name="State" Type="Boolean"/>
+        <TimedState Id="@state6" Name="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"/>
+            <Value Time="1970-01-01T00:03:00.000+01:00" Value="true"/>
+        </TimedState>
+    </Resource>
+    <Resource Id="something" Name="Something" Type="Something"/>
 
-	<Resource Id="bicycle" Name="Bicycle" Type="Product">
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.DurationExecution" />
-		</Policies>
-	</Resource>
+    <Resource Id="bicycle" Name="Bicycle" Type="Product">
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.DurationExecution"/>
+        </Policies>
+    </Resource>
 
-	<Resource Id="article1" Name="Article 1" Type="Article">
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.DurationExecution" />
-		</Policies>
-	</Resource>
+    <Resource Id="article1" Name="Article 1" Type="Article">
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.DurationExecution"/>
+        </Policies>
+    </Resource>
 
-	<Resource Id="article2" Name="Article 2" Type="Article">
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.DurationExecution" />
-		</Policies>
-	</Resource>
+    <Resource Id="article2" Name="Article 2" Type="Article">
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.DurationExecution"/>
+        </Policies>
+    </Resource>
 
-	<Resource Id="article3" Name="Article 3" Type="Article">
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.DurationExecution" />
-		</Policies>
-	</Resource>
+    <Resource Id="article3" Name="Article 3" Type="Article">
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.DurationExecution"/>
+        </Policies>
+    </Resource>
 
-	<Resource Id="conveyor1" Name="Conveyor 1" Type="Conveyor">
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.DurationExecution" />
-		</Policies>
-	</Resource>
+    <Resource Id="conveyor1" Name="Conveyor 1" Type="Conveyor">
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.DurationExecution"/>
+        </Policies>
+    </Resource>
 
-	<Resource Id="conveyor2" Name="Conveyor 2" Type="Conveyor">
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.DurationExecution" />
-		</Policies>
-	</Resource>
+    <Resource Id="conveyor2" Name="Conveyor 2" Type="Conveyor">
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.DurationExecution"/>
+        </Policies>
+    </Resource>
 
-	<Resource Id="conveyor3" Name="Conveyor 3" Type="Conveyor">
-		<TimedState Id="quantity" Name="Quantity" Type="Integer" />
-		<Policies>
-			<Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.DurationExecution" />
-		</Policies>
-	</Resource>
+    <Resource Id="conveyor3" Name="Conveyor 3" Type="Conveyor">
+        <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
+        <Policies>
+            <Policy Type="ExecutionPolicy" Value="java:li.strolch.execution.policy.DurationExecution"/>
+        </Policies>
+    </Resource>
 
 </StrolchModel>
diff --git a/li.strolch.service/src/test/resources/svctest/data/StrolchModel.xml b/li.strolch.service/src/test/resources/svctest/data/StrolchModel.xml
index d36b630f9..b8139a4e7 100644
--- a/li.strolch.service/src/test/resources/svctest/data/StrolchModel.xml
+++ b/li.strolch.service/src/test/resources/svctest/data/StrolchModel.xml
@@ -1,9 +1,10 @@
 <?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">
 
-	<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.service/src/test/resources/transienttest/data/Enums.xml b/li.strolch.service/src/test/resources/transienttest/data/Enums.xml
index eb80fda34..45cd9ad04 100644
--- a/li.strolch.service/src/test/resources/transienttest/data/Enums.xml
+++ b/li.strolch.service/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="Anglican" Type="String" Value="Anglican" />
-			<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="Anglican" Type="String" Value="Anglican"/>
+            <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.service/src/test/resources/transienttest/data/Orders.xml b/li.strolch.service/src/test/resources/transienttest/data/Orders.xml
index 55358bcaa..be9537285 100644
--- a/li.strolch.service/src/test/resources/transienttest/data/Orders.xml
+++ b/li.strolch.service/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.service/src/test/resources/transienttest/data/Resources.xml b/li.strolch.service/src/test/resources/transienttest/data/Resources.xml
index e6259cb83..c3bba8703 100644
--- a/li.strolch.service/src/test/resources/transienttest/data/Resources.xml
+++ b/li.strolch.service/src/test/resources/transienttest/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.service/src/test/resources/transienttest/data/StrolchModel.xml b/li.strolch.service/src/test/resources/transienttest/data/StrolchModel.xml
index 9fd6b2020..3cc2a82f8 100644
--- a/li.strolch.service/src/test/resources/transienttest/data/StrolchModel.xml
+++ b/li.strolch.service/src/test/resources/transienttest/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="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="Enums.xml"/>
+    <IncludeFile file="Resources.xml"/>
+    <IncludeFile file="Orders.xml"/>
 
 </StrolchModel>
\ No newline at end of file