diff --git a/li.strolch.model/src/main/resources/StrolchModel.xsd b/li.strolch.model/src/main/resources/StrolchModel-1.4.xsd
similarity index 97%
rename from li.strolch.model/src/main/resources/StrolchModel.xsd
rename to li.strolch.model/src/main/resources/StrolchModel-1.4.xsd
index d1b4521af..5a7487ea5 100644
--- a/li.strolch.model/src/main/resources/StrolchModel.xsd
+++ b/li.strolch.model/src/main/resources/StrolchModel-1.4.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://www.strolch.li/xsd/StrolchModel.xsd" xmlns="https://www.strolch.li/xsd/StrolchModel.xsd"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://www.strolch.li/xsd/StrolchModel-1.4.xsd" xmlns="https://www.strolch.li/xsd/StrolchModel-1.4.xsd"
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xs:annotation>
-		<xs:documentation>This is Version 1.4.0-SNAPSHOT of the StrolchModel XSD.</xs:documentation>
+		<xs:documentation>This is Version 1.4.x of the StrolchModel XSD.</xs:documentation>
 	</xs:annotation>
 
 	<xs:element name="StrolchModel" type="StrolchModelType" />
diff --git a/li.strolch.model/src/test/resources/data/StrolchModel.xml b/li.strolch.model/src/test/resources/data/StrolchModel.xml
index aa437076d..88fe8c686 100644
--- a/li.strolch.model/src/test/resources/data/StrolchModel.xml
+++ b/li.strolch.model/src/test/resources/data/StrolchModel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://www.strolch.li/xsd/StrolchModel.xsd" xsi:schemaLocation="https://www.strolch.li/xsd/StrolchModel.xsd StrolchModel.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://www.strolch.li/xsd/StrolchModel-1.4.xsd" xsi:schemaLocation="https://www.strolch.li/xsd/StrolchModel-1.4.xsd StrolchModel-1.4.xsd">
 
 	<Order Id="@test1" Name="Test Order" Type="Order">
 		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
diff --git a/li.strolch.model/src/test/resources/data/StrolchModelAll.xml b/li.strolch.model/src/test/resources/data/StrolchModelAll.xml
index 0a56c1a46..1b3b05673 100644
--- a/li.strolch.model/src/test/resources/data/StrolchModelAll.xml
+++ b/li.strolch.model/src/test/resources/data/StrolchModelAll.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://www.strolch.li/xsd/StrolchModel.xsd" xsi:schemaLocation="https://www.strolch.li/xsd/StrolchModel.xsd StrolchModel.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://www.strolch.li/xsd/StrolchModel-1.4.xsd" xsi:schemaLocation="https://www.strolch.li/xsd/StrolchModel-1.4.xsd StrolchModel-1.4.xsd">
 
 	<IncludeFile file="Include1.xml" />
 	<IncludeFile file="Include2.xml" />
diff --git a/li.strolch.website/www.strolch.li/documentation-model.html b/li.strolch.website/www.strolch.li/documentation-model.html
index 50f347874..480b50629 100644
--- a/li.strolch.website/www.strolch.li/documentation-model.html
+++ b/li.strolch.website/www.strolch.li/documentation-model.html
@@ -51,14 +51,15 @@
 
     <div class="content">
 
-        <p>There is a XML Schema which defines the model in XML: <a href="xsd/StrolchModel.xsd">StrolchModel.xsd</a>
+        <p>There is a XML Schema which defines the model in XML: <a
+                href="xsd/StrolchModel-1.4.xsd">StrolchModel-1.4.xsd</a>
         </p>
 
         Here is an example of all the possible elements in Strolch:
         <pre>
 &lt;StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns="https://www.strolch.li/xsd/StrolchModel.xsd"
-            xsi:schemaLocation="https://www.strolch.li/xsd/StrolchModel.xsd StrolchModel.xsd"&gt;
+            xmlns="https://www.strolch.li/xsd/StrolchModel-1.4.xsd"
+            xsi:schemaLocation="https://www.strolch.li/xsd/StrolchModel-1.4.xsd StrolchModel-1.4.xsd"&gt;
 
   &lt;IncludeFile file="Include1.xml"/&gt;
 
