diff --git a/example/data/defaultModel.xml b/example/data/defaultModel.xml
index 4c9e79f..069a2a1 100644
--- a/example/data/defaultModel.xml
+++ b/example/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/example/data/plc-state.xml b/example/data/plc-state.xml
index 41b3b33..67752f8 100644
--- a/example/data/plc-state.xml
+++ b/example/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/example/data/plc-templates.xml b/example/data/plc-templates.xml
index 90bd5d7..d770f1e 100644
--- a/example/data/plc-templates.xml
+++ b/example/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/example/data/strolch-plc-example-connections.xml b/example/data/strolch-plc-example-connections.xml
index 7a6c906..231dafb 100644
--- a/example/data/strolch-plc-example-connections.xml
+++ b/example/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/plc-core/src/test/resources/test-runtime/data/defaultModel.xml b/plc-core/src/test/resources/test-runtime/data/defaultModel.xml
index f59fc70..6a7c06e 100644
--- a/plc-core/src/test/resources/test-runtime/data/defaultModel.xml
+++ b/plc-core/src/test/resources/test-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">
 
     <!--
         Simple logger output connection