diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9b8e7b0..289d43e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,9 +3,7 @@ name: CI
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
 
   # Allows to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -19,40 +17,40 @@ jobs:
       - uses: ChristophWurst/xmllint-action@v1.2
         with:
           xml-file: "./examples/Chapter 11 Example 1 Originations/Chapter 11 Example.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-schema-file: ./xsd/DMN.xsd
         if: always()
       - uses: ChristophWurst/xmllint-action@v1.2
         with:
           xml-file: "./examples/Chapter 11 Example 1 Originations/Financial.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-schema-file: ./xsd/DMN.xsd
         if: always()
       - uses: ChristophWurst/xmllint-action@v1.2
         with:
           xml-file: "examples/Chapter 11 Example 2 Ranked Loan Products/Recommended Loan Products.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-schema-file: ./xsd/DMN.xsd
         if: always()
       - uses: ChristophWurst/xmllint-action@v1.2
         with:
           xml-file: "examples/Chapter 11 Example 2 Ranked Loan Products/Loan info.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-schema-file: ./xsd/DMN.xsd
         if: always()
       - uses: ChristophWurst/xmllint-action@v1.2
         with:
           xml-file: "examples/Diagram Interchange/diagram-interchange-decision-service.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-schema-file: ./xsd/DMN.xsd
         if: always()
       - uses: ChristophWurst/xmllint-action@v1.2
         with:
           xml-file: "examples/Diagram Interchange/diagram-interchange-decision-with-listed-input-data.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-schema-file: ./xsd/DMN.xsd
         if: always()
       - uses: ChristophWurst/xmllint-action@v1.2
         with:
           xml-file: "examples/Diagram Interchange/diagram-interchange-dish-example.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-schema-file: ./xsd/DMN.xsd
         if: always()
       - uses: ChristophWurst/xmllint-action@v1.2
         with:
           xml-file: "examples/Diagram Interchange/diagram-interchange-shape-with-label-text.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-schema-file: ./xsd/DMN.xsd
         if: always()
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..bf05e38
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,62 @@
+{
+    "xml.catalogs": [
+        "xsd/catalog.xml"
+    ],
+    "xml.filePathSupport.mappings": [
+        // see: https://github.com/redhat-developer/vscode-xml/blob/main/docs/Features/XMLFilePathSupport.md
+        {
+            "pattern": "**/*.dmn",
+            "expressions": [
+               {
+                  "xpath": "import/@locationURI"
+               }
+            ]
+        }
+    ],
+    "xml.references": [
+        // see: https://github.com/redhat-developer/vscode-xml/blob/main/docs/Features/XMLReferencesFeatures.md
+        {
+            "pattern": "**/*.dmn",
+            "expressions": [
+                {
+                    "from": "itemComponent/typeRef/text()",
+                    "to": "itemDefinition/@name"
+                },
+                {
+                    "from": "@dmnElementRef",
+                    "to": "@id"
+                },
+                {
+                    "from": "@href",
+                    "prefix": "#",
+                    "to": "@id"
+                },
+                {
+                    "from": "DMNEdge/@sourceElement",
+                    "to": "DMNShape/@id"
+                },
+                {
+                    "from": "DMNEdge/@targetElement",
+                    "to": "DMNShape/@id"
+                }
+            ]
+        },
+        {
+            "pattern": "**/*.xmi",
+            "expressions": [
+                {
+                    "from": "@idref",
+                    "to": "@id"
+                },
+                {
+                    "from": "@type",
+                    "to": "@id"
+                },
+                {
+                    "from": "@element",
+                    "to": "@id"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/examples/Chapter 11 Example 1 Originations/Chapter 11 Example.dmn b/examples/Chapter 11 Example 1 Originations/Chapter 11 Example.dmn
index f548867..760b5c2 100644
--- a/examples/Chapter 11 Example 1 Originations/Chapter 11 Example.dmn	
+++ b/examples/Chapter 11 Example 1 Originations/Chapter 11 Example.dmn	
@@ -1,4 +1,15 @@
-<semantic:definitions xmlns:semantic="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:include1="http://www.trisotech.com/definitions/_5e8e877a-af87-434b-9c36-ed51c8d6b514" xmlns:drools="http://www.drools.org/kie/dmn/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rss="http://purl.org/rss/2.0/" xmlns:trisofeed="http://trisotech.com/feed" xmlns:trisodmn="http://www.trisotech.com/2016/triso/dmn" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:triso="http://www.trisotech.com/2015/triso/modeling" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/"              xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase"  xmlns="http://www.trisotech.com/definitions/_9d01a0c4-f529-4ad8-ad8e-ec5fb5d96ad4" id="_9d01a0c4-f529-4ad8-ad8e-ec5fb5d96ad4" name="Chapter 11 Example" namespace="http://www.trisotech.com/definitions/_9d01a0c4-f529-4ad8-ad8e-ec5fb5d96ad4" exporter="DMN Modeler" exporterVersion="6.2.2.1" triso:logoChoice="None">
+<semantic:definitions xmlns:semantic="https://www.omg.org/spec/DMN/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:include1="http://www.trisotech.com/definitions/_5e8e877a-af87-434b-9c36-ed51c8d6b514" xmlns:drools="http://www.drools.org/kie/dmn/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rss="http://purl.org/rss/2.0/" xmlns:trisofeed="http://trisotech.com/feed" xmlns:trisodmn="http://www.trisotech.com/2016/triso/dmn" xmlns:dmndi="https://www.omg.org/spec/DMN/DI/" xmlns:triso="http://www.trisotech.com/2015/triso/modeling" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:feel="https://www.omg.org/spec/DMN/20240513/FEEL/"              xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase"  xmlns="http://www.trisotech.com/definitions/_9d01a0c4-f529-4ad8-ad8e-ec5fb5d96ad4" id="_9d01a0c4-f529-4ad8-ad8e-ec5fb5d96ad4" name="Chapter 11 Example" namespace="http://www.trisotech.com/definitions/_9d01a0c4-f529-4ad8-ad8e-ec5fb5d96ad4" exporter="DMN Modeler" exporterVersion="6.2.2.1" triso:logoChoice="None"
+    xsi:schemaLocation="
+        https://www.omg.org/spec/DMN/
+        https://www.omg.org/spec/DMN/20240513/DMN.xsd
+        https://www.omg.org/spec/DMN/DI/
+        https://www.omg.org/spec/DMN/20240513/DMNDI.xsd
+        http://www.omg.org/spec/DMN/20180521/DI/
+        https://www.omg.org/spec/DMN/20180521/DI.xsd
+        http://www.omg.org/spec/DMN/20180521/DC/
+        https://www.omg.org/spec/DMN/20180521/DC.xsd
+    ">
+
     <semantic:description/>
     <semantic:extensionElements>
         <triso:ProjectCharter>
@@ -7,7 +18,7 @@
             <triso:projectStakeholders/>
         </triso:ProjectCharter>
     </semantic:extensionElements>
-    <semantic:import namespace="http://www.trisotech.com/definitions/_5e8e877a-af87-434b-9c36-ed51c8d6b514" name="Financial" triso:fileId="eyJmIjp7InNrdSI6IjU1ZTFkZDA5LTdjYTUtNGUyMC04NzI1LWVlOTI5NzI2OTZkYiIsIm5hbWUiOiJGaW5hbmNpYWwifSwiciI6eyJhcGlrZXkiOiIyOTIwMDNmNjk4NDBlNzEyIn19" triso:fileName="Chapter 11 Example/Financial" importType="https://www.omg.org/spec/DMN/20230324/MODEL/" drools:modelName="Financial"/>
+    <semantic:import namespace="http://www.trisotech.com/definitions/_5e8e877a-af87-434b-9c36-ed51c8d6b514" name="Financial" triso:fileId="eyJmIjp7InNrdSI6IjU1ZTFkZDA5LTdjYTUtNGUyMC04NzI1LWVlOTI5NzI2OTZkYiIsIm5hbWUiOiJGaW5hbmNpYWwifSwiciI6eyJhcGlrZXkiOiIyOTIwMDNmNjk4NDBlNzEyIn19" triso:fileName="Chapter 11 Example/Financial" importType="https://www.omg.org/spec/DMN/" drools:modelName="Financial"/>
     <semantic:itemDefinition isCollection="false" name="tStrategy" label="tStrategy">
         <semantic:typeRef>string</semantic:typeRef>
         <semantic:allowedValues triso:constraintsType="enumeration">
diff --git a/examples/Chapter 11 Example 1 Originations/Financial.dmn b/examples/Chapter 11 Example 1 Originations/Financial.dmn
index 6d68313..2ec84e2 100644
--- a/examples/Chapter 11 Example 1 Originations/Financial.dmn	
+++ b/examples/Chapter 11 Example 1 Originations/Financial.dmn	
@@ -1,4 +1,14 @@
-<semantic:definitions xmlns:semantic="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:rss="http://purl.org/rss/2.0/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:trisofeed="http://trisotech.com/feed" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:triso="http://www.trisotech.com/2015/triso/modeling" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/"           xmlns:trisodmn="http://www.trisotech.com/2016/triso/dmn"  xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase"  xmlns:drools="http://www.drools.org/kie/dmn/1.1"  xmlns="http://www.trisotech.com/definitions/_5e8e877a-af87-434b-9c36-ed51c8d6b514" id="_5e8e877a-af87-434b-9c36-ed51c8d6b514" name="Financial" namespace="http://www.trisotech.com/definitions/_5e8e877a-af87-434b-9c36-ed51c8d6b514" exporter="DMN Modeler" exporterVersion="6.2.2.1" triso:logoChoice="None">
+<semantic:definitions xmlns:semantic="https://www.omg.org/spec/DMN/" xmlns:rss="http://purl.org/rss/2.0/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:trisofeed="http://trisotech.com/feed" xmlns:dmndi="https://www.omg.org/spec/DMN/DI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:triso="http://www.trisotech.com/2015/triso/modeling" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:feel="https://www.omg.org/spec/DMN/20240513/FEEL/"           xmlns:trisodmn="http://www.trisotech.com/2016/triso/dmn"  xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase"  xmlns:drools="http://www.drools.org/kie/dmn/1.1"  xmlns="http://www.trisotech.com/definitions/_5e8e877a-af87-434b-9c36-ed51c8d6b514" id="_5e8e877a-af87-434b-9c36-ed51c8d6b514" name="Financial" namespace="http://www.trisotech.com/definitions/_5e8e877a-af87-434b-9c36-ed51c8d6b514" exporter="DMN Modeler" exporterVersion="6.2.2.1" triso:logoChoice="None"
+    xsi:schemaLocation="
+        https://www.omg.org/spec/DMN/
+        https://www.omg.org/spec/DMN/20240513/DMN.xsd
+        https://www.omg.org/spec/DMN/DI/
+        https://www.omg.org/spec/DMN/20240513/DMNDI.xsd
+        http://www.omg.org/spec/DMN/20180521/DI/
+        https://www.omg.org/spec/DMN/20180521/DI.xsd
+        http://www.omg.org/spec/DMN/20180521/DC/
+        https://www.omg.org/spec/DMN/20180521/DC.xsd
+    ">
     <semantic:decisionService id="_5e8e877a-af87-434b-9c36-ed51c8d6b514_DS" name="Whole Model Decision Service" triso:dynamicDecisionService="true">
         <semantic:variable name="Whole Model Decision Service" id="_7510044d-9f94-4b5a-a172-bb5412031a86" typeRef="Any"/>
     </semantic:decisionService>
diff --git a/examples/Chapter 11 Example 2 Ranked Loan Products/Loan info.dmn b/examples/Chapter 11 Example 2 Ranked Loan Products/Loan info.dmn
index 249d6d3..e24ed8f 100644
--- a/examples/Chapter 11 Example 2 Ranked Loan Products/Loan info.dmn	
+++ b/examples/Chapter 11 Example 2 Ranked Loan Products/Loan info.dmn	
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<semantic:definitions id="_5c8b9296-96cf-4898-bba5-3a2d21d34eed" name="Loan info" namespace="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed" exporter="DMN Modeler" exporterVersion="6.2.2.3" xmlns:semantic="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed">
+<semantic:definitions id="_5c8b9296-96cf-4898-bba5-3a2d21d34eed" name="Loan info" namespace="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed" exporter="DMN Modeler" exporterVersion="6.2.2.3" xmlns:semantic="https://www.omg.org/spec/DMN/" xmlns="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+		https://www.omg.org/spec/DMN/
+		https://www.omg.org/spec/DMN/20240513/DMN.xsd
+		https://www.omg.org/spec/DMN/DI/
+		https://www.omg.org/spec/DMN/20240513/DMNDI.xsd
+		http://www.omg.org/spec/DMN/20180521/DI/
+		https://www.omg.org/spec/DMN/20180521/DI.xsd
+		http://www.omg.org/spec/DMN/20180521/DC/
+		https://www.omg.org/spec/DMN/20180521/DC.xsd
+	">
 	<semantic:itemDefinition name="tBorrower" label="tBorrower">
 		<semantic:itemComponent id="_b7dcc14d-510d-4628-a510-ca774208e501" name="Full Name">
 			<semantic:typeRef>string</semantic:typeRef>
@@ -640,7 +651,7 @@
 		<semantic:inputData href="#_e0cfe605-3068-42a2-946f-c7db3774de1e"/>
 		<semantic:inputData href="#_d78ee6d5-96ed-43e6-89d2-123e0f388a67"/>
 	</semantic:decisionService>
-	<dmndi:DMNDI xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/">
+	<dmndi:DMNDI xmlns:dmndi="https://www.omg.org/spec/DMN/DI/">
 		<dmndi:DMNDiagram id="_0b101bf8-a9c5-4e7c-8763-c8fcb4263a32" name="Page 1">
 			<di:extension xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"/>
 			<dmndi:Size height="1054.996529420125" width="1803.949344176753"/>
diff --git a/examples/Chapter 11 Example 2 Ranked Loan Products/Recommended Loan Products.dmn b/examples/Chapter 11 Example 2 Ranked Loan Products/Recommended Loan Products.dmn
index 378068e..fa86414 100644
--- a/examples/Chapter 11 Example 2 Ranked Loan Products/Recommended Loan Products.dmn	
+++ b/examples/Chapter 11 Example 2 Ranked Loan Products/Recommended Loan Products.dmn	
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<semantic:definitions id="_736fa164-03d8-429f-8318-4913a548c3a6" name="Recommended Loan Products" namespace="http://www.trisotech.com/definitions/_736fa164-03d8-429f-8318-4913a548c3a6" exporter="DMN Modeler" exporterVersion="6.2.3" xmlns:semantic="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:include1="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed" xmlns="http://www.trisotech.com/definitions/_736fa164-03d8-429f-8318-4913a548c3a6">
-	<semantic:import namespace="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed" name="Services" importType="https://www.omg.org/spec/DMN/20230324/MODEL/"/>
+<semantic:definitions id="_736fa164-03d8-429f-8318-4913a548c3a6" name="Recommended Loan Products" namespace="http://www.trisotech.com/definitions/_736fa164-03d8-429f-8318-4913a548c3a6" exporter="DMN Modeler" exporterVersion="6.2.3" xmlns:semantic="https://www.omg.org/spec/DMN/" xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:include1="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed" xmlns="http://www.trisotech.com/definitions/_736fa164-03d8-429f-8318-4913a548c3a6"
+	xsi:schemaLocation="
+		https://www.omg.org/spec/DMN/
+		https://www.omg.org/spec/DMN/20240513/DMN.xsd
+		https://www.omg.org/spec/DMN/DI/
+		https://www.omg.org/spec/DMN/20240513/DMNDI.xsd
+		http://www.omg.org/spec/DMN/20180521/DI/
+		https://www.omg.org/spec/DMN/20180521/DI.xsd
+		http://www.omg.org/spec/DMN/20180521/DC/
+		https://www.omg.org/spec/DMN/20180521/DC.xsd
+	">
+	<semantic:import namespace="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed" name="Services" importType="https://www.omg.org/spec/DMN/"/>
 	<semantic:itemDefinition name="tBorrower" label="tBorrower">
 		<semantic:itemComponent id="_b7dcc14d-510d-4628-a510-ca774208e501" name="Full Name">
 			<semantic:typeRef>string</semantic:typeRef>
@@ -1171,7 +1181,7 @@ and To be paid off=true].Balance[item!=null])</semantic:text>
 			</semantic:context>
 		</semantic:encapsulatedLogic>
 	</semantic:businessKnowledgeModel>
-	<dmndi:DMNDI xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/">
+	<dmndi:DMNDI xmlns:dmndi="https://www.omg.org/spec/DMN/DI/">
 		<dmndi:DMNDiagram id="_0b101bf8-a9c5-4e7c-8763-c8fcb4263a32" name="Page 1">
 			<di:extension xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"/>
 			<dmndi:Size height="1050" width="1550.4755458831787"/>
diff --git a/examples/Diagram Interchange/diagram-interchange-decision-service.dmn b/examples/Diagram Interchange/diagram-interchange-decision-service.dmn
index b37986a..efa10a3 100644
--- a/examples/Diagram Interchange/diagram-interchange-decision-service.dmn	
+++ b/examples/Diagram Interchange/diagram-interchange-decision-service.dmn	
@@ -3,11 +3,21 @@
   id="Definitions_DecisionService"
   name="Decision Service"
   namespace="http://www.omg.org/spec/DMN/20180521/diagram-interchange-decision-service/"
-  xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
+  xmlns="https://www.omg.org/spec/DMN/"
+  xmlns:dmndi="https://www.omg.org/spec/DMN/DI/"
+  xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
   xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
-  xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="
+    https://www.omg.org/spec/DMN/
+    https://www.omg.org/spec/DMN/20240513/DMN.xsd
+    https://www.omg.org/spec/DMN/DI/
+    https://www.omg.org/spec/DMN/20240513/DMNDI.xsd
+    http://www.omg.org/spec/DMN/20180521/DI/
+    https://www.omg.org/spec/DMN/20180521/DI.xsd
+    http://www.omg.org/spec/DMN/20180521/DC/
+    https://www.omg.org/spec/DMN/20180521/DC.xsd
+  ">
   <decisionService id="DecisionService_1" name="Decision Service 1">
   </decisionService>
   <dmndi:DMNDI>
diff --git a/examples/Diagram Interchange/diagram-interchange-decision-with-listed-input-data.dmn b/examples/Diagram Interchange/diagram-interchange-decision-with-listed-input-data.dmn
index 24c2c59..59adf59 100644
--- a/examples/Diagram Interchange/diagram-interchange-decision-with-listed-input-data.dmn	
+++ b/examples/Diagram Interchange/diagram-interchange-decision-with-listed-input-data.dmn	
@@ -3,11 +3,21 @@
   id="Definitions_0v8cooh"
   name="Decision with Listed Input data"
   namespace="http://www.omg.org/spec/DMN/20180521/diagram-interchange-decision-with-listed-input-data/"
-  xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
+  xmlns="https://www.omg.org/spec/DMN/"
+  xmlns:dmndi="https://www.omg.org/spec/DMN/DI/"
+  xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
   xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
-  xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="
+    https://www.omg.org/spec/DMN/
+    https://www.omg.org/spec/DMN/20240513/DMN.xsd
+    https://www.omg.org/spec/DMN/DI/
+    https://www.omg.org/spec/DMN/20240513/DMNDI.xsd
+    http://www.omg.org/spec/DMN/20180521/DI/
+    https://www.omg.org/spec/DMN/20180521/DI.xsd
+    http://www.omg.org/spec/DMN/20180521/DC/
+    https://www.omg.org/spec/DMN/20180521/DC.xsd
+  ">
   <decision id="Decision_1" name="Decision">
     <informationRequirement>
       <requiredInput href="#InputData_1" />
diff --git a/examples/Diagram Interchange/diagram-interchange-dish-example.dmn b/examples/Diagram Interchange/diagram-interchange-dish-example.dmn
index ac0365c..0ec09d0 100644
--- a/examples/Diagram Interchange/diagram-interchange-dish-example.dmn	
+++ b/examples/Diagram Interchange/diagram-interchange-dish-example.dmn	
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions id="dish-decisions" name="Dish Decisions"
   namespace="http://www.omg.org/spec/DMN/20180521/dish-example/"
-  xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
+  xmlns="https://www.omg.org/spec/DMN/"
+  xmlns:dmndi="https://www.omg.org/spec/DMN/DI/"
+  xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
   xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
-  xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="
+    https://www.omg.org/spec/DMN/
+    https://www.omg.org/spec/DMN/20240513/DMN.xsd
+    https://www.omg.org/spec/DMN/DI/
+    https://www.omg.org/spec/DMN/20240513/DMNDI.xsd
+    http://www.omg.org/spec/DMN/20180521/DI/
+    https://www.omg.org/spec/DMN/20180521/DI.xsd
+    http://www.omg.org/spec/DMN/20180521/DC/
+    https://www.omg.org/spec/DMN/20180521/DC.xsd
+  ">
 
   <inputData name="Type of day" id="dayType_id">
     <variable typeRef="string" name="Type of day" id="dayType_ii"/>
diff --git a/examples/Diagram Interchange/diagram-interchange-shape-with-label-text.dmn b/examples/Diagram Interchange/diagram-interchange-shape-with-label-text.dmn
index 20165ab..9d472c2 100644
--- a/examples/Diagram Interchange/diagram-interchange-shape-with-label-text.dmn	
+++ b/examples/Diagram Interchange/diagram-interchange-shape-with-label-text.dmn	
@@ -3,11 +3,21 @@
   id="definitions_0v8cooh"
   name="Decision"
   namespace="http://www.omg.org/spec/DMN/20180521/diagram-interchange-shape-with-label-text/"
-  xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
+  xmlns="https://www.omg.org/spec/DMN/"
+  xmlns:dmndi="https://www.omg.org/spec/DMN/DI/"
+  xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
   xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
-  xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="
+    https://www.omg.org/spec/DMN/
+    https://www.omg.org/spec/DMN/20240513/DMN.xsd
+    https://www.omg.org/spec/DMN/DI/
+    https://www.omg.org/spec/DMN/20240513/DMNDI.xsd
+    http://www.omg.org/spec/DMN/20180521/DI/
+    https://www.omg.org/spec/DMN/20180521/DI.xsd
+    http://www.omg.org/spec/DMN/20180521/DC/
+    https://www.omg.org/spec/DMN/20180521/DC.xsd
+  ">
   <decision id="Decision_1" name="Decision 1"/>
   <dmndi:DMNDI>
     <dmndi:DMNDiagram id="DRD1">
diff --git a/xsd/DMN15.xsd b/xsd/DMN.xsd
similarity index 95%
rename from xsd/DMN15.xsd
rename to xsd/DMN.xsd
index a6b161e..b75dd2c 100644
--- a/xsd/DMN15.xsd
+++ b/xsd/DMN.xsd
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
-	xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
-	targetNamespace="https://www.omg.org/spec/DMN/20230324/MODEL/">
+<xsd:schema id="DMN" version="1.6"
+	elementFormDefault="qualified"
+	xmlns="https://www.omg.org/spec/DMN/"
+	targetNamespace="https://www.omg.org/spec/DMN/"
+	xmlns:dmndi="https://www.omg.org/spec/DMN/DI/"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
-	<xsd:import namespace="https://www.omg.org/spec/DMN/20230324/DMNDI/"
-	            schemaLocation="DMNDI15.xsd">
+	<xsd:import namespace="https://www.omg.org/spec/DMN/DI/"
+	            schemaLocation="DMNDI.xsd">
 		<xsd:annotation>
 			<xsd:documentation>
 				Include the DMN Diagram Interchange (DI) schema
@@ -54,8 +55,8 @@
 					<xsd:element ref="businessContextElement" minOccurs="0" maxOccurs="unbounded"/>
 					<xsd:element ref="dmndi:DMNDI" minOccurs="0" maxOccurs="1"/>
 				</xsd:sequence>
-				<xsd:attribute name="expressionLanguage" type="xsd:anyURI" use="optional" default="https://www.omg.org/spec/DMN/20230324/FEEL/"/>
-				<xsd:attribute name="typeLanguage" type="xsd:anyURI" use="optional" default="https://www.omg.org/spec/DMN/20230324/FEEL/"/>
+				<xsd:attribute name="expressionLanguage" type="xsd:anyURI" use="optional" default="https://www.omg.org/spec/DMN/20240513/FEEL/"/>
+				<xsd:attribute name="typeLanguage" type="xsd:anyURI" use="optional" default="https://www.omg.org/spec/DMN/20240513/FEEL/"/>
 				<xsd:attribute name="namespace" type="xsd:anyURI" use="required"/>
 				<xsd:attribute name="exporter" type="xsd:string" use="optional"/>
 				<xsd:attribute name="exporterVersion" type="xsd:string" use="optional"/>
diff --git a/xsd/DMNDI15.xsd b/xsd/DMNDI.xsd
similarity index 87%
rename from xsd/DMNDI15.xsd
rename to xsd/DMNDI.xsd
index 17b5535..f8b48ae 100644
--- a/xsd/DMNDI15.xsd
+++ b/xsd/DMNDI.xsd
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
-            xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
-            xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-            targetNamespace="https://www.omg.org/spec/DMN/20230324/DMNDI/"
-            elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xsd:schema id="DMNDI" version="1.6"
+			elementFormDefault="qualified"
+			targetNamespace="https://www.omg.org/spec/DMN/DI/"
+			xmlns:dmndi="https://www.omg.org/spec/DMN/DI/"
+			xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
+			xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
+			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
 	<xsd:import namespace="http://www.omg.org/spec/DMN/20180521/DC/"
-	            schemaLocation="DC.xsd"/>
+				schemaLocation="DC.xsd"/>
 	<xsd:import namespace="http://www.omg.org/spec/DMN/20180521/DI/"
-	            schemaLocation="DI.xsd"/>
+				schemaLocation="DI.xsd"/>
 
 	<xsd:element name="DMNDI" type="dmndi:DMNDI"/>
 	<xsd:element name="DMNDiagram" type="dmndi:DMNDiagram"/>
diff --git a/xsd/catalog.xml b/xsd/catalog.xml
new file mode 100644
index 0000000..35f0986
--- /dev/null
+++ b/xsd/catalog.xml
@@ -0,0 +1,19 @@
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+    <uri
+        name="https://www.omg.org/spec/DMN/"
+        uri="DMN.xsd" />
+
+    <uri
+        name="https://www.omg.org/spec/DMN/DI/"
+        uri="DMNDI.xsd" />
+    
+    <uri
+        name="http://www.omg.org/spec/DMN/20180521/DI/"
+        uri="DI.xsd" />
+    
+    <uri
+        name="http://www.omg.org/spec/DMN/20180521/DC/"
+        uri="DC.xsd" />
+
+</catalog>
\ No newline at end of file
diff --git a/xsd/dmn-namespace-utils.sh b/xsd/dmn-namespace-utils.sh
index c25b78d..14603ac 100644
--- a/xsd/dmn-namespace-utils.sh
+++ b/xsd/dmn-namespace-utils.sh
@@ -5,10 +5,12 @@ DMN12='http://www.omg.org/spec/DMN/20180521/MODEL/'
 DMN13='https://www.omg.org/spec/DMN/20191111/MODEL/'
 DMN14='https://www.omg.org/spec/DMN/20211108/MODEL/'
 DMN15='https://www.omg.org/spec/DMN/20230324/MODEL/'
+DMN16='https://www.omg.org/spec/DMN/'
 DMNDI11='http://www.omg.org/spec/DMN/20151101/DMNDI'
 DMNDI12='http://www.omg.org/spec/DMN/20180521/DMNDI/'
 DMNDI13='https://www.omg.org/spec/DMN/20191111/DMNDI/'
 DMNDI15='https://www.omg.org/spec/DMN/20230324/DMNDI/'
+DMNDI16='https://www.omg.org/spec/DMN/DI/'
 DI='http://www.omg.org/spec/DMN/20180521/DI/'
 DC='http://www.omg.org/spec/DMN/20180521/DC/'
 FEEL10='http://www.omg.org/spec/FEEL/20140401'
@@ -16,3 +18,4 @@ FEEL12='http://www.omg.org/spec/DMN/20180521/FEEL/'
 FEEL13='https://www.omg.org/spec/DMN/20191111/FEEL/'
 FEEL14='https://www.omg.org/spec/DMN/20211108/FEEL/'
 FEEL15='https://www.omg.org/spec/DMN/20230324/FEEL/'
+FEEL16='https://www.omg.org/spec/DMN/20240513/FEEL/'
\ No newline at end of file