diff --git a/li.strolch.website/www.strolch.li/xsd/StrolchModel-1.4.xsd b/li.strolch.website/www.strolch.li/xsd/StrolchModel-1.4.xsd
new file mode 100644
index 000000000..7dcdbbd4e
--- /dev/null
+++ b/li.strolch.website/www.strolch.li/xsd/StrolchModel-1.4.xsd
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://www.strolch.li/xsd/StrolchModel-1.4.xsd"
+           xmlns="https://www.strolch.li/xsd/StrolchModel-1.4.xsd"
+           elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+    <xs:annotation>
+        <xs:documentation>This is Version 1.4.x of the StrolchModel XSD.</xs:documentation>
+    </xs:annotation>
+
+    <xs:element name="StrolchModel" type="StrolchModelType"/>
+
+    <xs:complexType name="StrolchModelType">
+        <xs:sequence maxOccurs="unbounded" minOccurs="0">
+            <xs:choice>
+                <xs:element type="IncludeFileType" name="IncludeFile" maxOccurs="unbounded" minOccurs="0"/>
+                <xs:element type="OrderType" name="Order" maxOccurs="unbounded" minOccurs="0"/>
+                <xs:element type="ResourceType" name="Resource" maxOccurs="unbounded" minOccurs="0"/>
+                <xs:element type="ActivityType" name="Activity" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="IncludeFileType">
+        <xs:attribute type="xs:string" name="file"/>
+    </xs:complexType>
+
+    <xs:complexType name="VersionType">
+        <xs:attribute type="xs:int" name="Version"/>
+        <xs:attribute type="xs:string" name="CreatedBy"/>
+        <xs:attribute type="xs:dateTime" name="CreatedAt"/>
+        <xs:attribute type="xs:string" name="Deleted"/>
+    </xs:complexType>
+
+    <xs:complexType name="OrderType">
+        <xs:sequence>
+            <xs:element type="VersionType" name="Version" maxOccurs="1" minOccurs="0"/>
+            <xs:element type="ParameterBagType" name="ParameterBag" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element type="PoliciesType" name="Policies" maxOccurs="1" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="Id"/>
+        <xs:attribute type="xs:string" name="Name"/>
+        <xs:attribute type="xs:string" name="Type"/>
+        <xs:attribute type="StateType" name="State"/>
+    </xs:complexType>
+
+    <xs:complexType name="ResourceType">
+        <xs:sequence>
+            <xs:element type="VersionType" name="Version" maxOccurs="1" minOccurs="0"/>
+            <xs:element type="ParameterBagType" name="ParameterBag" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element type="TimedStateType" name="TimedState" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element type="PoliciesType" name="Policies" maxOccurs="1" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="Id"/>
+        <xs:attribute type="xs:string" name="Name"/>
+        <xs:attribute type="xs:string" name="Type"/>
+    </xs:complexType>
+
+    <xs:complexType name="ActivityType">
+        <xs:sequence>
+            <xs:element type="VersionType" name="Version" maxOccurs="1" minOccurs="0"/>
+            <xs:element type="ParameterBagType" name="ParameterBag" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element type="PoliciesType" name="Policies" maxOccurs="1" minOccurs="0"/>
+            <xs:sequence maxOccurs="unbounded" minOccurs="0">
+                <xs:choice>
+                    <xs:element type="ActionType" name="Action" maxOccurs="unbounded" minOccurs="0"/>
+                    <xs:element type="ActivityType" name="Activity" maxOccurs="unbounded" minOccurs="0"/>
+                </xs:choice>
+            </xs:sequence>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="Id"/>
+        <xs:attribute type="xs:string" name="Name"/>
+        <xs:attribute type="xs:string" name="Type"/>
+        <xs:attribute type="StateType" name="State"/>
+        <xs:attribute type="TimeOrderingType" name="TimeOrdering"/>
+    </xs:complexType>
+
+    <xs:complexType name="ActionType">
+        <xs:sequence>
+            <xs:element type="ParameterBagType" name="ParameterBag" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element type="PoliciesType" name="Policies" maxOccurs="1" minOccurs="0"/>
+            <xs:element type="ValueChangeType" name="ValueChange" maxOccurs="unbounded" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="Id"/>
+        <xs:attribute type="xs:string" name="Name"/>
+        <xs:attribute type="xs:string" name="ResourceId"/>
+        <xs:attribute type="xs:string" name="ResourceType"/>
+        <xs:attribute type="StateType" name="State"/>
+        <xs:attribute type="xs:string" name="Type"/>
+    </xs:complexType>
+
+    <xs:complexType name="ParameterBagType">
+        <xs:sequence>
+            <xs:element type="ParameterType" name="Parameter" maxOccurs="unbounded" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="Id"/>
+        <xs:attribute type="xs:string" name="Name"/>
+        <xs:attribute type="xs:string" name="Type"/>
+    </xs:complexType>
+
+    <xs:complexType name="ParameterType">
+        <xs:attribute type="xs:string" name="Id"/>
+        <xs:attribute type="xs:string" name="Name"/>
+        <xs:attribute type="ParameterValueType" name="Type"/>
+        <xs:attribute type="xs:string" name="Value"/>
+        <xs:attribute type="xs:string" name="Interpretation" use="optional"/>
+        <xs:attribute type="xs:string" name="Uom" use="optional"/>
+        <xs:attribute type="xs:boolean" name="Hidden" use="optional"/>
+        <xs:attribute type="xs:int" name="Index" use="optional"/>
+    </xs:complexType>
+
+    <xs:complexType name="PoliciesType">
+        <xs:sequence>
+            <xs:element type="PolicyType" name="Policy" maxOccurs="unbounded" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="PolicyType">
+        <xs:attribute type="xs:string" name="Type"/>
+        <xs:attribute type="xs:string" name="Value"/>
+    </xs:complexType>
+
+    <xs:complexType name="TimedStateType">
+        <xs:sequence>
+            <xs:element type="ValueType" name="Value" maxOccurs="unbounded" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="Id"/>
+        <xs:attribute type="xs:string" name="Name"/>
+        <xs:attribute type="TimedStateTypeType" name="Type"/>
+    </xs:complexType>
+
+    <xs:complexType name="ValueType">
+        <xs:attribute type="xs:dateTime" name="Time"/>
+        <xs:attribute type="xs:string" name="Value"/>
+    </xs:complexType>
+
+    <xs:complexType name="ValueChangeType">
+        <xs:attribute type="xs:string" name="StateId"/>
+        <xs:attribute type="xs:dateTime" name="Time"/>
+        <xs:attribute type="xs:string" name="Value"/>
+        <xs:attribute type="TimedStateTypeType" name="Type"/>
+    </xs:complexType>
+
+    <xs:simpleType name="StateType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Created"/>
+            <xs:enumeration value="Planning"/>
+            <xs:enumeration value="Planned"/>
+            <xs:enumeration value="Execution"/>
+            <xs:enumeration value="Stopped"/>
+            <xs:enumeration value="Executed"/>
+            <xs:enumeration value="Closed"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="TimeOrderingType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Series"/>
+            <xs:enumeration value="Parallel"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="ParameterValueType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Boolean"/>
+            <xs:enumeration value="String"/>
+            <xs:enumeration value="Integer"/>
+            <xs:enumeration value="Long"/>
+            <xs:enumeration value="Float"/>
+            <xs:enumeration value="Date"/>
+            <xs:enumeration value="Duration"/>
+            <xs:enumeration value="StringList"/>
+            <xs:enumeration value="IntegerList"/>
+            <xs:enumeration value="FloatList"/>
+            <xs:enumeration value="LongList"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="TimedStateTypeType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Boolean"/>
+            <xs:enumeration value="Integer"/>
+            <xs:enumeration value="Float"/>
+            <xs:enumeration value="StringSet"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
\ No newline at end of file
diff --git a/li.strolch.website/www.strolch.li/xsd/StrolchModel.xsd b/li.strolch.website/www.strolch.li/xsd/StrolchModel.xsd
deleted file mode 100644
index 9cd40bd2a..000000000
--- a/li.strolch.website/www.strolch.li/xsd/StrolchModel.xsd
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://www.strolch.li/xsd/StrolchModel.xsd" xmlns="https://www.strolch.li/xsd/StrolchModel.xsd"
-           elementFormDefault="qualified" attributeFormDefault="unqualified">
-
-    <xs:annotation>
-        <xs:documentation>This is Version 1.4.0-SNAPSHOT of the StrolchModel XSD.</xs:documentation>
-    </xs:annotation>
-
-    <xs:element name="StrolchModel" type="StrolchModelType" />
-
-    <xs:complexType name="StrolchModelType">
-        <xs:sequence maxOccurs="unbounded" minOccurs="0">
-            <xs:choice>
-                <xs:element type="IncludeFileType" name="IncludeFile" maxOccurs="unbounded" minOccurs="0" />
-                <xs:element type="OrderType" name="Order" maxOccurs="unbounded" minOccurs="0" />
-                <xs:element type="ResourceType" name="Resource" maxOccurs="unbounded" minOccurs="0" />
-                <xs:element type="ActivityType" name="Activity" maxOccurs="unbounded" minOccurs="0" />
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="IncludeFileType">
-        <xs:attribute type="xs:string" name="file" />
-    </xs:complexType>
-
-    <xs:complexType name="VersionType">
-        <xs:attribute type="xs:int" name="Version" />
-        <xs:attribute type="xs:string" name="CreatedBy" />
-        <xs:attribute type="xs:dateTime" name="CreatedAt" />
-        <xs:attribute type="xs:string" name="Deleted" />
-    </xs:complexType>
-
-    <xs:complexType name="OrderType">
-        <xs:sequence>
-            <xs:element type="VersionType" name="Version" maxOccurs="1" minOccurs="0" />
-            <xs:element type="ParameterBagType" name="ParameterBag" maxOccurs="unbounded" minOccurs="0" />
-            <xs:element type="PoliciesType" name="Policies" maxOccurs="1" minOccurs="0" />
-        </xs:sequence>
-        <xs:attribute type="xs:string" name="Id" />
-        <xs:attribute type="xs:string" name="Name" />
-        <xs:attribute type="xs:string" name="Type" />
-        <xs:attribute type="StateType" name="State" />
-    </xs:complexType>
-
-    <xs:complexType name="ResourceType">
-        <xs:sequence>
-            <xs:element type="VersionType" name="Version" maxOccurs="1" minOccurs="0" />
-            <xs:element type="ParameterBagType" name="ParameterBag" maxOccurs="unbounded" minOccurs="0" />
-            <xs:element type="TimedStateType" name="TimedState" maxOccurs="unbounded" minOccurs="0" />
-            <xs:element type="PoliciesType" name="Policies" maxOccurs="1" minOccurs="0" />
-        </xs:sequence>
-        <xs:attribute type="xs:string" name="Id" />
-        <xs:attribute type="xs:string" name="Name" />
-        <xs:attribute type="xs:string" name="Type" />
-    </xs:complexType>
-
-    <xs:complexType name="ActivityType">
-        <xs:sequence>
-            <xs:element type="VersionType" name="Version" maxOccurs="1" minOccurs="0" />
-            <xs:element type="ParameterBagType" name="ParameterBag" maxOccurs="unbounded" minOccurs="0" />
-            <xs:element type="PoliciesType" name="Policies" maxOccurs="1" minOccurs="0" />
-            <xs:sequence maxOccurs="unbounded" minOccurs="0">
-                <xs:choice>
-                    <xs:element type="ActionType" name="Action" maxOccurs="unbounded" minOccurs="0" />
-                    <xs:element type="ActivityType" name="Activity" maxOccurs="unbounded" minOccurs="0" />
-                </xs:choice>
-            </xs:sequence>
-        </xs:sequence>
-        <xs:attribute type="xs:string" name="Id" />
-        <xs:attribute type="xs:string" name="Name" />
-        <xs:attribute type="xs:string" name="Type" />
-        <xs:attribute type="StateType" name="State" />
-        <xs:attribute type="TimeOrderingType" name="TimeOrdering" />
-    </xs:complexType>
-
-    <xs:complexType name="ActionType">
-        <xs:sequence>
-            <xs:element type="ParameterBagType" name="ParameterBag" maxOccurs="unbounded" minOccurs="0" />
-            <xs:element type="PoliciesType" name="Policies" maxOccurs="1" minOccurs="0" />
-            <xs:element type="ValueChangeType" name="ValueChange" maxOccurs="unbounded" minOccurs="0" />
-        </xs:sequence>
-        <xs:attribute type="xs:string" name="Id" />
-        <xs:attribute type="xs:string" name="Name" />
-        <xs:attribute type="xs:string" name="ResourceId" />
-        <xs:attribute type="xs:string" name="ResourceType" />
-        <xs:attribute type="StateType" name="State" />
-        <xs:attribute type="xs:string" name="Type" />
-    </xs:complexType>
-
-    <xs:complexType name="ParameterBagType">
-        <xs:sequence>
-            <xs:element type="ParameterType" name="Parameter" maxOccurs="unbounded" minOccurs="0" />
-        </xs:sequence>
-        <xs:attribute type="xs:string" name="Id" />
-        <xs:attribute type="xs:string" name="Name" />
-        <xs:attribute type="xs:string" name="Type" />
-    </xs:complexType>
-
-    <xs:complexType name="ParameterType">
-        <xs:attribute type="xs:string" name="Id" />
-        <xs:attribute type="xs:string" name="Name" />
-        <xs:attribute type="ParameterValueType" name="Type" />
-        <xs:attribute type="xs:string" name="Value" />
-        <xs:attribute type="xs:string" name="Interpretation" use="optional" />
-        <xs:attribute type="xs:string" name="Uom" use="optional" />
-        <xs:attribute type="xs:boolean" name="Hidden" use="optional" />
-        <xs:attribute type="xs:int" name="Index" use="optional" />
-    </xs:complexType>
-
-    <xs:complexType name="PoliciesType">
-        <xs:sequence>
-            <xs:element type="PolicyType" name="Policy" maxOccurs="unbounded" minOccurs="0" />
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="PolicyType">
-        <xs:attribute type="xs:string" name="Type" />
-        <xs:attribute type="xs:string" name="Value" />
-    </xs:complexType>
-
-    <xs:complexType name="TimedStateType">
-        <xs:sequence>
-            <xs:element type="ValueType" name="Value" maxOccurs="unbounded" minOccurs="0" />
-        </xs:sequence>
-        <xs:attribute type="xs:string" name="Id" />
-        <xs:attribute type="xs:string" name="Name" />
-        <xs:attribute type="TimedStateTypeType" name="Type" />
-    </xs:complexType>
-
-    <xs:complexType name="ValueType">
-        <xs:attribute type="xs:dateTime" name="Time" />
-        <xs:attribute type="xs:string" name="Value" />
-    </xs:complexType>
-
-    <xs:complexType name="ValueChangeType">
-        <xs:attribute type="xs:string" name="StateId" />
-        <xs:attribute type="xs:dateTime" name="Time" />
-        <xs:attribute type="xs:string" name="Value" />
-        <xs:attribute type="TimedStateTypeType" name="Type" />
-    </xs:complexType>
-
-    <xs:simpleType name="StateType">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="Created" />
-            <xs:enumeration value="Planning" />
-            <xs:enumeration value="Planned" />
-            <xs:enumeration value="Execution" />
-            <xs:enumeration value="Stopped" />
-            <xs:enumeration value="Executed" />
-            <xs:enumeration value="Closed" />
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="TimeOrderingType">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="Series" />
-            <xs:enumeration value="Parallel" />
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="ParameterValueType">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="Boolean" />
-            <xs:enumeration value="String" />
-            <xs:enumeration value="Integer" />
-            <xs:enumeration value="Long" />
-            <xs:enumeration value="Float" />
-            <xs:enumeration value="Date" />
-            <xs:enumeration value="Duration" />
-            <xs:enumeration value="StringList" />
-            <xs:enumeration value="IntegerList" />
-            <xs:enumeration value="FloatList" />
-            <xs:enumeration value="LongList" />
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="TimedStateTypeType">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="Boolean" />
-            <xs:enumeration value="Integer" />
-            <xs:enumeration value="Float" />
-            <xs:enumeration value="StringSet" />
-        </xs:restriction>
-    </xs:simpleType>
-</xs:schema>
\ No newline at end of file