diff --git a/strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/data/Model.xml b/strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/data/Model.xml
index c6ac169..d605563 100644
--- a/strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/data/Model.xml
+++ b/strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/data/Model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Resource Id="yellowBall" Name="Yellow Ball" Type="Ball">
         <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
diff --git a/strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/data/StrolchModel.xsd b/strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/data/StrolchModel.xsd
index 0375feb..69c7d08 100644
--- a/strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/data/StrolchModel.xsd
+++ b/strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/data/StrolchModel.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-		   xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://strolch.li/schema/StrolchModel.xsd"
+		   xmlns="https://strolch.li/schema/StrolchModel.xsd"
 		   elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xs:annotation>
diff --git a/strolch.mvn.archetype.main/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/data/Model.xml b/strolch.mvn.archetype.main/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/data/Model.xml
index f81c984..32ee1f2 100644
--- a/strolch.mvn.archetype.main/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/data/Model.xml
+++ b/strolch.mvn.archetype.main/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/data/Model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <!-- include root model here -->
     <IncludeFile file="../../../runtime/data/Model.xml"/>
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/StrolchModel.xsd b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/StrolchModel.xsd
index 0375feb..69c7d08 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/StrolchModel.xsd
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/StrolchModel.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-		   xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://strolch.li/schema/StrolchModel.xsd"
+		   xmlns="https://strolch.li/schema/StrolchModel.xsd"
 		   elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xs:annotation>
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/defaultModel.xml b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/defaultModel.xml
index d9de723..5f28260 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/defaultModel.xml
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/defaultModel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <IncludeFile file="plc-templates.xml"/>
     <IncludeFile file="plc-state.xml"/>
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/plc-state.xml b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/plc-state.xml
index 41b3b33..67752f8 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/plc-state.xml
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/plc-state.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Resource Id="configuration" Name="Configuration" Type="Configuration">
         <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/plc-templates.xml b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/plc-templates.xml
index 90bd5d7..d770f1e 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/plc-templates.xml
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/plc-templates.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<StrolchModel xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd">
+<StrolchModel xmlns="https://strolch.li/schema/StrolchModel.xsd">
 
     <Resource Id="PlcLogicalDevice" Name="PlcLogicalDevice Template" Type="Template">
         <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/strolch-plc-example-connections.xml b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/strolch-plc-example-connections.xml
index 7a6c906..231dafb 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/strolch-plc-example-connections.xml
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/data/strolch-plc-example-connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <!--
         Barcode reader connection, currently place holder with RandomString
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/runtime/data/Model.xml b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/runtime/data/Model.xml
index 70fc329..8b33ae4 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/runtime/data/Model.xml
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/runtime/data/Model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Resource Id="configuration" Name="Configuration" Type="Configuration">
         <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/runtime/data/StrolchModel.xsd b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/runtime/data/StrolchModel.xsd
index 0375feb..69c7d08 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/runtime/data/StrolchModel.xsd
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/runtime/data/StrolchModel.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-		   xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://strolch.li/schema/StrolchModel.xsd"
+		   xmlns="https://strolch.li/schema/StrolchModel.xsd"
 		   elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xs:annotation>
diff --git a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/data/Model.xml b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/data/Model.xml
index 8084d4e..47a0879 100644
--- a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/data/Model.xml
+++ b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/data/Model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Resource Id="location1" Name="Bücher Lüthy Solothurn" Type="Location">
         <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
diff --git a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/data/StrolchModel.xsd b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/data/StrolchModel.xsd
index 0375feb..69c7d08 100644
--- a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/data/StrolchModel.xsd
+++ b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/data/StrolchModel.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-		   xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://strolch.li/schema/StrolchModel.xsd"
+		   xmlns="https://strolch.li/schema/StrolchModel.xsd"
 		   elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xs:annotation>
diff --git a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/data/Model.xml b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/data/Model.xml
index f81c984..32ee1f2 100644
--- a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/data/Model.xml
+++ b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/data/Model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <!-- include root model here -->
     <IncludeFile file="../../../runtime/data/Model.xml"/>