From 84624d21a1180dee3504c1535233d34798d46d2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= <tibor.zimanyi@gmail.com>
Date: Thu, 18 Apr 2024 15:18:09 +0200
Subject: [PATCH] Upgrade to DMN 1.5 (#650)

---
 TestCases/DMN15.xsd                           | 592 ++++++++++++++++++
 TestCases/DMNDI15.xsd                         | 109 ++++
 .../0001-input-data-string.dmn                |   2 +-
 .../0002-input-data-number.dmn                |   2 +-
 .../0003-input-data-string-allowed-values.dmn |   2 +-
 .../0004-simpletable-U/0004-simpletable-U.dmn |   2 +-
 .../0005-simpletable-A/0005-simpletable-A.dmn |   2 +-
 .../0006-simpletable-P1.dmn                   |   2 +-
 .../0007-simpletable-P2.dmn                   |   2 +-
 .../0008-LX-arithmetic/0008-LX-arithmetic.dmn |   2 +-
 .../0009-invocation-arithmetic.dmn            |   4 +-
 .../0010-multi-output-U.dmn                   |   2 +-
 .../0100-feel-constants.dmn                   |   2 +-
 .../0101-feel-constants.dmn                   |   2 +-
 .../0102-feel-constants.dmn                   |   2 +-
 .../0105-feel-math/0105-feel-math.dmn         |   2 +-
 .../0106-feel-ternary-logic.dmn               |   2 +-
 .../0107-feel-ternary-logic-not.dmn           |   2 +-
 .../0108-first-hitpolicy.dmn                  |   2 +-
 .../0109-ruleOrder-hitpolicy.dmn              |   2 +-
 .../0110-outputOrder-hitpolicy.dmn            |   2 +-
 .../0111-first-hitpolicy-singleoutputcol.dmn  |   2 +-
 ...112-ruleOrder-hitpolicy-singleinoutcol.dmn |   2 +-
 ...3-outputOrder-hitpolicy-singleinoutcol.dmn |   2 +-
 .../0114-min-collect-hitpolicy.dmn            |   2 +-
 .../0115-sum-collect-hitpolicy.dmn            |   2 +-
 .../0116-count-collect-hitpolicy.dmn          |   2 +-
 .../0117-multi-any-hitpolicy.dmn              |   2 +-
 .../0118-multi-priority-hitpolicy.dmn         |   2 +-
 .../0119-multi-collect-hitpolicy.dmn          |   2 +-
 TestCases/compliance-level-2/labeler.xslt     |   2 +-
 .../0001-filter/0001-filter.dmn               |   2 +-
 .../0002-string-functions.dmn                 |   2 +-
 .../0003-iteration/0003-iteration.dmn         |   2 +-
 .../0004-lending/0004-lending.dmn             |   2 +-
 .../0005-literal-invocation.dmn               |   2 +-
 .../0006-join/0006-join.dmn                   |   2 +-
 .../0007-date-time/0007-date-time.dmn         |   2 +-
 .../0008-listGen/0008-listGen.dmn             |   2 +-
 .../0009-append-flatten.dmn                   |   2 +-
 .../0010-concatenate/0010-concatenate.dmn     |   2 +-
 .../0011-insert-remove/0011-insert-remove.dmn |   2 +-
 .../0012-list-functions.dmn                   |   2 +-
 .../0013-sort/0013-sort.dmn                   |   2 +-
 .../0014-loan-comparison.dmn                  |   2 +-
 .../0016-some-every/0016-some-every.dmn       |   2 +-
 .../0017-tableTests/0017-tableTests.dmn       |   2 +-
 .../0020-vacation-days/0020-vacation-days.dmn |   2 +-
 .../0021-singleton-list.dmn                   |   2 +-
 .../0030-user-defined-functions.dmn           |   2 +-
 .../0031-user-defined-functions.dmn           |   2 +-
 .../0032-conditionals/0032-conditionals.dmn   |   2 +-
 .../0033-for-loops/0033-for-loops.dmn         |   2 +-
 .../0034-drg-scopes/0034-drg-scopes.dmn       |  50 +-
 .../0035-test-structure-output.dmn            |   2 +-
 .../0036-dt-variable-input.dmn                |   2 +-
 .../0037-dt-on-bkm-implicit-params.dmn        |   6 +-
 .../0038-dt-on-bkm-explicit-params.dmn        |   6 +-
 .../0039-dt-list-semantics.dmn                |   2 +-
 .../0040-singlenestedcontext.dmn              |   2 +-
 .../0041-multiple-nestedcontext.dmn           |   2 +-
 .../0050-feel-abs-function.dmn                |   2 +-
 .../0051-feel-sqrt-function.dmn               |   2 +-
 .../0052-feel-exp-function.dmn                |   2 +-
 .../0053-feel-log-function.dmn                |   2 +-
 .../0054-feel-even-function.dmn               |   2 +-
 .../0055-feel-odd-function.dmn                |   2 +-
 .../0056-feel-modulo-function.dmn             |   2 +-
 .../0057-feel-context/0057-feel-context.dmn   |   2 +-
 .../0058-feel-number-function.dmn             |   2 +-
 .../0059-feel-all-function.dmn                |   2 +-
 .../0060-feel-any-function.dmn                |   2 +-
 .../0061-feel-median-function.dmn             |   2 +-
 .../0062-feel-mode-function.dmn               |   2 +-
 .../0063-feel-stddev-function.dmn             |   2 +-
 .../0064-feel-conjunction.dmn                 |   2 +-
 .../0065-feel-disjunction.dmn                 |   2 +-
 .../0066-feel-negation/0066-feel-negation.dmn |   2 +-
 .../0067-feel-split-function.dmn              |   2 +-
 .../0068-feel-equality/0068-feel-equality.dmn |   4 +-
 .../0069-feel-list/0069-feel-list.dmn         |   2 +-
 .../0070-feel-instance-of.dmn                 |   2 +-
 .../0071-feel-between/0071-feel-between.dmn   |   2 +-
 .../0072-feel-in/0072-feel-in.dmn             |   2 +-
 .../0073-feel-comments/0073-feel-comments.dmn |   2 +-
 .../0074-feel-properties.dmn                  |   2 +-
 .../0075-feel-exponent/0075-feel-exponent.dmn |   2 +-
 .../0076-feel-external-java.dmn               |   2 +-
 .../0077-feel-nan/0077-feel-nan.dmn           |   2 +-
 .../0078-feel-infinity/0078-feel-infinity.dmn |   2 +-
 .../0080-feel-getvalue-function.dmn           |   2 +-
 .../0081-feel-getentries-function.dmn         |   2 +-
 .../0082-feel-coercion/0082-feel-coercion.dmn |   2 +-
 .../0083-feel-unicode/0083-feel-unicode.dmn   |   2 +-
 .../0084-feel-for-loops.dmn                   |   2 +-
 .../0085-decision-services.dmn                |   4 +-
 .../0086-import/0086-import.dmn               |   8 +-
 .../0086-import/Imported_Model.dmn            |   6 +-
 .../0087-chapter-11-example.dmn               |   6 +-
 .../0088-no-decision-logic.dmn                |   2 +-
 .../0089-nested-inputdata-imports.dmn         |  14 +-
 .../0089-nested-inputdata-imports/Model_B.dmn |  12 +-
 .../Model_B2.dmn                              |  12 +-
 .../Say_hello_1ID1D.dmn                       |  10 +-
 .../0090-feel-paths/0090-feel-paths.dmn       |   2 +-
 .../0091-local-hrefs/0091-local-hrefs.dmn     |   2 +-
 .../0092-feel-lambda/0092-feel-lambda.dmn     |   2 +-
 .../0093-feel-at-literals.dmn                 |   4 +-
 .../0094-feel-product-function.dmn            |   4 +-
 .../0095-feel-day-of-year-function.dmn        |   4 +-
 .../0096-feel-day-of-week-function.dmn        |   4 +-
 .../0097-feel-month-of-year-function.dmn      |   4 +-
 .../0098-feel-week-of-year-function.dmn       |   4 +-
 .../0099-arithmetic-negation.dmn              |   4 +-
 .../0100-arithmetic/0100-arithmetic.dmn       |   4 +-
 .../0100-arithmetic/generateTests.js          |   4 +-
 .../0103-feel-is-function.dmn                 |   4 +-
 .../1100-feel-decimal-function.dmn            |   2 +-
 .../1101-feel-floor-function.dmn              |   2 +-
 .../1102-feel-ceiling-function.dmn            |   2 +-
 .../1103-feel-substring-function.dmn          |   2 +-
 .../1104-feel-string-length-function.dmn      |   2 +-
 .../1105-feel-upper-case-function.dmn         |   2 +-
 .../1106-feel-lower-case-function.dmn         |   2 +-
 .../1107-feel-substring-before-function.dmn   |   2 +-
 .../1108-feel-substring-after-function.dmn    |   2 +-
 .../1109-feel-replace-function.dmn            |   2 +-
 .../1110-feel-contains-function.dmn           |   2 +-
 .../1111-feel-matches-function.dmn            |   4 +-
 .../1115-feel-date-function.dmn               |   2 +-
 .../1116-feel-time-function.dmn               |   2 +-
 .../1117-feel-date-and-time-function.dmn      |   2 +-
 .../1120-feel-duration-function.dmn           |   2 +-
 ...eel-years-and-months-duration-function.dmn |   2 +-
 .../1130-feel-interval/1130-feel-interval.dmn | 266 ++++----
 .../1131-feel-function-invocation.dmn         |   2 +-
 .../1140-feel-string-join-function.dmn        |   4 +-
 .../1141-feel-round-up-function.dmn           |   4 +-
 .../1142-feel-round-down-function.dmn         |   4 +-
 .../1143-feel-round-half-up-function.dmn      |   4 +-
 .../1144-feel-round-half-down-function.dmn    |   4 +-
 .../1145-feel-context-function.dmn            |   4 +-
 .../1146-feel-context-put-function.dmn        |   4 +-
 .../1147-feel-context-merge-function.dmn      |   4 +-
 .../1148-feel-now-function.dmn                |   4 +-
 .../1149-feel-today-function.dmn              |   4 +-
 .../1150-boxed-conditional.dmn                |   4 +-
 .../1151-boxed-filter/1151-boxed-filter.dmn   |   4 +-
 .../1152-boxed-for/1152-boxed-for.dmn         |   4 +-
 .../1153-boxed-some/1153-boxed-some.dmn       |   4 +-
 .../1154-boxed-every/1154-boxed-every.dmn     |   4 +-
 TestCases/compliance-level-3/labeler.xslt     |   2 +-
 .../0015-all-any/0015-all-any.dmn             |   2 +-
 .../0019-flight-rebooking.dmn                 |   4 +-
 .../0079-feel-string-function.dmn             |   2 +-
 .../0088-recursion/0088-recursion.dmn         |   2 +-
 TestExamples/calc-discount/A.1.dmn            |   8 +-
 TestExamples/calc-discount/A.2.dmn            |   6 +-
 TestExamples/calc-discount/A.3.dmn            |  14 +-
 TestExamples/lending1/lending1.dmn            |   2 +-
 .../order-discount/order-discount.dmn         |   2 +-
 .../0001-input-data-string.dmn                |   4 +-
 .../0002-input-data-number.dmn                |   4 +-
 .../0003-input-data-string-allowed-values.dmn |   4 +-
 .../dmn/tck/validation/TestCasesFiles.java    |   4 +-
 utils/dmn-tck-packager/README.md              |   2 +-
 166 files changed, 1097 insertions(+), 396 deletions(-)
 create mode 100644 TestCases/DMN15.xsd
 create mode 100644 TestCases/DMNDI15.xsd

diff --git a/TestCases/DMN15.xsd b/TestCases/DMN15.xsd
new file mode 100644
index 000000000..a6b161ecb
--- /dev/null
+++ b/TestCases/DMN15.xsd
@@ -0,0 +1,592 @@
+<?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:import namespace="https://www.omg.org/spec/DMN/20230324/DMNDI/"
+	            schemaLocation="DMNDI15.xsd">
+		<xsd:annotation>
+			<xsd:documentation>
+				Include the DMN Diagram Interchange (DI) schema
+			</xsd:documentation>
+		</xsd:annotation>
+	</xsd:import>
+
+	<xsd:element name="DMNElement" type="tDMNElement" abstract="true"/>
+	<xsd:complexType name="tDMNElement">
+		<xsd:sequence>
+			<xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="extensionElements" minOccurs="0" maxOccurs="1">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:ID" use="optional"/>
+		<xsd:attribute name="label" type="xsd:string" use="optional"/>
+		<xsd:anyAttribute namespace="##other" processContents="lax"/>
+	</xsd:complexType>
+	<xsd:element name="namedElement" type="tNamedElement" abstract="true" substitutionGroup="DMNElement"/>
+	<xsd:complexType name="tNamedElement">
+		<xsd:complexContent>
+			<xsd:extension base="tDMNElement">
+				<xsd:attribute name="name" type="xsd:string" use="required"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:complexType name="tDMNElementReference">
+		<xsd:attribute name="href" type="xsd:anyURI" use="required"/>
+	</xsd:complexType>
+	<xsd:element name="definitions" type="tDefinitions" substitutionGroup="namedElement"/>
+	<xsd:complexType name="tDefinitions">
+		<xsd:complexContent>
+			<xsd:extension base="tNamedElement">
+				<xsd:sequence>
+					<xsd:element ref="import" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="itemDefinition" type="tItemDefinition" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="drgElement" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="elementCollection" type="tElementCollection" minOccurs="0" maxOccurs="unbounded"/>
+					<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="namespace" type="xsd:anyURI" use="required"/>
+				<xsd:attribute name="exporter" type="xsd:string" use="optional"/>
+				<xsd:attribute name="exporterVersion" type="xsd:string" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="import" type="tImport" substitutionGroup="namedElement"/>
+	<xsd:complexType name="tImport">
+		<xsd:complexContent>
+			<xsd:extension base="tNamedElement">
+				<xsd:attribute name="namespace" type="xsd:anyURI" use="required"/>
+				<xsd:attribute name="locationURI" type="xsd:anyURI" use="optional"/>
+				<xsd:attribute name="importType" type="xsd:anyURI" use="required"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="elementCollection" type="tElementCollection" substitutionGroup="namedElement"/>
+	<xsd:complexType name="tElementCollection">
+		<xsd:complexContent>
+			<xsd:extension base="tNamedElement">
+				<xsd:sequence>
+					<xsd:element name="drgElement" type="tDMNElementReference" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="drgElement" type="tDRGElement" abstract="true" substitutionGroup="namedElement"/>
+	<xsd:complexType name="tDRGElement">
+		<xsd:complexContent>
+			<xsd:extension base="tNamedElement"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="decision" type="tDecision" substitutionGroup="drgElement"/>
+	<xsd:complexType name="tDecision">
+		<xsd:complexContent>
+			<xsd:extension base="tDRGElement">
+				<xsd:sequence>
+					<xsd:element name="question" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="allowedAnswers" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="variable" type="tInformationItem" minOccurs="0"/>
+					<xsd:element name="informationRequirement" type="tInformationRequirement" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="knowledgeRequirement" type="tKnowledgeRequirement" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="authorityRequirement" type="tAuthorityRequirement" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="supportedObjective" type="tDMNElementReference" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="impactedPerformanceIndicator" type="tDMNElementReference" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="decisionMaker" type="tDMNElementReference" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="decisionOwner" type="tDMNElementReference" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="usingProcess" type="tDMNElementReference" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="usingTask" type="tDMNElementReference" minOccurs="0" maxOccurs="unbounded"/>
+					<!-- decisionLogic -->
+					<xsd:element ref="expression" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="businessContextElement" type="tBusinessContextElement" abstract="true"/>
+	<xsd:complexType name="tBusinessContextElement">
+		<xsd:complexContent>
+			<xsd:extension base="tNamedElement">
+				<xsd:attribute name="URI" type="xsd:anyURI" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="performanceIndicator" type="tPerformanceIndicator" substitutionGroup="businessContextElement"/>
+	<xsd:complexType name="tPerformanceIndicator">
+		<xsd:complexContent>
+			<xsd:extension base="tBusinessContextElement">
+				<xsd:sequence>
+					<xsd:element name="impactingDecision" type="tDMNElementReference" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="organizationUnit" type="tOrganizationUnit" substitutionGroup="businessContextElement"/>
+	<xsd:complexType name="tOrganizationUnit">
+		<xsd:complexContent>
+			<xsd:extension base="tBusinessContextElement">
+				<xsd:sequence>
+					<xsd:element name="decisionMade" type="tDMNElementReference" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="decisionOwned" type="tDMNElementReference" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="invocable" type="tInvocable" abstract="true" substitutionGroup="drgElement"/>
+	<xsd:complexType name="tInvocable">
+		<xsd:complexContent>
+			<xsd:extension base="tDRGElement">
+				<xsd:sequence>
+					<xsd:element name="variable" type="tInformationItem" minOccurs="0"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="businessKnowledgeModel" type="tBusinessKnowledgeModel" substitutionGroup="invocable"/>
+	<xsd:complexType name="tBusinessKnowledgeModel">
+		<xsd:complexContent>
+			<xsd:extension base="tInvocable">
+				<xsd:sequence>
+					<xsd:element name="encapsulatedLogic" type="tFunctionDefinition" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="knowledgeRequirement" type="tKnowledgeRequirement" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="authorityRequirement" type="tAuthorityRequirement" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="inputData" type="tInputData" substitutionGroup="drgElement"/>
+	<xsd:complexType name="tInputData">
+		<xsd:complexContent>
+			<xsd:extension base="tDRGElement">
+				<xsd:sequence>
+					<xsd:element name="variable" type="tInformationItem" minOccurs="0"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="knowledgeSource" type="tKnowledgeSource" substitutionGroup="drgElement"/>
+	<xsd:complexType name="tKnowledgeSource">
+		<xsd:complexContent>
+			<xsd:extension base="tDRGElement">
+				<xsd:sequence>
+					<xsd:element name="authorityRequirement" type="tAuthorityRequirement" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="type" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="owner" type="tDMNElementReference" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="locationURI" type="xsd:anyURI" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="informationRequirement" type="tInformationRequirement" substitutionGroup="DMNElement"/>
+	<xsd:complexType name="tInformationRequirement">
+		<xsd:complexContent>
+			<xsd:extension base="tDMNElement">
+				<xsd:sequence>
+					<xsd:choice minOccurs="1" maxOccurs="1">
+						<xsd:element name="requiredDecision" type="tDMNElementReference"/>
+						<xsd:element name="requiredInput" type="tDMNElementReference"/>
+					</xsd:choice>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="knowledgeRequirement" type="tKnowledgeRequirement" substitutionGroup="DMNElement"/>
+	<xsd:complexType name="tKnowledgeRequirement">
+		<xsd:complexContent>
+			<xsd:extension base="tDMNElement">
+				<xsd:sequence>
+					<xsd:element name="requiredKnowledge" type="tDMNElementReference" minOccurs="1" maxOccurs="1"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="authorityRequirement" type="tAuthorityRequirement" substitutionGroup="DMNElement"/>
+	<xsd:complexType name="tAuthorityRequirement">
+		<xsd:complexContent>
+			<xsd:extension base="tDMNElement">
+				<xsd:choice minOccurs="1" maxOccurs="1">
+					<xsd:element name="requiredDecision" type="tDMNElementReference"/>
+					<xsd:element name="requiredInput" type="tDMNElementReference"/>
+					<xsd:element name="requiredAuthority" type="tDMNElementReference"/>
+				</xsd:choice>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="expression" type="tExpression" abstract="true"/>
+	<xsd:complexType name="tExpression">
+		<xsd:complexContent>
+			<xsd:extension base="tDMNElement">
+				<xsd:attribute name="typeRef" type="xsd:string" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="itemDefinition" type="tItemDefinition" substitutionGroup="namedElement"/>
+	<xsd:complexType name="tItemDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="tNamedElement">
+				<xsd:choice>
+					<xsd:sequence>
+						<xsd:element name="typeRef" type="xsd:string"/>
+						<xsd:element name="allowedValues" type="tUnaryTests" minOccurs="0"/>
+						<xsd:element name="typeConstraint" type="tUnaryTests" minOccurs="0"/>
+					</xsd:sequence>
+					<xsd:element name="itemComponent" type="tItemDefinition" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="functionItem" type="tFunctionItem" minOccurs="0" maxOccurs="1"/>
+				</xsd:choice>
+				<xsd:attribute name="typeLanguage" type="xsd:anyURI" use="optional"/>
+				<xsd:attribute name="isCollection" type="xsd:boolean" use="optional" default="false"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="functionItem" type="tFunctionItem" substitutionGroup="DMNElement"/>
+	<xsd:complexType name="tFunctionItem">
+		<xsd:complexContent>
+			<xsd:extension base="tDMNElement">
+				<xsd:sequence>
+					<xsd:element name="parameters" type="tInformationItem" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="outputTypeRef" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="literalExpression" type="tLiteralExpression" substitutionGroup="expression"/>
+	<xsd:complexType name="tLiteralExpression">
+		<xsd:complexContent>
+			<xsd:extension base="tExpression">
+				<xsd:choice minOccurs="0" maxOccurs="1">
+					<xsd:element name="text" type="xsd:string"/>
+					<xsd:element name="importedValues" type="tImportedValues"/>
+				</xsd:choice>
+				<xsd:attribute name="expressionLanguage" type="xsd:anyURI" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="invocation" type="tInvocation" substitutionGroup="expression"/>
+	<xsd:complexType name="tInvocation">
+		<xsd:complexContent>
+			<xsd:extension base="tExpression">
+				<xsd:sequence>
+					<!-- calledFunction -->
+					<xsd:element ref="expression" minOccurs="0"/>
+					<xsd:element name="binding" type="tBinding" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:complexType name="tBinding">
+		<xsd:sequence>
+			<xsd:element name="parameter" type="tInformationItem" minOccurs="1" maxOccurs="1"/>
+			<!-- bindingFormula -->
+			<xsd:element ref="expression" minOccurs="0" maxOccurs="1"/>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:element name="informationItem" type="tInformationItem" substitutionGroup="namedElement"/>
+	<xsd:complexType name="tInformationItem">
+		<xsd:complexContent>
+			<xsd:extension base="tNamedElement">
+				<xsd:attribute name="typeRef" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="decisionTable" type="tDecisionTable" substitutionGroup="expression"/>
+	<xsd:complexType name="tDecisionTable">
+		<xsd:complexContent>
+			<xsd:extension base="tExpression">
+				<xsd:sequence>
+					<xsd:element name="input" type="tInputClause" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="output" type="tOutputClause" maxOccurs="unbounded"/>
+					<xsd:element name="annotation" type="tRuleAnnotationClause"  minOccurs="0" maxOccurs="unbounded"/>
+					<!-- NB: when the hit policy is FIRST or RULE ORDER, the ordering of the rules is significant and MUST be preserved -->
+					<xsd:element name="rule" type="tDecisionRule" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="hitPolicy" type="tHitPolicy" use="optional" default="UNIQUE"/>
+				<xsd:attribute name="aggregation" type="tBuiltinAggregator" use="optional"/>
+				<xsd:attribute name="preferredOrientation" type="tDecisionTableOrientation" use="optional" default="Rule-as-Row"/>
+				<xsd:attribute name="outputLabel" type="xsd:string" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:complexType name="tInputClause">
+		<xsd:complexContent>
+			<xsd:extension base="tDMNElement">
+				<xsd:sequence>
+					<xsd:element name="inputExpression" type="tLiteralExpression"/>
+					<xsd:element name="inputValues" type="tUnaryTests" minOccurs="0"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:complexType name="tOutputClause">
+		<xsd:complexContent>
+			<xsd:extension base="tDMNElement">
+				<xsd:sequence>
+					<xsd:element name="outputValues" type="tUnaryTests" minOccurs="0"/>
+					<xsd:element name="defaultOutputEntry" type="tLiteralExpression" minOccurs="0"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string" use="optional"/>
+				<xsd:attribute name="typeRef" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:complexType name="tRuleAnnotationClause">
+		<xsd:attribute name="name" type="xsd:string"/>
+	</xsd:complexType>
+	<xsd:complexType name="tDecisionRule">
+		<xsd:complexContent>
+			<xsd:extension base="tDMNElement">
+				<xsd:sequence>
+					<xsd:element name="inputEntry" type="tUnaryTests" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="outputEntry" type="tLiteralExpression" maxOccurs="unbounded"/>
+					<xsd:element name="annotationEntry" type="tRuleAnnotation" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:complexType name="tRuleAnnotation">
+		<xsd:sequence>
+			<xsd:element name="text" type="xsd:string" minOccurs="0"/>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:simpleType name="tHitPolicy">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="UNIQUE"/>
+			<xsd:enumeration value="FIRST"/>
+			<xsd:enumeration value="PRIORITY"/>
+			<xsd:enumeration value="ANY"/>
+			<xsd:enumeration value="COLLECT"/>
+			<xsd:enumeration value="RULE ORDER"/>
+			<xsd:enumeration value="OUTPUT ORDER"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<xsd:simpleType name="tBuiltinAggregator">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="SUM"/>
+			<xsd:enumeration value="COUNT"/>
+			<xsd:enumeration value="MIN"/>
+			<xsd:enumeration value="MAX"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<xsd:simpleType name="tDecisionTableOrientation">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="Rule-as-Row"/>
+			<xsd:enumeration value="Rule-as-Column"/>
+			<xsd:enumeration value="CrossTable"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<xsd:complexType name="tImportedValues">
+		<xsd:complexContent>
+			<xsd:extension base="tImport">
+				<xsd:sequence>
+					<xsd:element name="importedElement" type="xsd:string"/>
+				</xsd:sequence>
+				<xsd:attribute name="expressionLanguage" type="xsd:anyURI"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="artifact" type="tArtifact" abstract="true" substitutionGroup="DMNElement"/>
+	<xsd:complexType name="tArtifact">
+		<xsd:complexContent>
+			<xsd:extension base="tDMNElement"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="group" type="tGroup" substitutionGroup="artifact"/>
+	<xsd:complexType name="tGroup">
+		<xsd:complexContent>
+			<xsd:extension base="tArtifact">
+				<xsd:attribute name="name" type="xsd:string" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="textAnnotation" type="tTextAnnotation" substitutionGroup="artifact"/>
+	<xsd:complexType name="tTextAnnotation">
+		<xsd:complexContent>
+			<xsd:extension base="tArtifact">
+				<xsd:sequence>
+					<xsd:element name="text" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="textFormat" type="xsd:string" default="text/plain"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="association" type="tAssociation" substitutionGroup="artifact"/>
+	<xsd:complexType name="tAssociation">
+		<xsd:complexContent>
+			<xsd:extension base="tArtifact">
+				<xsd:sequence>
+					<xsd:element name="sourceRef" type="tDMNElementReference"/>
+					<xsd:element name="targetRef" type="tDMNElementReference"/>
+				</xsd:sequence>
+				<xsd:attribute name="associationDirection" type="tAssociationDirection" default="None"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:simpleType name="tAssociationDirection">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="None"/>
+			<xsd:enumeration value="One"/>
+			<xsd:enumeration value="Both"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<xsd:element name="context" type="tContext" substitutionGroup="expression"/>
+	<xsd:complexType name="tContext">
+		<xsd:complexContent>
+			<xsd:extension base="tExpression">
+				<xsd:sequence>
+					<xsd:element ref="contextEntry" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="contextEntry" type="tContextEntry" substitutionGroup="DMNElement"/>
+	<xsd:complexType name="tContextEntry">
+		<xsd:complexContent>
+			<xsd:extension base="tDMNElement">
+				<xsd:sequence>
+					<xsd:element name="variable" type="tInformationItem" minOccurs="0" maxOccurs="1"/>
+					<!-- value -->
+					<xsd:element ref="expression" minOccurs="1" maxOccurs="1"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="functionDefinition" type="tFunctionDefinition" substitutionGroup="expression"/>
+	<xsd:complexType name="tFunctionDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="tExpression">
+				<xsd:sequence>
+					<xsd:element name="formalParameter" type="tInformationItem" minOccurs="0" maxOccurs="unbounded"/>
+					<!-- body -->
+					<xsd:element ref="expression" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="kind" type="tFunctionKind" default="FEEL"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:simpleType name="tFunctionKind">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="FEEL"/>
+			<xsd:enumeration value="Java"/>
+			<xsd:enumeration value="PMML"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<xsd:element name="relation" type="tRelation" substitutionGroup="expression"/>
+	<xsd:complexType name="tRelation">
+		<xsd:complexContent>
+			<xsd:extension base="tExpression">
+				<xsd:sequence>
+					<xsd:element name="column" type="tInformationItem" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="row" type="tList" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="list" type="tList" substitutionGroup="expression"/>
+	<xsd:complexType name="tList">
+		<xsd:complexContent>
+			<xsd:extension base="tExpression">
+				<xsd:sequence>
+					<!-- element -->
+					<xsd:element ref="expression" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:complexType name="tUnaryTests">
+		<xsd:complexContent>
+			<xsd:extension base="tExpression">
+				<xsd:sequence>
+					<xsd:element name="text" type="xsd:string"/>
+				</xsd:sequence>
+				<xsd:attribute name="expressionLanguage" type="xsd:anyURI" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="decisionService" type="tDecisionService" substitutionGroup="invocable"/>
+	<xsd:complexType name="tDecisionService">
+		<xsd:complexContent>
+			<xsd:extension base="tInvocable">
+				<xsd:sequence>
+					<xsd:element name="outputDecision" type="tDMNElementReference" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="encapsulatedDecision" type="tDMNElementReference" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="inputDecision" type="tDMNElementReference" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="inputData" type="tDMNElementReference" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:complexType name="tChildExpression">
+		<xsd:sequence>
+			<xsd:element ref="expression"/>
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:ID" use="optional"/>
+	</xsd:complexType>
+	<xsd:complexType name="tTypedChildExpression">
+		<xsd:complexContent>
+			<xsd:extension base="tChildExpression">
+				<xsd:attribute name="typeRef" type="xsd:string" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:complexType name="tIterator">
+		<xsd:complexContent>
+			<xsd:extension base="tExpression">
+				<xsd:sequence>
+					<xsd:element name="in" type="tTypedChildExpression"/>
+				</xsd:sequence>
+				<xsd:attribute name="iteratorVariable" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="for" type="tFor" substitutionGroup="expression"/>
+	<xsd:complexType name="tFor">
+		<xsd:complexContent>
+			<xsd:extension base="tIterator">
+				<xsd:sequence>
+					<xsd:element name="return" type="tChildExpression"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="every" type="tQuantified" substitutionGroup="expression"/>
+	<xsd:element name="some" type="tQuantified" substitutionGroup="expression"/>
+	<xsd:complexType name="tQuantified">
+		<xsd:complexContent>
+			<xsd:extension base="tIterator">
+				<xsd:sequence>
+					<xsd:element name="satisfies" type="tChildExpression"/>	
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="conditional" type="tConditional" substitutionGroup="expression"/>
+	<xsd:complexType name="tConditional">
+		<xsd:complexContent>
+			<xsd:extension base="tExpression">
+				<xsd:sequence>
+					<xsd:element name="if" type="tChildExpression"/>
+					<xsd:element name="then" type="tChildExpression"/>
+					<xsd:element name="else" type="tChildExpression"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="filter" type="tFilter" substitutionGroup="expression"/>
+	<xsd:complexType name="tFilter">
+		<xsd:complexContent>
+			<xsd:extension base="tExpression">
+				<xsd:sequence>
+					<xsd:element name="in" type="tChildExpression"/>
+					<xsd:element name="match" type="tChildExpression"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+</xsd:schema>
diff --git a/TestCases/DMNDI15.xsd b/TestCases/DMNDI15.xsd
new file mode 100644
index 000000000..17b553534
--- /dev/null
+++ b/TestCases/DMNDI15.xsd
@@ -0,0 +1,109 @@
+<?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:import namespace="http://www.omg.org/spec/DMN/20180521/DC/"
+	            schemaLocation="DC.xsd"/>
+	<xsd:import namespace="http://www.omg.org/spec/DMN/20180521/DI/"
+	            schemaLocation="DI.xsd"/>
+
+	<xsd:element name="DMNDI" type="dmndi:DMNDI"/>
+	<xsd:element name="DMNDiagram" type="dmndi:DMNDiagram"/>
+	<xsd:element name="DMNDiagramElement" type="di:DiagramElement">
+		<xsd:annotation>
+			<xsd:documentation>This element should never be instantiated directly, but rather concrete implementation should. It is placed there only to be referred in the sequence</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="DMNShape" type="dmndi:DMNShape" substitutionGroup="dmndi:DMNDiagramElement"/>
+	<xsd:element name="DMNEdge" type="dmndi:DMNEdge" substitutionGroup="dmndi:DMNDiagramElement"/>
+	<xsd:element name="DMNStyle" type="dmndi:DMNStyle" substitutionGroup="di:Style"/>
+	<xsd:element name="DMNLabel" type="dmndi:DMNLabel"/>
+	<xsd:element name="DMNDecisionServiceDividerLine" type="dmndi:DMNDecisionServiceDividerLine"/>
+
+	<xsd:complexType name="DMNDI">
+		<xsd:sequence>
+			<xsd:element ref="dmndi:DMNDiagram" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element ref="dmndi:DMNStyle" minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="DMNDiagram">
+		<xsd:complexContent>
+			<xsd:extension base="di:Diagram">
+				<xsd:sequence>
+					<xsd:element name="Size" type="dc:Dimension" minOccurs="0" maxOccurs="1"/>
+					<xsd:element ref="dmndi:DMNDiagramElement" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="useAlternativeInputDataShape" type="xsd:boolean" use="optional" default="false"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:complexType name="DMNShape">
+		<xsd:complexContent>
+			<xsd:extension base="di:Shape">
+				<xsd:sequence>
+					<xsd:element ref="dmndi:DMNLabel" minOccurs="0" maxOccurs="1"/>
+					<xsd:element ref="dmndi:DMNDecisionServiceDividerLine" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="dmnElementRef" type="xsd:QName" use="required"/>
+				<xsd:attribute name="isListedInputData" type="xsd:boolean" use="optional"/>
+				<xsd:attribute name="isCollapsed" type="xsd:boolean" use="optional" default="false"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+		<xsd:complexType name="DMNDecisionServiceDividerLine">
+		<xsd:complexContent>
+			<xsd:extension base="di:Edge"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:complexType name="DMNEdge">
+		<xsd:complexContent>
+			<xsd:extension base="di:Edge">
+				<xsd:sequence>
+					<xsd:element ref="dmndi:DMNLabel" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="dmnElementRef" type="xsd:QName" use="required"/>
+				<xsd:attribute name="sourceElement" type="xsd:QName" use="optional"/>
+				<xsd:attribute name="targetElement" type="xsd:QName" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:complexType name="DMNLabel">
+		<xsd:complexContent>
+			<xsd:extension base="di:Shape">
+				<xsd:sequence>
+					<xsd:element name="Text" type="xsd:string" minOccurs="0" maxOccurs="1" />
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:complexType name="DMNStyle">
+		<xsd:complexContent>
+			<xsd:extension base="di:Style">
+				<xsd:sequence>
+					<xsd:element name="FillColor" type="dc:Color" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="StrokeColor" type="dc:Color" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="FontColor" type="dc:Color" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="fontFamily" type="xsd:string"/>
+				<xsd:attribute name="fontSize" type="xsd:double"/>
+				<xsd:attribute name="fontItalic" type="xsd:boolean"/>
+				<xsd:attribute name="fontBold" type="xsd:boolean"/>
+				<xsd:attribute name="fontUnderline" type="xsd:boolean"/>
+				<xsd:attribute name="fontStrikeThrough" type="xsd:boolean"/>
+				<xsd:attribute name="labelHorizontalAlignement" type="dc:AlignmentKind"/>
+				<xsd:attribute name="labelVerticalAlignment" type="dc:AlignmentKind"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+</xsd:schema>
diff --git a/TestCases/compliance-level-2/0001-input-data-string/0001-input-data-string.dmn b/TestCases/compliance-level-2/0001-input-data-string/0001-input-data-string.dmn
index 3ee37abbe..a52940fba 100644
--- a/TestCases/compliance-level-2/0001-input-data-string/0001-input-data-string.dmn
+++ b/TestCases/compliance-level-2/0001-input-data-string/0001-input-data-string.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="https://github.com/agilepro/dmn-tck" name="0001-input-data-string" id="_0001-input-data-string" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="https://github.com/agilepro/dmn-tck" name="0001-input-data-string" id="_0001-input-data-string" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <decision name="Greeting Message" id="d_GreetingMessage">
         <variable typeRef="string" name="Greeting Message"/>
         <informationRequirement id="_8c935b50-10b7-426b-80a9-dddb4264b4a9">
diff --git a/TestCases/compliance-level-2/0002-input-data-number/0002-input-data-number.dmn b/TestCases/compliance-level-2/0002-input-data-number/0002-input-data-number.dmn
index ec5b93fb1..e48f06d56 100644
--- a/TestCases/compliance-level-2/0002-input-data-number/0002-input-data-number.dmn
+++ b/TestCases/compliance-level-2/0002-input-data-number/0002-input-data-number.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="https://github.com/agilepro/dmn-tck" name="0002-input-data-number" id="_0002-input-data-number" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="https://github.com/agilepro/dmn-tck" name="0002-input-data-number" id="_0002-input-data-number" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <decision name="Yearly Salary" id="d_YearlySalary">
         <variable typeRef="number" name="Yearly Salary"/>
         <informationRequirement id="_94534179-9eda-4522-b970-aaffcb4e0c97">
diff --git a/TestCases/compliance-level-2/0003-input-data-string-allowed-values/0003-input-data-string-allowed-values.dmn b/TestCases/compliance-level-2/0003-input-data-string-allowed-values/0003-input-data-string-allowed-values.dmn
index b6d1e4612..da8d871b8 100644
--- a/TestCases/compliance-level-2/0003-input-data-string-allowed-values/0003-input-data-string-allowed-values.dmn
+++ b/TestCases/compliance-level-2/0003-input-data-string-allowed-values/0003-input-data-string-allowed-values.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="https://github.com/agilepro/dmn-tck" name="0003-input-data-string-allowed-values" id="_0003-input-data-string-allowed-values" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="https://github.com/agilepro/dmn-tck" name="0003-input-data-string-allowed-values" id="_0003-input-data-string-allowed-values" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition name="tEmploymentStatus">
         <typeRef>string</typeRef>
         <allowedValues>
diff --git a/TestCases/compliance-level-2/0004-simpletable-U/0004-simpletable-U.dmn b/TestCases/compliance-level-2/0004-simpletable-U/0004-simpletable-U.dmn
index 35a93db1d..2ff5c6f77 100644
--- a/TestCases/compliance-level-2/0004-simpletable-U/0004-simpletable-U.dmn
+++ b/TestCases/compliance-level-2/0004-simpletable-U/0004-simpletable-U.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="5.0.32.2; 1.0; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" namespace="http://www.trisotech.com/definitions/_edbd2d8e-a5a8-4660-9bb9-adaa792d900c" typeLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" name="simple U table" triso:logoChoice="Default" xsi:schemaLocation="http://www.omg.org/spec/DMN/20151101/dmn.xsd ../../dmn.xsd" id="_edbd2d8e-a5a8-4660-9bb9-adaa792d900c" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="5.0.32.2; 1.0; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" namespace="http://www.trisotech.com/definitions/_edbd2d8e-a5a8-4660-9bb9-adaa792d900c" typeLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" name="simple U table" triso:logoChoice="Default" xsi:schemaLocation="https://www.omg.org/spec/DMN/20230324/DMN15.xsd ../../dmn.xsd" id="_edbd2d8e-a5a8-4660-9bb9-adaa792d900c" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <decision name="Approval Status" id="_3b2953a3-745f-4d2e-b55d-75c8c5ae653c">
         <variable typeRef="string" name="Approval Status"/>
         <informationRequirement id="c565bfc1-53ae-4e25-ad35-b26767a9b1d9">
diff --git a/TestCases/compliance-level-2/0005-simpletable-A/0005-simpletable-A.dmn b/TestCases/compliance-level-2/0005-simpletable-A/0005-simpletable-A.dmn
index 93d3146de..94568b8f2 100644
--- a/TestCases/compliance-level-2/0005-simpletable-A/0005-simpletable-A.dmn
+++ b/TestCases/compliance-level-2/0005-simpletable-A/0005-simpletable-A.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" namespace="http://www.trisotech.com/definitions/_6cb03678-38e5-4ee3-826b-d6622c738563" typeLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" name="simple A table" triso:logoChoice="Default" xsi:schemaLocation="http://www.omg.org/spec/DMN/20151101/dmn.xsd ../../dmn.xsd" id="_6cb03678-38e5-4ee3-826b-d6622c738563" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" namespace="http://www.trisotech.com/definitions/_6cb03678-38e5-4ee3-826b-d6622c738563" typeLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" name="simple A table" triso:logoChoice="Default" xsi:schemaLocation="https://www.omg.org/spec/DMN/20230324/DMN15.xsd ../../dmn.xsd" id="_6cb03678-38e5-4ee3-826b-d6622c738563" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <decision name="Approval Status" id="_3b2953a3-745f-4d2e-b55d-75c8c5ae653c">
         <variable typeRef="string" name="Approval Status"/>
         <informationRequirement id="fb6f56c3-d3ff-45e6-919c-c32e2e753863">
diff --git a/TestCases/compliance-level-2/0006-simpletable-P1/0006-simpletable-P1.dmn b/TestCases/compliance-level-2/0006-simpletable-P1/0006-simpletable-P1.dmn
index 03d84f39d..5c654e04a 100644
--- a/TestCases/compliance-level-2/0006-simpletable-P1/0006-simpletable-P1.dmn
+++ b/TestCases/compliance-level-2/0006-simpletable-P1/0006-simpletable-P1.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" namespace="http://www.trisotech.com/definitions/_791b8e95-b7a7-40e7-9dd1-5ff12364f340" typeLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" name="simple P table 1" triso:logoChoice="Default" xsi:schemaLocation="http://www.omg.org/spec/DMN/20151101/dmn.xsd ../../dmn.xsd" id="_791b8e95-b7a7-40e7-9dd1-5ff12364f340" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" namespace="http://www.trisotech.com/definitions/_791b8e95-b7a7-40e7-9dd1-5ff12364f340" typeLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" name="simple P table 1" triso:logoChoice="Default" xsi:schemaLocation="https://www.omg.org/spec/DMN/20230324/DMN15.xsd ../../dmn.xsd" id="_791b8e95-b7a7-40e7-9dd1-5ff12364f340" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <decision name="Approval Status" id="_3b2953a3-745f-4d2e-b55d-75c8c5ae653c">
         <variable typeRef="string" name="Approval Status"/>
         <informationRequirement id="f4929f9c-c679-4412-b125-b1a18d34f3ef">
diff --git a/TestCases/compliance-level-2/0007-simpletable-P2/0007-simpletable-P2.dmn b/TestCases/compliance-level-2/0007-simpletable-P2/0007-simpletable-P2.dmn
index 027bebd88..c16063c7c 100644
--- a/TestCases/compliance-level-2/0007-simpletable-P2/0007-simpletable-P2.dmn
+++ b/TestCases/compliance-level-2/0007-simpletable-P2/0007-simpletable-P2.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" namespace="http://www.trisotech.com/definitions/_501f6033-f4bc-4823-99aa-edaf29ac2e0b" typeLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" name="simple P table 2" triso:logoChoice="Default" xsi:schemaLocation="http://www.omg.org/spec/DMN/20151101/dmn.xsd ../../dmn.xsd" id="_501f6033-f4bc-4823-99aa-edaf29ac2e0b" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" namespace="http://www.trisotech.com/definitions/_501f6033-f4bc-4823-99aa-edaf29ac2e0b" typeLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" name="simple P table 2" triso:logoChoice="Default" xsi:schemaLocation="https://www.omg.org/spec/DMN/20230324/DMN15.xsd ../../dmn.xsd" id="_501f6033-f4bc-4823-99aa-edaf29ac2e0b" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <decision name="Approval Status" id="_3b2953a3-745f-4d2e-b55d-75c8c5ae653c">
         <variable typeRef="string" name="Approval Status"/>
         <informationRequirement id="_239d9761-857d-4350-aafe-c2be728e0a2e">
diff --git a/TestCases/compliance-level-2/0008-LX-arithmetic/0008-LX-arithmetic.dmn b/TestCases/compliance-level-2/0008-LX-arithmetic/0008-LX-arithmetic.dmn
index b9c70f65e..68c042995 100644
--- a/TestCases/compliance-level-2/0008-LX-arithmetic/0008-LX-arithmetic.dmn
+++ b/TestCases/compliance-level-2/0008-LX-arithmetic/0008-LX-arithmetic.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" namespace="http://www.trisotech.com/definitions/_1fedf2c0-0f4a-470c-bc66-a15528e8a49a" typeLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" name="literal - arithmetic" triso:logoChoice="Default" xsi:schemaLocation="http://www.omg.org/spec/DMN/20151101/dmn.xsd ../../dmn.xsd" id="_1fedf2c0-0f4a-470c-bc66-a15528e8a49a" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" namespace="http://www.trisotech.com/definitions/_1fedf2c0-0f4a-470c-bc66-a15528e8a49a" typeLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" name="literal - arithmetic" triso:logoChoice="Default" xsi:schemaLocation="https://www.omg.org/spec/DMN/20230324/DMN15.xsd ../../dmn.xsd" id="_1fedf2c0-0f4a-470c-bc66-a15528e8a49a" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition isCollection="false" name="tLoan" id="tLoan">
         <itemComponent isCollection="false" name="principal" id="_561947e6-180a-416e-aa22-5e8e5d650624">
             <typeRef>number</typeRef>
diff --git a/TestCases/compliance-level-2/0009-invocation-arithmetic/0009-invocation-arithmetic.dmn b/TestCases/compliance-level-2/0009-invocation-arithmetic/0009-invocation-arithmetic.dmn
index c37762ee9..b128ac2d7 100644
--- a/TestCases/compliance-level-2/0009-invocation-arithmetic/0009-invocation-arithmetic.dmn
+++ b/TestCases/compliance-level-2/0009-invocation-arithmetic/0009-invocation-arithmetic.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="5.0.33.1; 1.0; 1.0" namespace="http://www.trisotech.com/definitions/_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11" name="literal invocation1" triso:logoChoice="Default" id="_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="5.0.33.1; 1.0; 1.0" namespace="http://www.trisotech.com/definitions/_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11" name="literal invocation1" triso:logoChoice="Default" id="_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition name="tLoan" id="_f909c1d5-36e4-4f71-8392-fe3b14ddb6f7">
         <itemComponent name="amount" id="_579041dc-2bad-42b4-9650-b2cf39175ecc">
             <typeRef>number</typeRef>
@@ -32,7 +32,7 @@
             <formalParameter typeRef="number" name="p"/>
             <formalParameter typeRef="number" name="r"/>
             <formalParameter typeRef="number" name="n"/>
-            <literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" typeRef="number">
+            <literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" typeRef="number">
                 <text>(p*r/12)/(1-(1+r/12)**-n)</text>
             </literalExpression>
         </encapsulatedLogic>
diff --git a/TestCases/compliance-level-2/0010-multi-output-U/0010-multi-output-U.dmn b/TestCases/compliance-level-2/0010-multi-output-U/0010-multi-output-U.dmn
index dfaa15b3d..91e8ed68a 100644
--- a/TestCases/compliance-level-2/0010-multi-output-U/0010-multi-output-U.dmn
+++ b/TestCases/compliance-level-2/0010-multi-output-U/0010-multi-output-U.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.36.1; 1.0" namespace="http://www.trisotech.com/definitions/_a3ebbd98-af09-42f3-9099-4ae2204a1f54" name="multi-output-table" triso:logoChoice="Default" id="_a3ebbd98-af09-42f3-9099-4ae2204a1f54" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.36.1; 1.0" namespace="http://www.trisotech.com/definitions/_a3ebbd98-af09-42f3-9099-4ae2204a1f54" name="multi-output-table" triso:logoChoice="Default" id="_a3ebbd98-af09-42f3-9099-4ae2204a1f54" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition name="tApproval" id="tApproval">
         <itemComponent name="Status" id="_20dfeb44-1c36-43cf-8819-63ce36819e90">
             <typeRef>string</typeRef>
diff --git a/TestCases/compliance-level-2/0100-feel-constants/0100-feel-constants.dmn b/TestCases/compliance-level-2/0100-feel-constants/0100-feel-constants.dmn
index a342e338c..02cc92d50 100644
--- a/TestCases/compliance-level-2/0100-feel-constants/0100-feel-constants.dmn
+++ b/TestCases/compliance-level-2/0100-feel-constants/0100-feel-constants.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="https://github.com/dmn-tck/tck" name="feel-constants" id="_feel-constants" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="https://github.com/dmn-tck/tck" name="feel-constants" id="_feel-constants" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <decision name="Decision1" id="d_Decision1">
         <variable typeRef="boolean" name="Decision1"/>
         <literalExpression>
diff --git a/TestCases/compliance-level-2/0101-feel-constants/0101-feel-constants.dmn b/TestCases/compliance-level-2/0101-feel-constants/0101-feel-constants.dmn
index 03b7d854d..d8f220487 100644
--- a/TestCases/compliance-level-2/0101-feel-constants/0101-feel-constants.dmn
+++ b/TestCases/compliance-level-2/0101-feel-constants/0101-feel-constants.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="https://github.com/dmn-tck/tck" name="feel-constants" id="_feel-constants" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="https://github.com/dmn-tck/tck" name="feel-constants" id="_feel-constants" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <decision name="Decision1" id="d_Decision1">
         <variable typeRef="number" name="Decision1"/>
         <literalExpression>
diff --git a/TestCases/compliance-level-2/0102-feel-constants/0102-feel-constants.dmn b/TestCases/compliance-level-2/0102-feel-constants/0102-feel-constants.dmn
index c352d41d4..477d57e44 100644
--- a/TestCases/compliance-level-2/0102-feel-constants/0102-feel-constants.dmn
+++ b/TestCases/compliance-level-2/0102-feel-constants/0102-feel-constants.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="https://github.com/dmn-tck/tck" name="feel-constants" id="_feel-constants" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="https://github.com/dmn-tck/tck" name="feel-constants" id="_feel-constants" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <decision name="Decision1" id="d_Decision1">
         <variable typeRef="string" name="Decision1"/>
         <literalExpression>
diff --git a/TestCases/compliance-level-2/0105-feel-math/0105-feel-math.dmn b/TestCases/compliance-level-2/0105-feel-math/0105-feel-math.dmn
index 366c527b4..ddffa1a41 100644
--- a/TestCases/compliance-level-2/0105-feel-math/0105-feel-math.dmn
+++ b/TestCases/compliance-level-2/0105-feel-math/0105-feel-math.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="https://github.com/dmn-tck/tck" name="feel-math" id="_feel-math" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="https://github.com/dmn-tck/tck" name="feel-math" id="_feel-math" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <decision name="Decision1" id="d_1">
         <variable typeRef="number" name="Decision1"/>
         <literalExpression>
diff --git a/TestCases/compliance-level-2/0106-feel-ternary-logic/0106-feel-ternary-logic.dmn b/TestCases/compliance-level-2/0106-feel-ternary-logic/0106-feel-ternary-logic.dmn
index 46f39c713..ab955761e 100644
--- a/TestCases/compliance-level-2/0106-feel-ternary-logic/0106-feel-ternary-logic.dmn
+++ b/TestCases/compliance-level-2/0106-feel-ternary-logic/0106-feel-ternary-logic.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="https://github.com/dmn-tck/tck" name="feel-logic" id="_feel-logic" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="https://github.com/dmn-tck/tck" name="feel-logic" id="_feel-logic" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <inputData name="A" id="i_a">
         <variable typeRef="boolean" name="A"/>
     </inputData>
diff --git a/TestCases/compliance-level-2/0107-feel-ternary-logic-not/0107-feel-ternary-logic-not.dmn b/TestCases/compliance-level-2/0107-feel-ternary-logic-not/0107-feel-ternary-logic-not.dmn
index 39c16a9f3..a10647e7b 100644
--- a/TestCases/compliance-level-2/0107-feel-ternary-logic-not/0107-feel-ternary-logic-not.dmn
+++ b/TestCases/compliance-level-2/0107-feel-ternary-logic-not/0107-feel-ternary-logic-not.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="https://github.com/dmn-tck/tck" name="feel-logic-not" id="_feel-logic-not" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="https://github.com/dmn-tck/tck" name="feel-logic-not" id="_feel-logic-not" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <inputData name="A" id="i_a">
         <variable typeRef="boolean" name="A"/>
     </inputData>
diff --git a/TestCases/compliance-level-2/0108-first-hitpolicy/0108-first-hitpolicy.dmn b/TestCases/compliance-level-2/0108-first-hitpolicy/0108-first-hitpolicy.dmn
index 331180c24..7b23dc0c8 100644
--- a/TestCases/compliance-level-2/0108-first-hitpolicy/0108-first-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0108-first-hitpolicy/0108-first-hitpolicy.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.2" namespace="http://www.trisotech.com/definitions/_a3ebbd98-af09-42f3-9099-4ae2204a1f54" name="multi-output-table" triso:logoChoice="Default" id="_a3ebbd98-af09-42f3-9099-4ae2204a1f54" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.2" namespace="http://www.trisotech.com/definitions/_a3ebbd98-af09-42f3-9099-4ae2204a1f54" name="multi-output-table" triso:logoChoice="Default" id="_a3ebbd98-af09-42f3-9099-4ae2204a1f54" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <itemDefinition isCollection="false" name="tApproval" label="tApproval">
         <itemComponent isCollection="false" name="Status" id="_20dfeb44-1c36-43cf-8819-63ce36819e90">
diff --git a/TestCases/compliance-level-2/0109-ruleOrder-hitpolicy/0109-ruleOrder-hitpolicy.dmn b/TestCases/compliance-level-2/0109-ruleOrder-hitpolicy/0109-ruleOrder-hitpolicy.dmn
index 361231396..0be4dee47 100644
--- a/TestCases/compliance-level-2/0109-ruleOrder-hitpolicy/0109-ruleOrder-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0109-ruleOrder-hitpolicy/0109-ruleOrder-hitpolicy.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_a3ebbd98-af09-42f3-9099-4ae2204a1f54" name="multi-output-table" triso:logoChoice="Default" id="_a3ebbd98-af09-42f3-9099-4ae2204a1f54" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_a3ebbd98-af09-42f3-9099-4ae2204a1f54" name="multi-output-table" triso:logoChoice="Default" id="_a3ebbd98-af09-42f3-9099-4ae2204a1f54" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <itemDefinition isCollection="true" name="tApproval" label="tApproval">
         <itemComponent isCollection="false" name="Status" id="_20dfeb44-1c36-43cf-8819-63ce36819e90">
diff --git a/TestCases/compliance-level-2/0110-outputOrder-hitpolicy/0110-outputOrder-hitpolicy.dmn b/TestCases/compliance-level-2/0110-outputOrder-hitpolicy/0110-outputOrder-hitpolicy.dmn
index 551270372..0eb41104c 100644
--- a/TestCases/compliance-level-2/0110-outputOrder-hitpolicy/0110-outputOrder-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0110-outputOrder-hitpolicy/0110-outputOrder-hitpolicy.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_791b8e95-b7a7-40e7-9dd1-5ff12364f340" name="simple P table 1" triso:logoChoice="Default" id="_791b8e95-b7a7-40e7-9dd1-5ff12364f340" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_791b8e95-b7a7-40e7-9dd1-5ff12364f340" name="simple P table 1" triso:logoChoice="Default" id="_791b8e95-b7a7-40e7-9dd1-5ff12364f340" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <itemDefinition isCollection="true" name="tApprovalStatus" label="tApprovalStatus">
         <itemComponent isCollection="false" name="Approved/Declined" id="_86391af7-ea7a-434e-a150-f58875df0f9f">
diff --git a/TestCases/compliance-level-2/0111-first-hitpolicy-singleoutputcol/0111-first-hitpolicy-singleoutputcol.dmn b/TestCases/compliance-level-2/0111-first-hitpolicy-singleoutputcol/0111-first-hitpolicy-singleoutputcol.dmn
index 4fd8c9260..4eeab784c 100644
--- a/TestCases/compliance-level-2/0111-first-hitpolicy-singleoutputcol/0111-first-hitpolicy-singleoutputcol.dmn
+++ b/TestCases/compliance-level-2/0111-first-hitpolicy-singleoutputcol/0111-first-hitpolicy-singleoutputcol.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.2" namespace="http://www.trisotech.com/definitions/Definitions_1qokm8z" name="DRD" triso:logoChoice="Default" id="Definitions_1qokm8z" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.2" namespace="http://www.trisotech.com/definitions/Definitions_1qokm8z" name="DRD" triso:logoChoice="Default" id="Definitions_1qokm8z" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <decision name="Advertisement" id="advertisement">
         <variable typeRef="string" name="Advertisement" id="_7f901e84-f450-4108-8b5e-409742a9e301"/>
diff --git a/TestCases/compliance-level-2/0112-ruleOrder-hitpolicy-singleinoutcol/0112-ruleOrder-hitpolicy-singleinoutcol.dmn b/TestCases/compliance-level-2/0112-ruleOrder-hitpolicy-singleinoutcol/0112-ruleOrder-hitpolicy-singleinoutcol.dmn
index a602007dc..28fac842b 100644
--- a/TestCases/compliance-level-2/0112-ruleOrder-hitpolicy-singleinoutcol/0112-ruleOrder-hitpolicy-singleinoutcol.dmn
+++ b/TestCases/compliance-level-2/0112-ruleOrder-hitpolicy-singleinoutcol/0112-ruleOrder-hitpolicy-singleinoutcol.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_a3ebbd98-af09-42f3-9099-4ae2204a1f54" name="multi-output-table" triso:logoChoice="Default" id="_a3ebbd98-af09-42f3-9099-4ae2204a1f54" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_a3ebbd98-af09-42f3-9099-4ae2204a1f54" name="multi-output-table" triso:logoChoice="Default" id="_a3ebbd98-af09-42f3-9099-4ae2204a1f54" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <itemDefinition isCollection="true" name="tApproval" label="tApproval">
         <itemComponent isCollection="false" name="Status" id="_20dfeb44-1c36-43cf-8819-63ce36819e90">
diff --git a/TestCases/compliance-level-2/0113-outputOrder-hitpolicy-singleinoutcol/0113-outputOrder-hitpolicy-singleinoutcol.dmn b/TestCases/compliance-level-2/0113-outputOrder-hitpolicy-singleinoutcol/0113-outputOrder-hitpolicy-singleinoutcol.dmn
index 13161348b..ad603cf90 100644
--- a/TestCases/compliance-level-2/0113-outputOrder-hitpolicy-singleinoutcol/0113-outputOrder-hitpolicy-singleinoutcol.dmn
+++ b/TestCases/compliance-level-2/0113-outputOrder-hitpolicy-singleinoutcol/0113-outputOrder-hitpolicy-singleinoutcol.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_791b8e95-b7a7-40e7-9dd1-5ff12364f340" name="simple P table 1" triso:logoChoice="Default" id="_791b8e95-b7a7-40e7-9dd1-5ff12364f340" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_791b8e95-b7a7-40e7-9dd1-5ff12364f340" name="simple P table 1" triso:logoChoice="Default" id="_791b8e95-b7a7-40e7-9dd1-5ff12364f340" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <itemDefinition isCollection="true" name="tApprovalStatus" label="tApprovalStatus">
         <itemComponent isCollection="false" name="Approved/Declined" id="_86391af7-ea7a-434e-a150-f58875df0f9f">
diff --git a/TestCases/compliance-level-2/0114-min-collect-hitpolicy/0114-min-collect-hitpolicy.dmn b/TestCases/compliance-level-2/0114-min-collect-hitpolicy/0114-min-collect-hitpolicy.dmn
index 83db1be8a..d4b8da32d 100644
--- a/TestCases/compliance-level-2/0114-min-collect-hitpolicy/0114-min-collect-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0114-min-collect-hitpolicy/0114-min-collect-hitpolicy.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/Definitions_0reic0g" name="DRD" triso:logoChoice="Default" id="Definitions_0reic0g" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/Definitions_0reic0g" name="DRD" triso:logoChoice="Default" id="Definitions_0reic0g" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <decision name="CarInsurance" id="carInsurance">
         <variable typeRef="number" name="CarInsurance" id="_a295d2fe-a6db-4154-8295-8bd00def95cb"/>
diff --git a/TestCases/compliance-level-2/0115-sum-collect-hitpolicy/0115-sum-collect-hitpolicy.dmn b/TestCases/compliance-level-2/0115-sum-collect-hitpolicy/0115-sum-collect-hitpolicy.dmn
index c76bf7ab8..ac0a3033b 100644
--- a/TestCases/compliance-level-2/0115-sum-collect-hitpolicy/0115-sum-collect-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0115-sum-collect-hitpolicy/0115-sum-collect-hitpolicy.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/Definitions_11jk5op" name="DRD" triso:logoChoice="Default" id="Definitions_11jk5op" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/Definitions_11jk5op" name="DRD" triso:logoChoice="Default" id="Definitions_11jk5op" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <decision name="Salary" id="salary">
         <variable typeRef="number" name="Salary" id="_d885e484-7fd1-4c6b-8398-13c22eed672f"/>
diff --git a/TestCases/compliance-level-2/0116-count-collect-hitpolicy/0116-count-collect-hitpolicy.dmn b/TestCases/compliance-level-2/0116-count-collect-hitpolicy/0116-count-collect-hitpolicy.dmn
index ec2b5dcef..9d583b331 100644
--- a/TestCases/compliance-level-2/0116-count-collect-hitpolicy/0116-count-collect-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0116-count-collect-hitpolicy/0116-count-collect-hitpolicy.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/Definitions_11jk5op" name="DRD" triso:logoChoice="Default" id="Definitions_11jk5op" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/Definitions_11jk5op" name="DRD" triso:logoChoice="Default" id="Definitions_11jk5op" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <decision name="Salary" id="salary">
         <variable typeRef="number" name="Salary" id="_d885e484-7fd1-4c6b-8398-13c22eed672f"/>
diff --git a/TestCases/compliance-level-2/0117-multi-any-hitpolicy/0117-multi-any-hitpolicy.dmn b/TestCases/compliance-level-2/0117-multi-any-hitpolicy/0117-multi-any-hitpolicy.dmn
index 2e034dbc5..5f31942e0 100644
--- a/TestCases/compliance-level-2/0117-multi-any-hitpolicy/0117-multi-any-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0117-multi-any-hitpolicy/0117-multi-any-hitpolicy.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_a3ebbd98-af09-42f3-9099-4ae2204a1f54" name="multi-output-table" triso:logoChoice="Default" id="_a3ebbd98-af09-42f3-9099-4ae2204a1f54" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_a3ebbd98-af09-42f3-9099-4ae2204a1f54" name="multi-output-table" triso:logoChoice="Default" id="_a3ebbd98-af09-42f3-9099-4ae2204a1f54" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <itemDefinition isCollection="false" name="tApproval" label="tApproval">
         <itemComponent isCollection="false" name="Status" id="_20dfeb44-1c36-43cf-8819-63ce36819e90">
diff --git a/TestCases/compliance-level-2/0118-multi-priority-hitpolicy/0118-multi-priority-hitpolicy.dmn b/TestCases/compliance-level-2/0118-multi-priority-hitpolicy/0118-multi-priority-hitpolicy.dmn
index f919aa55f..80ef303c3 100644
--- a/TestCases/compliance-level-2/0118-multi-priority-hitpolicy/0118-multi-priority-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0118-multi-priority-hitpolicy/0118-multi-priority-hitpolicy.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_791b8e95-b7a7-40e7-9dd1-5ff12364f340" name="simple P table 1" triso:logoChoice="Default" id="_791b8e95-b7a7-40e7-9dd1-5ff12364f340" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_791b8e95-b7a7-40e7-9dd1-5ff12364f340" name="simple P table 1" triso:logoChoice="Default" id="_791b8e95-b7a7-40e7-9dd1-5ff12364f340" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <itemDefinition isCollection="false" name="tApprovalStatus6" label="tApprovalStatus6">
         <itemComponent isCollection="false" name="Approved/Declined" id="_86391af7-ea7a-434e-a150-f58875df0f9f">
diff --git a/TestCases/compliance-level-2/0119-multi-collect-hitpolicy/0119-multi-collect-hitpolicy.dmn b/TestCases/compliance-level-2/0119-multi-collect-hitpolicy/0119-multi-collect-hitpolicy.dmn
index a01830c98..8de3b880f 100644
--- a/TestCases/compliance-level-2/0119-multi-collect-hitpolicy/0119-multi-collect-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0119-multi-collect-hitpolicy/0119-multi-collect-hitpolicy.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.4.1" namespace="http://www.trisotech.com/definitions/_791b8e95-b7a7-40e7-9dd1-5ff12364f340" name="simple P table 1" triso:logoChoice="Default" id="_791b8e95-b7a7-40e7-9dd1-5ff12364f340" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.4.1" namespace="http://www.trisotech.com/definitions/_791b8e95-b7a7-40e7-9dd1-5ff12364f340" name="simple P table 1" triso:logoChoice="Default" id="_791b8e95-b7a7-40e7-9dd1-5ff12364f340" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <itemDefinition isCollection="true" name="tApprovalStatus" label="tApprovalStatus">
         <itemComponent isCollection="false" name="Approved/Declined" id="_86391af7-ea7a-434e-a150-f58875df0f9f">
diff --git a/TestCases/compliance-level-2/labeler.xslt b/TestCases/compliance-level-2/labeler.xslt
index d39fb9746..5ff44389c 100644
--- a/TestCases/compliance-level-2/labeler.xslt
+++ b/TestCases/compliance-level-2/labeler.xslt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:n1="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:n2="http://www.omg.org/spec/DMN/20160719/testcase" xmlns="http://www.omg.org/spec/DMN/20160719/testcase" xmlns:feel="http://www.omg.org/spec/FEEL/20140401">
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:n1="https://www.omg.org/spec/DMN/20230324/DMN15.xsd" xmlns:n2="http://www.omg.org/spec/DMN/20160719/testcase" xmlns="http://www.omg.org/spec/DMN/20160719/testcase" xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/">
 	<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
 	<xsl:template match="/">
 		<xsl:variable name="foldername" select="substring-before(//n2:modelName,'.dmn')"/>
diff --git a/TestCases/compliance-level-3/0001-filter/0001-filter.dmn b/TestCases/compliance-level-3/0001-filter/0001-filter.dmn
index 7796974c6..908ae05e8 100644
--- a/TestCases/compliance-level-3/0001-filter/0001-filter.dmn
+++ b/TestCases/compliance-level-3/0001-filter/0001-filter.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" namespace="http://www.trisotech.com/definitions/_f52ca843-504b-4c3b-a6bc-4d377bffef7a" name="filter01" triso:logoChoice="Default" id="_f52ca843-504b-4c3b-a6bc-4d377bffef7a" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" namespace="http://www.trisotech.com/definitions/_f52ca843-504b-4c3b-a6bc-4d377bffef7a" name="filter01" triso:logoChoice="Default" id="_f52ca843-504b-4c3b-a6bc-4d377bffef7a" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition isCollection="true" name="tEmployees" id="tEmployees">
         <itemComponent name="id" id="_c22147cb-9481-404e-8f48-f8eee8d25565">
             <typeRef>number</typeRef>
diff --git a/TestCases/compliance-level-3/0002-string-functions/0002-string-functions.dmn b/TestCases/compliance-level-3/0002-string-functions/0002-string-functions.dmn
index f58a53fba..820211c41 100644
--- a/TestCases/compliance-level-3/0002-string-functions/0002-string-functions.dmn
+++ b/TestCases/compliance-level-3/0002-string-functions/0002-string-functions.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" namespace="http://www.trisotech.com/definitions/_c2dc9bd5-010e-4351-b375-7db74d8ba69d" typeLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" name="stringFunctions" triso:logoChoice="Default" xsi:schemaLocation="http://www.omg.org/spec/DMN/20151101/dmn.xsd ../../dmn.xsd" id="_c2dc9bd5-010e-4351-b375-7db74d8ba69d" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" namespace="http://www.trisotech.com/definitions/_c2dc9bd5-010e-4351-b375-7db74d8ba69d" typeLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" name="stringFunctions" triso:logoChoice="Default" xsi:schemaLocation="https://www.omg.org/spec/DMN/20230324/DMN15.xsd ../../dmn.xsd" id="_c2dc9bd5-010e-4351-b375-7db74d8ba69d" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition isCollection="false" name="tBasic" id="tBasic">
         <itemComponent isCollection="false" name="startsWithX" id="_5d7320fd-aa96-4319-a4da-593ec491d0b0">
             <typeRef>boolean</typeRef>
diff --git a/TestCases/compliance-level-3/0003-iteration/0003-iteration.dmn b/TestCases/compliance-level-3/0003-iteration/0003-iteration.dmn
index c646e20f2..31fc60e28 100644
--- a/TestCases/compliance-level-3/0003-iteration/0003-iteration.dmn
+++ b/TestCases/compliance-level-3/0003-iteration/0003-iteration.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" namespace="http://www.trisotech.com/definitions/_54863c52-2fa7-4a3d-b383-d4eb2eb88771" typeLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" name="iteration1" triso:logoChoice="Default" xsi:schemaLocation="http://www.omg.org/spec/DMN/20151101/dmn.xsd ../../dmn.xsd" id="_54863c52-2fa7-4a3d-b383-d4eb2eb88771" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" namespace="http://www.trisotech.com/definitions/_54863c52-2fa7-4a3d-b383-d4eb2eb88771" typeLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" name="iteration1" triso:logoChoice="Default" xsi:schemaLocation="https://www.omg.org/spec/DMN/20230324/DMN15.xsd ../../dmn.xsd" id="_54863c52-2fa7-4a3d-b383-d4eb2eb88771" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition isCollection="false" name="tLoan">
         <itemComponent isCollection="false" name="amount">
             <typeRef>number</typeRef>
diff --git a/TestCases/compliance-level-3/0004-lending/0004-lending.dmn b/TestCases/compliance-level-3/0004-lending/0004-lending.dmn
index 887e941ae..a1204d9eb 100644
--- a/TestCases/compliance-level-3/0004-lending/0004-lending.dmn
+++ b/TestCases/compliance-level-3/0004-lending/0004-lending.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" namespace="http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b" typeLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" name="Lending1" triso:logoChoice="Default" xsi:schemaLocation="http://www.omg.org/spec/DMN/20151101/dmn.xsd file:///C:/Users/Bruce/Documents/DMN/DMN1.1%20final/dmn.xsd" id="_4e0f0b70-d31c-471c-bd52-5ca709ed362b" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" namespace="http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b" typeLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" name="Lending1" triso:logoChoice="Default" xsi:schemaLocation="https://www.omg.org/spec/DMN/20230324/DMN15.xsd file:///C:/Users/Bruce/Documents/DMN/DMN1.1%20final/dmn.xsd" id="_4e0f0b70-d31c-471c-bd52-5ca709ed362b" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition isCollection="false" name="tEligibility">
         <typeRef>string</typeRef>
         <allowedValues>
diff --git a/TestCases/compliance-level-3/0005-literal-invocation/0005-literal-invocation.dmn b/TestCases/compliance-level-3/0005-literal-invocation/0005-literal-invocation.dmn
index bfaa10da6..8c9ea9484 100644
--- a/TestCases/compliance-level-3/0005-literal-invocation/0005-literal-invocation.dmn
+++ b/TestCases/compliance-level-3/0005-literal-invocation/0005-literal-invocation.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.33.1; 1.0" namespace="http://www.trisotech.com/definitions/_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11" name="literal invocation1" triso:logoChoice="Default" id="_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.33.1; 1.0" namespace="http://www.trisotech.com/definitions/_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11" name="literal invocation1" triso:logoChoice="Default" id="_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition name="tLoan" id="_f909c1d5-36e4-4f71-8392-fe3b14ddb6f7">
         <itemComponent name="amount" id="_579041dc-2bad-42b4-9650-b2cf39175ecc">
             <typeRef>number</typeRef>
diff --git a/TestCases/compliance-level-3/0006-join/0006-join.dmn b/TestCases/compliance-level-3/0006-join/0006-join.dmn
index a4aa07885..464b19566 100644
--- a/TestCases/compliance-level-3/0006-join/0006-join.dmn
+++ b/TestCases/compliance-level-3/0006-join/0006-join.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="5.0.33.1; 1.0; 1.0" namespace="http://www.trisotech.com/definitions/_16bf03c7-8f3d-46d0-a921-6e335ccc7e29" name="join01" triso:logoChoice="Default" id="_16bf03c7-8f3d-46d0-a921-6e335ccc7e29" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="5.0.33.1; 1.0; 1.0" namespace="http://www.trisotech.com/definitions/_16bf03c7-8f3d-46d0-a921-6e335ccc7e29" name="join01" triso:logoChoice="Default" id="_16bf03c7-8f3d-46d0-a921-6e335ccc7e29" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition isCollection="true" name="tEmployeeTable" id="tEmployeeTable">
         <itemComponent name="id" id="_008f96e5-b82b-4105-ab8f-52673390c75f">
             <typeRef>string</typeRef>
diff --git a/TestCases/compliance-level-3/0007-date-time/0007-date-time.dmn b/TestCases/compliance-level-3/0007-date-time/0007-date-time.dmn
index d07820099..5e9dbd56f 100644
--- a/TestCases/compliance-level-3/0007-date-time/0007-date-time.dmn
+++ b/TestCases/compliance-level-3/0007-date-time/0007-date-time.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.33.1; 1.0" namespace="http://www.trisotech.com/definitions/_69430b3e-17b8-430d-b760-c505bf6469f9" name="dateTime Table 58" triso:logoChoice="Default" id="_69430b3e-17b8-430d-b760-c505bf6469f9" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.33.1; 1.0" namespace="http://www.trisotech.com/definitions/_69430b3e-17b8-430d-b760-c505bf6469f9" name="dateTime Table 58" triso:logoChoice="Default" id="_69430b3e-17b8-430d-b760-c505bf6469f9" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition name="tDateTimeComponents" id="tDateTimeComponents">
         <itemComponent name="Year" id="_df05a420-dbc5-48cf-be85-4b41702c4f33">
             <typeRef>number</typeRef>
diff --git a/TestCases/compliance-level-3/0008-listGen/0008-listGen.dmn b/TestCases/compliance-level-3/0008-listGen/0008-listGen.dmn
index f4d3d3dfb..8a558a28c 100644
--- a/TestCases/compliance-level-3/0008-listGen/0008-listGen.dmn
+++ b/TestCases/compliance-level-3/0008-listGen/0008-listGen.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.33.1; 1.0" namespace="http://www.trisotech.com/definitions/_95e3405c-eac4-4398-9de1-ca40c213f4ae" name="listGen" triso:logoChoice="Default" id="_95e3405c-eac4-4398-9de1-ca40c213f4ae" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.33.1; 1.0" namespace="http://www.trisotech.com/definitions/_95e3405c-eac4-4398-9de1-ca40c213f4ae" name="listGen" triso:logoChoice="Default" id="_95e3405c-eac4-4398-9de1-ca40c213f4ae" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition isCollection="true" name="tStringList" id="tStringList">
         <typeRef>string</typeRef>
     </itemDefinition>
diff --git a/TestCases/compliance-level-3/0009-append-flatten/0009-append-flatten.dmn b/TestCases/compliance-level-3/0009-append-flatten/0009-append-flatten.dmn
index aa197ee41..05311b30a 100644
--- a/TestCases/compliance-level-3/0009-append-flatten/0009-append-flatten.dmn
+++ b/TestCases/compliance-level-3/0009-append-flatten/0009-append-flatten.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.34; 1.0" namespace="http://www.trisotech.com/definitions/_9d6beae5-6a61-44a7-bbcf-09bcce989739" name="flatten" triso:logoChoice="Default" id="_9d6beae5-6a61-44a7-bbcf-09bcce989739" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.34; 1.0" namespace="http://www.trisotech.com/definitions/_9d6beae5-6a61-44a7-bbcf-09bcce989739" name="flatten" triso:logoChoice="Default" id="_9d6beae5-6a61-44a7-bbcf-09bcce989739" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition isCollection="true" name="tStringList" id="tStringList">
         <typeRef>string</typeRef>
     </itemDefinition>
diff --git a/TestCases/compliance-level-3/0010-concatenate/0010-concatenate.dmn b/TestCases/compliance-level-3/0010-concatenate/0010-concatenate.dmn
index 7e337d22b..5fa00c217 100644
--- a/TestCases/compliance-level-3/0010-concatenate/0010-concatenate.dmn
+++ b/TestCases/compliance-level-3/0010-concatenate/0010-concatenate.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.34; 1.0" namespace="http://www.trisotech.com/definitions/_e14a67c7-c9a2-4fd6-84fb-63722d1454d4" name="concatenate" triso:logoChoice="Default" id="_e14a67c7-c9a2-4fd6-84fb-63722d1454d4" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.34; 1.0" namespace="http://www.trisotech.com/definitions/_e14a67c7-c9a2-4fd6-84fb-63722d1454d4" name="concatenate" triso:logoChoice="Default" id="_e14a67c7-c9a2-4fd6-84fb-63722d1454d4" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition isCollection="true" name="tStringList" id="tStringList">
         <typeRef>string</typeRef>
     </itemDefinition>
diff --git a/TestCases/compliance-level-3/0011-insert-remove/0011-insert-remove.dmn b/TestCases/compliance-level-3/0011-insert-remove/0011-insert-remove.dmn
index 65062675d..0114087eb 100644
--- a/TestCases/compliance-level-3/0011-insert-remove/0011-insert-remove.dmn
+++ b/TestCases/compliance-level-3/0011-insert-remove/0011-insert-remove.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.1.1; 1.0" namespace="http://www.trisotech.com/definitions/_6029a6d3-d2f1-484b-a99d-4bedb5858a3e" name="insert-remove" triso:logoChoice="Default" id="_6029a6d3-d2f1-484b-a99d-4bedb5858a3e" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.1.1; 1.0" namespace="http://www.trisotech.com/definitions/_6029a6d3-d2f1-484b-a99d-4bedb5858a3e" name="insert-remove" triso:logoChoice="Default" id="_6029a6d3-d2f1-484b-a99d-4bedb5858a3e" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition isCollection="true" name="tStringList" label="tStringList">
         <typeRef>string</typeRef>
     </itemDefinition>
diff --git a/TestCases/compliance-level-3/0012-list-functions/0012-list-functions.dmn b/TestCases/compliance-level-3/0012-list-functions/0012-list-functions.dmn
index 46190eef2..5c2d794bf 100644
--- a/TestCases/compliance-level-3/0012-list-functions/0012-list-functions.dmn
+++ b/TestCases/compliance-level-3/0012-list-functions/0012-list-functions.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.33.1; 1.0" namespace="http://www.trisotech.com/definitions/_c0858816-af7b-40a1-8aa7-6e11b8761215" name="listFunctions" triso:logoChoice="Default" id="_c0858816-af7b-40a1-8aa7-6e11b8761215" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.33.1; 1.0" namespace="http://www.trisotech.com/definitions/_c0858816-af7b-40a1-8aa7-6e11b8761215" name="listFunctions" triso:logoChoice="Default" id="_c0858816-af7b-40a1-8aa7-6e11b8761215" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition isCollection="true" name="tStringList" id="tStringList">
         <typeRef>string</typeRef>
     </itemDefinition>
diff --git a/TestCases/compliance-level-3/0013-sort/0013-sort.dmn b/TestCases/compliance-level-3/0013-sort/0013-sort.dmn
index dbdaeedb6..971dfd2d6 100644
--- a/TestCases/compliance-level-3/0013-sort/0013-sort.dmn
+++ b/TestCases/compliance-level-3/0013-sort/0013-sort.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.35; 1.0" namespace="http://www.trisotech.com/definitions/_ac1acfdd-6baa-4f30-9cac-5d23957b4217" name="sort" triso:logoChoice="Default" id="_ac1acfdd-6baa-4f30-9cac-5d23957b4217" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.35; 1.0" namespace="http://www.trisotech.com/definitions/_ac1acfdd-6baa-4f30-9cac-5d23957b4217" name="sort" triso:logoChoice="Default" id="_ac1acfdd-6baa-4f30-9cac-5d23957b4217" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition isCollection="true" name="tNumList" id="tNumList">
         <typeRef>number</typeRef>
     </itemDefinition>
diff --git a/TestCases/compliance-level-3/0014-loan-comparison/0014-loan-comparison.dmn b/TestCases/compliance-level-3/0014-loan-comparison/0014-loan-comparison.dmn
index a3a887099..ce3d90fa9 100644
--- a/TestCases/compliance-level-3/0014-loan-comparison/0014-loan-comparison.dmn
+++ b/TestCases/compliance-level-3/0014-loan-comparison/0014-loan-comparison.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.1.1; 1.1" namespace="http://www.trisotech.com/definitions/_56c7d4a5-e6db-4bba-ac5f-dc082a16f719" name="loanComparison" triso:logoChoice="Default" xsi:schemaLocation="http://www.omg.org/spec/DMN/20151101/dmn.xsd ../../DMN1.1%20final/dmn.xsd" id="_56c7d4a5-e6db-4bba-ac5f-dc082a16f719" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.1.1; 1.1" namespace="http://www.trisotech.com/definitions/_56c7d4a5-e6db-4bba-ac5f-dc082a16f719" name="loanComparison" triso:logoChoice="Default" xsi:schemaLocation="https://www.omg.org/spec/DMN/20230324/DMN15.xsd ../../DMN1.1%20final/dmn.xsd" id="_56c7d4a5-e6db-4bba-ac5f-dc082a16f719" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition name="tLoanProduct" label="tLoanProduct">
         <itemComponent name="lenderName" id="_e4e050fd-9198-4b62-8f99-15cb2a0a2373">
             <typeRef>string</typeRef>
diff --git a/TestCases/compliance-level-3/0016-some-every/0016-some-every.dmn b/TestCases/compliance-level-3/0016-some-every/0016-some-every.dmn
index 2310fb200..2b6c87716 100644
--- a/TestCases/compliance-level-3/0016-some-every/0016-some-every.dmn
+++ b/TestCases/compliance-level-3/0016-some-every/0016-some-every.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.34.1; 1.0" namespace="http://www.trisotech.com/definitions/_d7643a02-a8fc-4a6f-a8a9-5c2881afea70" name="some-every" triso:logoChoice="Default" id="_d7643a02-a8fc-4a6f-a8a9-5c2881afea70" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.34.1; 1.0" namespace="http://www.trisotech.com/definitions/_d7643a02-a8fc-4a6f-a8a9-5c2881afea70" name="some-every" triso:logoChoice="Default" id="_d7643a02-a8fc-4a6f-a8a9-5c2881afea70" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition name="tItemPrice" id="tItemPrice">
         <itemComponent name="itemName" id="_de166af3-e625-4572-bc70-cb3c3aa01ca8">
             <typeRef>string</typeRef>
diff --git a/TestCases/compliance-level-3/0017-tableTests/0017-tableTests.dmn b/TestCases/compliance-level-3/0017-tableTests/0017-tableTests.dmn
index f4bdb5ec3..dc12df068 100644
--- a/TestCases/compliance-level-3/0017-tableTests/0017-tableTests.dmn
+++ b/TestCases/compliance-level-3/0017-tableTests/0017-tableTests.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.35; 1.0" namespace="http://www.trisotech.com/definitions/_92a0c25f-707e-4fc8-ae2d-2ab51ebe6bb6" name="tableTest" triso:logoChoice="Default" id="_92a0c25f-707e-4fc8-ae2d-2ab51ebe6bb6" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.35; 1.0" namespace="http://www.trisotech.com/definitions/_92a0c25f-707e-4fc8-ae2d-2ab51ebe6bb6" name="tableTest" triso:logoChoice="Default" id="_92a0c25f-707e-4fc8-ae2d-2ab51ebe6bb6" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition isCollection="true" name="tNumList" id="tNumList">
         <typeRef>number</typeRef>
     </itemDefinition>
diff --git a/TestCases/compliance-level-3/0020-vacation-days/0020-vacation-days.dmn b/TestCases/compliance-level-3/0020-vacation-days/0020-vacation-days.dmn
index d91a52428..b908944f5 100644
--- a/TestCases/compliance-level-3/0020-vacation-days/0020-vacation-days.dmn
+++ b/TestCases/compliance-level-3/0020-vacation-days/0020-vacation-days.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="https://www.drools.org/kie-dmn" name="0020-vacation-days" id="_0020_vacation_days" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="https://www.drools.org/kie-dmn" name="0020-vacation-days" id="_0020_vacation_days" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <inputData name="Age" id="i_Age">
         <variable typeRef="number" name="Age"/>
     </inputData>
diff --git a/TestCases/compliance-level-3/0021-singleton-list/0021-singleton-list.dmn b/TestCases/compliance-level-3/0021-singleton-list/0021-singleton-list.dmn
index 71e961057..84ec08b6a 100644
--- a/TestCases/compliance-level-3/0021-singleton-list/0021-singleton-list.dmn
+++ b/TestCases/compliance-level-3/0021-singleton-list/0021-singleton-list.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" namespace="http://www.trisotech.com/definitions/_f52ca843-504b-4c3b-a6bc-4d377bffef7a" name="filter01" triso:logoChoice="Default" id="_f52ca843-504b-4c3b-a6bc-4d377bffef7a" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" namespace="http://www.trisotech.com/definitions/_f52ca843-504b-4c3b-a6bc-4d377bffef7a" name="filter01" triso:logoChoice="Default" id="_f52ca843-504b-4c3b-a6bc-4d377bffef7a" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition isCollection="true" name="tStringList" id="tStringList">
         <typeRef>string</typeRef>
     </itemDefinition>
diff --git a/TestCases/compliance-level-3/0030-user-defined-functions/0030-user-defined-functions.dmn b/TestCases/compliance-level-3/0030-user-defined-functions/0030-user-defined-functions.dmn
index 7ea54667b..282a9af3f 100644
--- a/TestCases/compliance-level-3/0030-user-defined-functions/0030-user-defined-functions.dmn
+++ b/TestCases/compliance-level-3/0030-user-defined-functions/0030-user-defined-functions.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/0.1.0/0030-user-defined-functions" name="0030-user-defined-functions" id="_pKGjoH6LEeePe9Zmt-encA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/0.1.0/0030-user-defined-functions" name="0030-user-defined-functions" id="_pKGjoH6LEeePe9Zmt-encA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>Tests definition of functions in a boxed expression and invocation of those.</description>
     <decision name="simple function invocation" id="_WdFa8IDoEee-MeWXoLgrYg">
         <variable typeRef="string" name="simple function invocation" id="_0zDvUYDyEeehqsf_bU54Lw"/>
diff --git a/TestCases/compliance-level-3/0031-user-defined-functions/0031-user-defined-functions.dmn b/TestCases/compliance-level-3/0031-user-defined-functions/0031-user-defined-functions.dmn
index 150c9e805..6f7938171 100644
--- a/TestCases/compliance-level-3/0031-user-defined-functions/0031-user-defined-functions.dmn
+++ b/TestCases/compliance-level-3/0031-user-defined-functions/0031-user-defined-functions.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/0.1.0/0031-user-defined-functions" name="0030-user-defined-functions" id="_pKGjoH6LEeePe9Zmt-encA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/0.1.0/0031-user-defined-functions" name="0030-user-defined-functions" id="_pKGjoH6LEeePe9Zmt-encA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <itemDefinition name="tFnLibrary" id="_fKdL0IDJEee-MeWXoLgrYg">
         <itemComponent name="sumFn" id="_gtkkYIDJEee-MeWXoLgrYg"/>
         <itemComponent name="subFn" id="_pRj-sIDJEee-MeWXoLgrYg"/>
diff --git a/TestCases/compliance-level-3/0032-conditionals/0032-conditionals.dmn b/TestCases/compliance-level-3/0032-conditionals/0032-conditionals.dmn
index f59c01ea0..fe69fb745 100644
--- a/TestCases/compliance-level-3/0032-conditionals/0032-conditionals.dmn
+++ b/TestCases/compliance-level-3/0032-conditionals/0032-conditionals.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" namespace="http://www.trisotech.com/definitions/_54863c52-2fa7-4a3d-b383-d4eb2eb88771" typeLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" name="conditionals" triso:logoChoice="Default" xsi:schemaLocation="http://www.omg.org/spec/DMN/20151101/dmn.xsd ../../dmn.xsd" id="_54863c52-2fa7-4a3d-b383-d4eb2eb88771" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.32.2; 1.0" expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" namespace="http://www.trisotech.com/definitions/_54863c52-2fa7-4a3d-b383-d4eb2eb88771" typeLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" name="conditionals" triso:logoChoice="Default" xsi:schemaLocation="https://www.omg.org/spec/DMN/20230324/DMN15.xsd ../../dmn.xsd" id="_54863c52-2fa7-4a3d-b383-d4eb2eb88771" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <decision name="simpleIf" id="d_cond1">
         <variable typeRef="number" name="simpleIf"/>
         <informationRequirement id="_59dee493-9dfe-46a4-b44b-e7af6905c1ff">
diff --git a/TestCases/compliance-level-3/0033-for-loops/0033-for-loops.dmn b/TestCases/compliance-level-3/0033-for-loops/0033-for-loops.dmn
index 63e511b2f..9b1cb56e2 100644
--- a/TestCases/compliance-level-3/0033-for-loops/0033-for-loops.dmn
+++ b/TestCases/compliance-level-3/0033-for-loops/0033-for-loops.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="5.2.4.2" namespace="http://www.trisotech.com/definitions/_d458efc5-4a93-43f6-96d6-4e7d8c955259" name="for loops" triso:logoChoice="Default" id="_d458efc5-4a93-43f6-96d6-4e7d8c955259" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="5.2.4.2" namespace="http://www.trisotech.com/definitions/_d458efc5-4a93-43f6-96d6-4e7d8c955259" name="for loops" triso:logoChoice="Default" id="_d458efc5-4a93-43f6-96d6-4e7d8c955259" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <itemDefinition isCollection="true" name="ListOfNumbers" label="ListOfNumbers">
         <typeRef>number</typeRef>
diff --git a/TestCases/compliance-level-3/0034-drg-scopes/0034-drg-scopes.dmn b/TestCases/compliance-level-3/0034-drg-scopes/0034-drg-scopes.dmn
index 226b8d292..777fba7e6 100644
--- a/TestCases/compliance-level-3/0034-drg-scopes/0034-drg-scopes.dmn
+++ b/TestCases/compliance-level-3/0034-drg-scopes/0034-drg-scopes.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/0.1.0/0034-drg-scopes" name="0034-drg-scopes" xsi:schemaLocation="http://www.omg.org/spec/DMN/20151101/dmn.xsd http://www.omg.org/spec/DMN/20151101/dmn.xsd" id="_7X638PQIEeecaNY7kk20yA" xmlns:layout="https://products.bfs-intra.net/milestones/vr/spec/20170328/dmndi.xsd" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/0.1.0/0034-drg-scopes" name="0034-drg-scopes" xsi:schemaLocation="https://www.omg.org/spec/DMN/20230324/DMN15.xsd https://www.omg.org/spec/DMN/20230324/DMN15.xsd" id="_7X638PQIEeecaNY7kk20yA" xmlns:layout="https://products.bfs-intra.net/milestones/vr/spec/20170328/dmndi.xsd" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements>
         <layout:container type="Dmn" name="0034-drg-scopes" id="_7ZtAoPQIEeecaNY7kk20yA" href="#_7X638PQIEeecaNY7kk20yA">
             <layout:node type="2003" id="_9020cPQIEeecaNY7kk20yA" href="#_9z0SoPQIEeecaNY7kk20yA">
@@ -59,91 +59,91 @@
             <layout:node type="2009" id="_tX_ckPQMEeecaNY7kk20yA" href="#_tX2SoPQMEeecaNY7kk20yA">
                 <layout:location y="648" x="252"/>
             </layout:node>
-            <layout:edge type="4001" target="#_DMwGMfQJEeecaNY7kk20yA" source="#_9020cPQIEeecaNY7kk20yA" id="_FTAoEPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_DMwGMPQJEeecaNY7kk20yA$_9z0SoPQIEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_DMwGMfQJEeecaNY7kk20yA" source="#_9020cPQIEeecaNY7kk20yA" id="_FTAoEPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_DMwGMPQJEeecaNY7kk20yA$_9z0SoPQIEeecaNY7kk20yA">
                 <layout:bendpoints points="[-10, 13, 69, -94]$[-91, 96, -12, -11]"/>
                 <layout:targetAnchor id="(0.392,0.2222222222222222)"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_EL7rQfQJEeecaNY7kk20yA" source="#_9020cPQIEeecaNY7kk20yA" id="_FwjfsPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_EL7rQPQJEeecaNY7kk20yA$_9z0SoPQIEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_EL7rQfQJEeecaNY7kk20yA" source="#_9020cPQIEeecaNY7kk20yA" id="_FwjfsPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_EL7rQPQJEeecaNY7kk20yA$_9z0SoPQIEeecaNY7kk20yA">
                 <layout:bendpoints points="[30, 13, -240, -100]$[273, 134, 3, 21]"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_EL7rQfQJEeecaNY7kk20yA" source="#_AV-tYfQJEeecaNY7kk20yA" id="_GLXzcPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_EL7rQPQJEeecaNY7kk20yA$_AV-tYPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_EL7rQfQJEeecaNY7kk20yA" source="#_AV-tYfQJEeecaNY7kk20yA" id="_GLXzcPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_EL7rQPQJEeecaNY7kk20yA$_AV-tYPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[0, 13, -12, -84]$[0, 69, -12, -28]$[2, 74, -10, -23]"/>
                 <layout:sourceAnchor id="(0.576,0.8666666666666667)"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_HQXsoPQJEeecaNY7kk20yA" source="#_DMwGMfQJEeecaNY7kk20yA" id="_IA8N8PQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_HQN7oPQJEeecaNY7kk20yA$_DMwGMPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_HQXsoPQJEeecaNY7kk20yA" source="#_DMwGMfQJEeecaNY7kk20yA" id="_IA8N8PQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_HQN7oPQJEeecaNY7kk20yA$_DMwGMPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[-16, 21, 64, -89]$[-85, 101, -5, -9]"/>
                 <layout:targetAnchor id="(0.44,0.17777777777777778)"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_HrMAYfQJEeecaNY7kk20yA" source="#_DMwGMfQJEeecaNY7kk20yA" id="_IXvkYPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_HrMAYPQJEeecaNY7kk20yA$_DMwGMPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_HrMAYfQJEeecaNY7kk20yA" source="#_DMwGMfQJEeecaNY7kk20yA" id="_IXvkYPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_HrMAYPQJEeecaNY7kk20yA$_DMwGMPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[19, 21, -96, -104]$[99, 122, -16, -3]"/>
                 <layout:targetAnchor id="(0.128,0.3111111111111111)"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_I_HtcfQJEeecaNY7kk20yA" source="#_EL7rQfQJEeecaNY7kk20yA" id="_KQxikPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_I_HtcPQJEeecaNY7kk20yA$_EL7rQPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_I_HtcfQJEeecaNY7kk20yA" source="#_EL7rQfQJEeecaNY7kk20yA" id="_KQxikPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_I_HtcPQJEeecaNY7kk20yA$_EL7rQPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[6, 21, -30, -93]$[37, 135, 1, 21]"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_JhYtAfQJEeecaNY7kk20yA" source="#_EL7rQfQJEeecaNY7kk20yA" id="_Kn3z8PQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_JhYtAPQJEeecaNY7kk20yA$_EL7rQPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_JhYtAfQJEeecaNY7kk20yA" source="#_EL7rQfQJEeecaNY7kk20yA" id="_Kn3z8PQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_JhYtAPQJEeecaNY7kk20yA$_EL7rQPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[31, 21, -179, -93]$[148, 120, -62, 6]"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_LGaxIPQJEeecaNY7kk20yA" source="#_HQXsoPQJEeecaNY7kk20yA" id="_LiIcwPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_LGRAIPQJEeecaNY7kk20yA$_HQN7oPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_LGaxIPQJEeecaNY7kk20yA" source="#_HQXsoPQJEeecaNY7kk20yA" id="_LiIcwPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_LGRAIPQJEeecaNY7kk20yA$_HQN7oPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[23, 21, -89, -76]$[103, 86, -9, -11]"/>
                 <layout:targetAnchor id="(0.424,0.2222222222222222)"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_LGaxIPQJEeecaNY7kk20yA" source="#_HrMAYfQJEeecaNY7kk20yA" id="_L9BpAPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_LGRAIPQJEeecaNY7kk20yA$_HrMAYPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_LGaxIPQJEeecaNY7kk20yA" source="#_HrMAYfQJEeecaNY7kk20yA" id="_L9BpAPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_LGRAIPQJEeecaNY7kk20yA$_HrMAYPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[-10, 21, 44, -92]$[-52, 90, 2, -23]"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_Mk9LsfQJEeecaNY7kk20yA" source="#_I_HtcfQJEeecaNY7kk20yA" id="_M_VakPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_Mk9LsPQJEeecaNY7kk20yA$_I_HtcPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_Mk9LsfQJEeecaNY7kk20yA" source="#_I_HtcfQJEeecaNY7kk20yA" id="_M_VakPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_Mk9LsPQJEeecaNY7kk20yA$_I_HtcPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[19, 21, -82, -87]$[73, 97, -28, -11]"/>
                 <layout:targetAnchor id="(0.28,0.24444444444444444)"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_Mk9LsfQJEeecaNY7kk20yA" source="#_JhYtAfQJEeecaNY7kk20yA" id="_NUytMPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_Mk9LsPQJEeecaNY7kk20yA$_JhYtAPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_Mk9LsfQJEeecaNY7kk20yA" source="#_JhYtAfQJEeecaNY7kk20yA" id="_NUytMPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_Mk9LsPQJEeecaNY7kk20yA$_JhYtAPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[-4, 14, 17, -87]$[-38, 89, -17, -12]"/>
                 <layout:sourceAnchor id="(0.176,0.6444444444444445)"/>
                 <layout:targetAnchor id="(0.376,0.24444444444444444)"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_OWzj0fQJEeecaNY7kk20yA" source="#_LGaxIPQJEeecaNY7kk20yA" id="_Oviz8PQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_OWzj0PQJEeecaNY7kk20yA$_LGRAIPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_OWzj0fQJEeecaNY7kk20yA" source="#_LGaxIPQJEeecaNY7kk20yA" id="_Oviz8PQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_OWzj0PQJEeecaNY7kk20yA$_LGRAIPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[38, 21, -180, -92]$[156, 104, -62, -9]"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_OWzj0fQJEeecaNY7kk20yA" source="#_Mk9LsfQJEeecaNY7kk20yA" id="_PHFxQPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_OWzj0PQJEeecaNY7kk20yA$_Mk9LsPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_OWzj0fQJEeecaNY7kk20yA" source="#_Mk9LsfQJEeecaNY7kk20yA" id="_PHFxQPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_OWzj0PQJEeecaNY7kk20yA$_Mk9LsPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[-23, 21, 85, -79]$[-119, 90, -11, -10]"/>
                 <layout:targetAnchor id="(0.384,0.2)"/>
             </layout:edge>
-            <layout:edge type="4002" target="#_UL_1kfQJEeecaNY7kk20yA" source="#_U6fTQfQJEeecaNY7kk20yA" id="_VZVycPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:KnowledgeRequirement$_UL_1kPQJEeecaNY7kk20yA$_U6fTQPQJEeecaNY7kk20yA">
+            <layout:edge type="4002" target="#_UL_1kfQJEeecaNY7kk20yA" source="#_U6fTQfQJEeecaNY7kk20yA" id="_VZVycPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:KnowledgeRequirement$_UL_1kPQJEeecaNY7kk20yA$_U6fTQPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[-61, 19, 189, -56]$[-188, 70, 62, -5]"/>
             </layout:edge>
-            <layout:edge type="4002" target="#_UL_1kfQJEeecaNY7kk20yA" source="#_UgthUfQJEeecaNY7kk20yA" id="_V6uBMPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:KnowledgeRequirement$_UL_1kPQJEeecaNY7kk20yA$_UgthUPQJEeecaNY7kk20yA">
+            <layout:edge type="4002" target="#_UL_1kfQJEeecaNY7kk20yA" source="#_UgthUfQJEeecaNY7kk20yA" id="_V6uBMPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:KnowledgeRequirement$_UL_1kPQJEeecaNY7kk20yA$_UgthUPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[-23, -4, 181, 27]$[-196, -54, 8, -23]"/>
                 <layout:sourceAnchor id="(0.184,0.7333333333333333)"/>
             </layout:edge>
-            <layout:edge type="4002" target="#_UgthUfQJEeecaNY7kk20yA" source="#_U6fTQfQJEeecaNY7kk20yA" id="_WXHpUPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:KnowledgeRequirement$_UgthUPQJEeecaNY7kk20yA$_U6fTQPQJEeecaNY7kk20yA">
+            <layout:edge type="4002" target="#_UgthUfQJEeecaNY7kk20yA" source="#_U6fTQfQJEeecaNY7kk20yA" id="_WXHpUPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:KnowledgeRequirement$_UgthUPQJEeecaNY7kk20yA$_U6fTQPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[-3, 21, 4, -74]$[-11, 72, -4, -23]"/>
             </layout:edge>
-            <layout:edge type="4002" target="#_XsZaMfQJEeecaNY7kk20yA" source="#_UL_1kfQJEeecaNY7kk20yA" id="_YmDmEPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:KnowledgeRequirement$_XsZaMPQJEeecaNY7kk20yA$_UL_1kPQJEeecaNY7kk20yA">
+            <layout:edge type="4002" target="#_XsZaMfQJEeecaNY7kk20yA" source="#_UL_1kfQJEeecaNY7kk20yA" id="_YmDmEPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:KnowledgeRequirement$_XsZaMPQJEeecaNY7kk20yA$_UL_1kPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[-54, -21, 107, 42]$[-131, -73, 30, -10]"/>
                 <layout:targetAnchor id="(0.752,0.28888888888888886)"/>
             </layout:edge>
-            <layout:edge type="4002" target="#_ZgB7APQJEeecaNY7kk20yA" source="#_TCzY4fQJEeecaNY7kk20yA" id="_Z4KuMPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:KnowledgeRequirement$_Zf4KAPQJEeecaNY7kk20yA$_TCzY4PQJEeecaNY7kk20yA">
+            <layout:edge type="4002" target="#_ZgB7APQJEeecaNY7kk20yA" source="#_TCzY4fQJEeecaNY7kk20yA" id="_Z4KuMPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:KnowledgeRequirement$_Zf4KAPQJEeecaNY7kk20yA$_TCzY4PQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[-47, -12, 69, 13]$[-54, -25, 62, 0]"/>
                 <layout:sourceAnchor id="(0.376,0.8222222222222222)"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_ZgB7APQJEeecaNY7kk20yA" source="#_OWzj0fQJEeecaNY7kk20yA" id="_1rN-YPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_Zf4KAPQJEeecaNY7kk20yA$_OWzj0PQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_ZgB7APQJEeecaNY7kk20yA" source="#_OWzj0fQJEeecaNY7kk20yA" id="_1rN-YPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_Zf4KAPQJEeecaNY7kk20yA$_OWzj0PQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[-4, 21, -4, -75]$[-4, 117, -4, 21]"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_XsZaMfQJEeecaNY7kk20yA" source="#_ZgB7APQJEeecaNY7kk20yA" id="_188nkPQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_XsZaMPQJEeecaNY7kk20yA$_Zf4KAPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_XsZaMfQJEeecaNY7kk20yA" source="#_ZgB7APQJEeecaNY7kk20yA" id="_188nkPQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_XsZaMPQJEeecaNY7kk20yA$_Zf4KAPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[0, 21, 0, -71]$[-1, 99, -1, 7]"/>
                 <layout:targetAnchor id="(0.496,0.8)"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_OWzj0fQJEeecaNY7kk20yA" source="#_3kDvUfQJEeecaNY7kk20yA" id="_5XD-APQJEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_OWzj0PQJEeecaNY7kk20yA$_3kDvUPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_OWzj0fQJEeecaNY7kk20yA" source="#_3kDvUfQJEeecaNY7kk20yA" id="_5XD-APQJEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_OWzj0PQJEeecaNY7kk20yA$_3kDvUPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[-21, 5, 335, -78]$[-360, 60, -4, -23]"/>
                 <layout:sourceAnchor id="(0.416,0.7666666666666667)"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_tX_ckPQMEeecaNY7kk20yA" source="#_XsZaMfQJEeecaNY7kk20yA" id="_wqUwAPQMEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_tX2SoPQMEeecaNY7kk20yA$_XsZaMPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_tX_ckPQMEeecaNY7kk20yA" source="#_XsZaMfQJEeecaNY7kk20yA" id="_wqUwAPQMEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_tX2SoPQMEeecaNY7kk20yA$_XsZaMPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[5, 23, 5, -61]$[5, 107, 5, 23]"/>
             </layout:edge>
-            <layout:edge type="4002" target="#_TCzY4fQJEeecaNY7kk20yA" source="#_UL_1kfQJEeecaNY7kk20yA" id="_VbTSkPQPEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:KnowledgeRequirement$_TCzY4PQJEeecaNY7kk20yA$_UL_1kPQJEeecaNY7kk20yA">
+            <layout:edge type="4002" target="#_TCzY4fQJEeecaNY7kk20yA" source="#_UL_1kfQJEeecaNY7kk20yA" id="_VbTSkPQPEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:KnowledgeRequirement$_TCzY4PQJEeecaNY7kk20yA$_UL_1kPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[8, -6, 4, 58]$[8, -90, 4, -26]"/>
                 <layout:sourceAnchor id="(0.464,0.1)"/>
             </layout:edge>
-            <layout:edge type="4001" target="#_Mk9LsfQJEeecaNY7kk20yA" source="#_LGaxIPQJEeecaNY7kk20yA" id="_iZgOYPQPEeecaNY7kk20yA" href="#http://www.omg.org/spec/DMN/20151101/dmn.xsd:InformationRequirement$_Mk9LsPQJEeecaNY7kk20yA$_LGRAIPQJEeecaNY7kk20yA">
+            <layout:edge type="4001" target="#_Mk9LsfQJEeecaNY7kk20yA" source="#_LGaxIPQJEeecaNY7kk20yA" id="_iZgOYPQPEeecaNY7kk20yA" href="#https://www.omg.org/spec/DMN/20230324/DMN15.xsd:InformationRequirement$_Mk9LsPQJEeecaNY7kk20yA$_LGRAIPQJEeecaNY7kk20yA">
                 <layout:bendpoints points="[62, -3, -256, -3]$[309, -26, -9, -26]"/>
             </layout:edge>
         </layout:container>
diff --git a/TestCases/compliance-level-3/0035-test-structure-output/0035-test-structure-output.dmn b/TestCases/compliance-level-3/0035-test-structure-output/0035-test-structure-output.dmn
index df3995dbc..961dcca4f 100644
--- a/TestCases/compliance-level-3/0035-test-structure-output/0035-test-structure-output.dmn
+++ b/TestCases/compliance-level-3/0035-test-structure-output/0035-test-structure-output.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.0.7.2" namespace="http://www.trisotech.com/dmn/definitions/_a76ecb13-8ecb-4eb4-b590-41f33e8d5108" name="rgbcolor" triso:logoChoice="Default" id="_a76ecb13-8ecb-4eb4-b590-41f33e8d5108" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.0.7.2" namespace="http://www.trisotech.com/dmn/definitions/_a76ecb13-8ecb-4eb4-b590-41f33e8d5108" name="rgbcolor" triso:logoChoice="Default" id="_a76ecb13-8ecb-4eb4-b590-41f33e8d5108" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <itemDefinition name="tValue" label="tValue">
         <typeRef>number</typeRef>
diff --git a/TestCases/compliance-level-3/0036-dt-variable-input/0036-dt-variable-input.dmn b/TestCases/compliance-level-3/0036-dt-variable-input/0036-dt-variable-input.dmn
index d25f0e76b..338c749bf 100644
--- a/TestCases/compliance-level-3/0036-dt-variable-input/0036-dt-variable-input.dmn
+++ b/TestCases/compliance-level-3/0036-dt-variable-input/0036-dt-variable-input.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_ed1ec15b-40aa-424d-b1d0-4936df80b135" name="DT Using Variables" triso:logoChoice="Default" id="_ed1ec15b-40aa-424d-b1d0-4936df80b135" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_ed1ec15b-40aa-424d-b1d0-4936df80b135" name="DT Using Variables" triso:logoChoice="Default" id="_ed1ec15b-40aa-424d-b1d0-4936df80b135" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <itemDefinition isCollection="false" name="Complex" label="Complex">
         <itemComponent isCollection="false" name="aBoolean" id="_97f54b71-c748-4868-ab2c-1395142d1330">
diff --git a/TestCases/compliance-level-3/0037-dt-on-bkm-implicit-params/0037-dt-on-bkm-implicit-params.dmn b/TestCases/compliance-level-3/0037-dt-on-bkm-implicit-params/0037-dt-on-bkm-implicit-params.dmn
index 5c0f342d5..2522707e5 100644
--- a/TestCases/compliance-level-3/0037-dt-on-bkm-implicit-params/0037-dt-on-bkm-implicit-params.dmn
+++ b/TestCases/compliance-level-3/0037-dt-on-bkm-implicit-params/0037-dt-on-bkm-implicit-params.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_102a463a-acf1-4899-b16a-96b85824a709" name="DT on BKM implicit parameters" triso:logoChoice="Default" id="_102a463a-acf1-4899-b16a-96b85824a709" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/definitions/_102a463a-acf1-4899-b16a-96b85824a709" name="DT on BKM implicit parameters" triso:logoChoice="Default" id="_102a463a-acf1-4899-b16a-96b85824a709" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <itemDefinition name="tPerson" label="tPerson">
         <itemComponent name="Name" id="_4587234e-85c7-4419-98d9-ebb66aa1e043">
@@ -86,7 +86,7 @@
                     <inputEntry id="_eb5a6bb4-f1a7-42c9-bb2a-27ff44372a01">
                         <text>-</text>
                     </inputEntry>
-                    <outputEntry expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_b2516134-f85e-46fe-a48f-e97d15890193">
+                    <outputEntry expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_b2516134-f85e-46fe-a48f-e97d15890193">
                         <text>Person.Name + " is a dad of " + string(decimal(Person.Children,0)) + " children."</text>
                     </outputEntry>
                 </rule>
@@ -100,7 +100,7 @@
                     <inputEntry id="_22d2ef06-0b21-4fb0-89d3-e59bf59501df">
                         <text>-</text>
                     </inputEntry>
-                    <outputEntry expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_5ac32905-7373-451e-b143-29c55833eaf6">
+                    <outputEntry expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_5ac32905-7373-451e-b143-29c55833eaf6">
                         <text>Person.Name + " is a mother of " + string(decimal(Person.Children,0)) + " children."</text>
                     </outputEntry>
                 </rule>
diff --git a/TestCases/compliance-level-3/0038-dt-on-bkm-explicit-params/0038-dt-on-bkm-explicit-params.dmn b/TestCases/compliance-level-3/0038-dt-on-bkm-explicit-params/0038-dt-on-bkm-explicit-params.dmn
index d7222a616..69f98c06e 100644
--- a/TestCases/compliance-level-3/0038-dt-on-bkm-explicit-params/0038-dt-on-bkm-explicit-params.dmn
+++ b/TestCases/compliance-level-3/0038-dt-on-bkm-explicit-params/0038-dt-on-bkm-explicit-params.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/dmn/definitions/_87cc2f62-ab26-47a1-aad5-d40765cdc9fb" name="DT on BKM explicit parameters" triso:logoChoice="Default" id="_87cc2f62-ab26-47a1-aad5-d40765cdc9fb" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/dmn/definitions/_87cc2f62-ab26-47a1-aad5-d40765cdc9fb" name="DT on BKM explicit parameters" triso:logoChoice="Default" id="_87cc2f62-ab26-47a1-aad5-d40765cdc9fb" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <itemDefinition name="tPerson" label="tPerson">
         <itemComponent name="Name" id="_4587234e-85c7-4419-98d9-ebb66aa1e043">
@@ -59,7 +59,7 @@
                             <inputEntry id="_60b3620f-278d-40b8-9664-9601178df810">
                                 <text>"Male"</text>
                             </inputEntry>
-                            <outputEntry expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_b2516134-f85e-46fe-a48f-e97d15890193">
+                            <outputEntry expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_b2516134-f85e-46fe-a48f-e97d15890193">
                                 <text>Person.Name + " is a dad of " + string(decimal(Person.Children,0)) + " children."</text>
                             </outputEntry>
                         </rule>
@@ -67,7 +67,7 @@
                             <inputEntry id="_f9adf8ef-6d54-482a-ad93-52bec6484d6c">
                                 <text>"Female"</text>
                             </inputEntry>
-                            <outputEntry expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_5ac32905-7373-451e-b143-29c55833eaf6">
+                            <outputEntry expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_5ac32905-7373-451e-b143-29c55833eaf6">
                                 <text>Person.Name + " is a mother of " + string(decimal(Person.Children,0)) + " children."</text>
                             </outputEntry>
                         </rule>
diff --git a/TestCases/compliance-level-3/0039-dt-list-semantics/0039-dt-list-semantics.dmn b/TestCases/compliance-level-3/0039-dt-list-semantics/0039-dt-list-semantics.dmn
index 54bb1e22c..e6b075645 100644
--- a/TestCases/compliance-level-3/0039-dt-list-semantics/0039-dt-list-semantics.dmn
+++ b/TestCases/compliance-level-3/0039-dt-list-semantics/0039-dt-list-semantics.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/dmn/definitions/_7f0fb170-45f8-4189-94a4-74c686cc1d55" name="DT list semantics" triso:logoChoice="Default" id="_7f0fb170-45f8-4189-94a4-74c686cc1d55" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.3" namespace="http://www.trisotech.com/dmn/definitions/_7f0fb170-45f8-4189-94a4-74c686cc1d55" name="DT list semantics" triso:logoChoice="Default" id="_7f0fb170-45f8-4189-94a4-74c686cc1d55" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <itemDefinition isCollection="true" name="tListOfStrings" label="tListOfStrings">
         <typeRef>string</typeRef>
diff --git a/TestCases/compliance-level-3/0040-singlenestedcontext/0040-singlenestedcontext.dmn b/TestCases/compliance-level-3/0040-singlenestedcontext/0040-singlenestedcontext.dmn
index 87740c39b..228a09fef 100644
--- a/TestCases/compliance-level-3/0040-singlenestedcontext/0040-singlenestedcontext.dmn
+++ b/TestCases/compliance-level-3/0040-singlenestedcontext/0040-singlenestedcontext.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.5" namespace="http://www.trisotech.com/definitions/_00ca39fd-8843-49e7-ac80-ecc77b01a01c" name="Drawing 1" triso:logoChoice="Default" id="_00ca39fd-8843-49e7-ac80-ecc77b01a01c" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.5" namespace="http://www.trisotech.com/definitions/_00ca39fd-8843-49e7-ac80-ecc77b01a01c" name="Drawing 1" triso:logoChoice="Default" id="_00ca39fd-8843-49e7-ac80-ecc77b01a01c" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <decision name="Boxed Context" id="_3a383644-10da-49c4-b097-bc2ce96ced5f">
         <variable typeRef="number" name="Boxed Context" id="_daa1ccfd-f06a-43ca-97f4-0a37da687a79"/>
diff --git a/TestCases/compliance-level-3/0041-multiple-nestedcontext/0041-multiple-nestedcontext.dmn b/TestCases/compliance-level-3/0041-multiple-nestedcontext/0041-multiple-nestedcontext.dmn
index 51f88bedf..15bd54629 100644
--- a/TestCases/compliance-level-3/0041-multiple-nestedcontext/0041-multiple-nestedcontext.dmn
+++ b/TestCases/compliance-level-3/0041-multiple-nestedcontext/0041-multiple-nestedcontext.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions exporter="DMN Modeler" exporterVersion="6.1.5" namespace="http://www.trisotech.com/definitions/_00ca39fd-8843-49e7-ac80-ecc77b01a01c" name="Drawing 1" triso:logoChoice="Default" id="_00ca39fd-8843-49e7-ac80-ecc77b01a01c" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions exporter="DMN Modeler" exporterVersion="6.1.5" namespace="http://www.trisotech.com/definitions/_00ca39fd-8843-49e7-ac80-ecc77b01a01c" name="Drawing 1" triso:logoChoice="Default" id="_00ca39fd-8843-49e7-ac80-ecc77b01a01c" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <extensionElements/>
     <decision name="Boxed Context" id="_3a383644-10da-49c4-b097-bc2ce96ced5f">
         <variable typeRef="number" name="Boxed Context" id="_daa1ccfd-f06a-43ca-97f4-0a37da687a79"/>
diff --git a/TestCases/compliance-level-3/0050-feel-abs-function/0050-feel-abs-function.dmn b/TestCases/compliance-level-3/0050-feel-abs-function/0050-feel-abs-function.dmn
index 7f2c16408..e05ee9681 100644
--- a/TestCases/compliance-level-3/0050-feel-abs-function/0050-feel-abs-function.dmn
+++ b/TestCases/compliance-level-3/0050-feel-abs-function/0050-feel-abs-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0050-feel-abs-function" name="0050-feel-abs-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0050-feel-abs-function" name="0050-feel-abs-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'abs(number)' in category numeric functions</description>
     <decision name="decision001" id="_decision001">
         <description>Tests FEEL expression: 'abs(1)' and expects result: '1 (number)'</description>
diff --git a/TestCases/compliance-level-3/0051-feel-sqrt-function/0051-feel-sqrt-function.dmn b/TestCases/compliance-level-3/0051-feel-sqrt-function/0051-feel-sqrt-function.dmn
index 950f85941..c25d58022 100644
--- a/TestCases/compliance-level-3/0051-feel-sqrt-function/0051-feel-sqrt-function.dmn
+++ b/TestCases/compliance-level-3/0051-feel-sqrt-function/0051-feel-sqrt-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0051-feel-sqrt-function" name="0051-feel-sqrt-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0051-feel-sqrt-function" name="0051-feel-sqrt-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'sqrt(number)' in category numeric functions</description>
     <decision name="decision001" id="_decision001">
         <description>Tests FEEL expression: 'sqrt(4)' and expects result: '2 (number)'</description>
diff --git a/TestCases/compliance-level-3/0052-feel-exp-function/0052-feel-exp-function.dmn b/TestCases/compliance-level-3/0052-feel-exp-function/0052-feel-exp-function.dmn
index c459bc51c..28f869fad 100644
--- a/TestCases/compliance-level-3/0052-feel-exp-function/0052-feel-exp-function.dmn
+++ b/TestCases/compliance-level-3/0052-feel-exp-function/0052-feel-exp-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0052-feel-exp-function" name="0052-feel-exp-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0052-feel-exp-function" name="0052-feel-exp-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'exp(number)' in category numeric functions</description>
     <decision name="decision001" id="_decision001">
         <description>Tests FEEL expression: 'exp(4)' and expects result: '2 (number)'</description>
diff --git a/TestCases/compliance-level-3/0053-feel-log-function/0053-feel-log-function.dmn b/TestCases/compliance-level-3/0053-feel-log-function/0053-feel-log-function.dmn
index af8deb975..d57ba3742 100644
--- a/TestCases/compliance-level-3/0053-feel-log-function/0053-feel-log-function.dmn
+++ b/TestCases/compliance-level-3/0053-feel-log-function/0053-feel-log-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0053-feel-log-function" name="0053-feel-log-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0053-feel-log-function" name="0053-feel-log-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'log(number)' in category numeric functions</description>
     <decision name="decision001" id="_decision001">
         <description>Tests FEEL expression: 'log(4)' and expects result: '2 (number)'</description>
diff --git a/TestCases/compliance-level-3/0054-feel-even-function/0054-feel-even-function.dmn b/TestCases/compliance-level-3/0054-feel-even-function/0054-feel-even-function.dmn
index 0047c1c84..1c9fe83bb 100644
--- a/TestCases/compliance-level-3/0054-feel-even-function/0054-feel-even-function.dmn
+++ b/TestCases/compliance-level-3/0054-feel-even-function/0054-feel-even-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0054-feel-even-function" name="0054-feel-even-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0054-feel-even-function" name="0054-feel-even-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'even(number)' in category numeric functions</description>
     <decision name="decision001" id="_decision001">
         <description>Tests FEEL expression: 'even(2)' and expects result: 'true (boolean)'</description>
diff --git a/TestCases/compliance-level-3/0055-feel-odd-function/0055-feel-odd-function.dmn b/TestCases/compliance-level-3/0055-feel-odd-function/0055-feel-odd-function.dmn
index 6580c66a1..fb88b54d1 100644
--- a/TestCases/compliance-level-3/0055-feel-odd-function/0055-feel-odd-function.dmn
+++ b/TestCases/compliance-level-3/0055-feel-odd-function/0055-feel-odd-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0055-feel-odd-function" name="0055-feel-odd-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0055-feel-odd-function" name="0055-feel-odd-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'odd(number)' in category numeric functions</description>
     <decision name="decision001" id="_decision001">
         <description>Tests FEEL expression: 'odd(2)' and expects result: 'false (boolean)'</description>
diff --git a/TestCases/compliance-level-3/0056-feel-modulo-function/0056-feel-modulo-function.dmn b/TestCases/compliance-level-3/0056-feel-modulo-function/0056-feel-modulo-function.dmn
index b6ac27709..01e94d57d 100644
--- a/TestCases/compliance-level-3/0056-feel-modulo-function/0056-feel-modulo-function.dmn
+++ b/TestCases/compliance-level-3/0056-feel-modulo-function/0056-feel-modulo-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0056-feel-modulo-function" name="0056-feel-modulo-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0056-feel-modulo-function" name="0056-feel-modulo-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'modulo(dividend,divisor)' in category numeric functions</description>
     <decision name="decision001" id="_decision001">
         <description>Tests FEEL expression: 'modulo(10, 4)' and expects result: '2 (number)'</description>
diff --git a/TestCases/compliance-level-3/0057-feel-context/0057-feel-context.dmn b/TestCases/compliance-level-3/0057-feel-context/0057-feel-context.dmn
index 12a177396..018b74dc5 100644
--- a/TestCases/compliance-level-3/0057-feel-context/0057-feel-context.dmn
+++ b/TestCases/compliance-level-3/0057-feel-context/0057-feel-context.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0057-feel-context" name="0057-feel-context" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0057-feel-context" name="0057-feel-context" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <description>FEEL contexts</description>
 
     <decision name="decision001" id="_decision001">
diff --git a/TestCases/compliance-level-3/0058-feel-number-function/0058-feel-number-function.dmn b/TestCases/compliance-level-3/0058-feel-number-function/0058-feel-number-function.dmn
index 8b280690c..f0b49851a 100644
--- a/TestCases/compliance-level-3/0058-feel-number-function/0058-feel-number-function.dmn
+++ b/TestCases/compliance-level-3/0058-feel-number-function/0058-feel-number-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0058-feel-number-function" name="0058-feel-number-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0058-feel-number-function" name="0058-feel-number-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'modulo(dividend,divisor)' in category numeric functions</description>
     <decision name="decision001" id="_decision001">
         <description>Tests FEEL expression: 'number("1.000.000,01", ".", ","))' and expects result: '1000000.01 (number)'</description>
diff --git a/TestCases/compliance-level-3/0059-feel-all-function/0059-feel-all-function.dmn b/TestCases/compliance-level-3/0059-feel-all-function/0059-feel-all-function.dmn
index d5b199c73..dab34aa8a 100644
--- a/TestCases/compliance-level-3/0059-feel-all-function/0059-feel-all-function.dmn
+++ b/TestCases/compliance-level-3/0059-feel-all-function/0059-feel-all-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0059-feel-all-function" name="0059-feel-all-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0059-feel-all-function" name="0059-feel-all-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'all(list)' in category list functions</description>
     <decision name="decision001" id="_decision001">
         <description>Tests FEEL expression: 'all([true, false, true])' and expects result: 'false (boolean)'</description>
diff --git a/TestCases/compliance-level-3/0060-feel-any-function/0060-feel-any-function.dmn b/TestCases/compliance-level-3/0060-feel-any-function/0060-feel-any-function.dmn
index d1d7e94a4..7cdd38854 100644
--- a/TestCases/compliance-level-3/0060-feel-any-function/0060-feel-any-function.dmn
+++ b/TestCases/compliance-level-3/0060-feel-any-function/0060-feel-any-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0060-feel-any-function" name="0060-feel-any-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0060-feel-any-function" name="0060-feel-any-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'any(list)' in category list functions</description>
     <decision name="decision001" id="_decision001">
         <description>Tests FEEL expression: 'any([true, false, true])' and expects result: 'true (boolean)'</description>
diff --git a/TestCases/compliance-level-3/0061-feel-median-function/0061-feel-median-function.dmn b/TestCases/compliance-level-3/0061-feel-median-function/0061-feel-median-function.dmn
index 81c052914..c59516c4f 100644
--- a/TestCases/compliance-level-3/0061-feel-median-function/0061-feel-median-function.dmn
+++ b/TestCases/compliance-level-3/0061-feel-median-function/0061-feel-median-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0061-feel-median-function" name="0061-feel-median-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0061-feel-median-function" name="0061-feel-median-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'median(list)' in category list functions</description>
 
     <decision name="decision001" id="_decision001">
diff --git a/TestCases/compliance-level-3/0062-feel-mode-function/0062-feel-mode-function.dmn b/TestCases/compliance-level-3/0062-feel-mode-function/0062-feel-mode-function.dmn
index d678bbfbb..1cd8f5188 100644
--- a/TestCases/compliance-level-3/0062-feel-mode-function/0062-feel-mode-function.dmn
+++ b/TestCases/compliance-level-3/0062-feel-mode-function/0062-feel-mode-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0062-feel-mode-function" name="0062-feel-mode-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0062-feel-mode-function" name="0062-feel-mode-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
     <description>FEEL built-in function 'mode(list)' in category list functions</description>
 
diff --git a/TestCases/compliance-level-3/0063-feel-stddev-function/0063-feel-stddev-function.dmn b/TestCases/compliance-level-3/0063-feel-stddev-function/0063-feel-stddev-function.dmn
index 21069e3ed..3f237d3cf 100644
--- a/TestCases/compliance-level-3/0063-feel-stddev-function/0063-feel-stddev-function.dmn
+++ b/TestCases/compliance-level-3/0063-feel-stddev-function/0063-feel-stddev-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0063-feel-stddev-function" name="0063-feel-stddev-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0063-feel-stddev-function" name="0063-feel-stddev-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'stddev(list)' in category list functions</description>
 
     <decision name="decision001" id="_decision001">
diff --git a/TestCases/compliance-level-3/0064-feel-conjunction/0064-feel-conjunction.dmn b/TestCases/compliance-level-3/0064-feel-conjunction/0064-feel-conjunction.dmn
index b891441c4..83ceb240b 100644
--- a/TestCases/compliance-level-3/0064-feel-conjunction/0064-feel-conjunction.dmn
+++ b/TestCases/compliance-level-3/0064-feel-conjunction/0064-feel-conjunction.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0064-feel-conjunction" name="0064-feel-conjunction" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0064-feel-conjunction" name="0064-feel-conjunction" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>Semantics of conjunction</description>
     <decision name="decision001" id="_decision001">
         <description>Tests FEEL expression: 'true and true' and expects result: 'true (boolean)'</description>
diff --git a/TestCases/compliance-level-3/0065-feel-disjunction/0065-feel-disjunction.dmn b/TestCases/compliance-level-3/0065-feel-disjunction/0065-feel-disjunction.dmn
index cb4cfc7e6..f18143101 100644
--- a/TestCases/compliance-level-3/0065-feel-disjunction/0065-feel-disjunction.dmn
+++ b/TestCases/compliance-level-3/0065-feel-disjunction/0065-feel-disjunction.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0065-feel-disjunction" name="0065-feel-disjunction" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0065-feel-disjunction" name="0065-feel-disjunction" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>Semantics of conjunction</description>
     <decision name="decision001" id="_decision001">
         <description>Tests FEEL expression: 'true or true' and expects result: 'true (boolean)'</description>
diff --git a/TestCases/compliance-level-3/0066-feel-negation/0066-feel-negation.dmn b/TestCases/compliance-level-3/0066-feel-negation/0066-feel-negation.dmn
index bf727f5d8..e2e9d56e9 100644
--- a/TestCases/compliance-level-3/0066-feel-negation/0066-feel-negation.dmn
+++ b/TestCases/compliance-level-3/0066-feel-negation/0066-feel-negation.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0066-feel-negation" name="0066-feel-negation" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0066-feel-negation" name="0066-feel-negation" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>Semantics of negation</description>
     <decision name="decision001" id="_decision001">
         <description>Tests FEEL expression: 'not(true)' and expects result: 'false (boolean)'</description>
diff --git a/TestCases/compliance-level-3/0067-feel-split-function/0067-feel-split-function.dmn b/TestCases/compliance-level-3/0067-feel-split-function/0067-feel-split-function.dmn
index 6b8c71f4b..2f3e102dd 100644
--- a/TestCases/compliance-level-3/0067-feel-split-function/0067-feel-split-function.dmn
+++ b/TestCases/compliance-level-3/0067-feel-split-function/0067-feel-split-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0067-feel-split-function" name="0067-feel-split-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0067-feel-split-function" name="0067-feel-split-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'split(string,delimiter)' in category string functions</description>
 
     <itemDefinition name="tStringList" isCollection="true">
diff --git a/TestCases/compliance-level-3/0068-feel-equality/0068-feel-equality.dmn b/TestCases/compliance-level-3/0068-feel-equality/0068-feel-equality.dmn
index 6e111e263..54163a2a0 100644
--- a/TestCases/compliance-level-3/0068-feel-equality/0068-feel-equality.dmn
+++ b/TestCases/compliance-level-3/0068-feel-equality/0068-feel-equality.dmn
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <definitions namespace="http://www.montera.com.au/spec/DMN/0068-feel-equality" name="0068-feel-equality"
-             id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL equality</description>
 
diff --git a/TestCases/compliance-level-3/0069-feel-list/0069-feel-list.dmn b/TestCases/compliance-level-3/0069-feel-list/0069-feel-list.dmn
index da6e4df9b..d727884dc 100644
--- a/TestCases/compliance-level-3/0069-feel-list/0069-feel-list.dmn
+++ b/TestCases/compliance-level-3/0069-feel-list/0069-feel-list.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0069-feel-list" name="0069-feel-list" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0069-feel-list" name="0069-feel-list" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <description>FEEL lists</description>
 
     <decision name="decision001" id="_decision001">
diff --git a/TestCases/compliance-level-3/0070-feel-instance-of/0070-feel-instance-of.dmn b/TestCases/compliance-level-3/0070-feel-instance-of/0070-feel-instance-of.dmn
index 50339b2fb..bc8841b6f 100644
--- a/TestCases/compliance-level-3/0070-feel-instance-of/0070-feel-instance-of.dmn
+++ b/TestCases/compliance-level-3/0070-feel-instance-of/0070-feel-instance-of.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<dmn:definitions namespace="http://www.montera.com.au/spec/DMN/0070-feel-instance-of" xmlns:dmn="https://www.omg.org/spec/DMN/20211108/MODEL/" name="0070-feel-instance-of" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="http://www.montera.com.au/spec/DMN/0070-feel-instance-of" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<dmn:definitions namespace="http://www.montera.com.au/spec/DMN/0070-feel-instance-of" xmlns:dmn="https://www.omg.org/spec/DMN/20230324/MODEL/" name="0070-feel-instance-of" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="http://www.montera.com.au/spec/DMN/0070-feel-instance-of" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <dmn:description>FEEL instance of</dmn:description>
 
     <dmn:itemDefinition name="t_context_013">
diff --git a/TestCases/compliance-level-3/0071-feel-between/0071-feel-between.dmn b/TestCases/compliance-level-3/0071-feel-between/0071-feel-between.dmn
index 255cf03c5..13e4d4c4b 100644
--- a/TestCases/compliance-level-3/0071-feel-between/0071-feel-between.dmn
+++ b/TestCases/compliance-level-3/0071-feel-between/0071-feel-between.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0071-feel-between" name="0071-feel-between" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0071-feel-between" name="0071-feel-between" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <description>FEEL instance of</description>
 
     <decision name="number_001" id="_number_001">
diff --git a/TestCases/compliance-level-3/0072-feel-in/0072-feel-in.dmn b/TestCases/compliance-level-3/0072-feel-in/0072-feel-in.dmn
index ef3344831..1eeeb22c5 100644
--- a/TestCases/compliance-level-3/0072-feel-in/0072-feel-in.dmn
+++ b/TestCases/compliance-level-3/0072-feel-in/0072-feel-in.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0072-feel-in" name="0072-feel-in" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0072-feel-in" name="0072-feel-in" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <description>FEEL in</description>
 
     <decision name="number_001" id="_number_001">
diff --git a/TestCases/compliance-level-3/0073-feel-comments/0073-feel-comments.dmn b/TestCases/compliance-level-3/0073-feel-comments/0073-feel-comments.dmn
index e6537cd20..1f9b7fdab 100644
--- a/TestCases/compliance-level-3/0073-feel-comments/0073-feel-comments.dmn
+++ b/TestCases/compliance-level-3/0073-feel-comments/0073-feel-comments.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0073-feel-comments" name="0073-feel-comments" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0073-feel-comments" name="0073-feel-comments" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <description>FEEL in</description>
 
     <decision name="decision_001" id="_decision_001">
diff --git a/TestCases/compliance-level-3/0074-feel-properties/0074-feel-properties.dmn b/TestCases/compliance-level-3/0074-feel-properties/0074-feel-properties.dmn
index 26d10f46f..b6222b6b8 100644
--- a/TestCases/compliance-level-3/0074-feel-properties/0074-feel-properties.dmn
+++ b/TestCases/compliance-level-3/0074-feel-properties/0074-feel-properties.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0074-feel-properties" name="0074-feel-properties" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0074-feel-properties" name="0074-feel-properties" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <description>FEEL properties</description>
 
     <decision name="context_001" id="_context_001">
diff --git a/TestCases/compliance-level-3/0075-feel-exponent/0075-feel-exponent.dmn b/TestCases/compliance-level-3/0075-feel-exponent/0075-feel-exponent.dmn
index 2b8b52b66..f4af1d7da 100644
--- a/TestCases/compliance-level-3/0075-feel-exponent/0075-feel-exponent.dmn
+++ b/TestCases/compliance-level-3/0075-feel-exponent/0075-feel-exponent.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0075-feel-exponent" name="0075-feel-exponent" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0075-feel-exponent" name="0075-feel-exponent" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <description>FEEL properties</description>
 
     <decision name="decision_001" id="_decision_001">
diff --git a/TestCases/compliance-level-3/0076-feel-external-java/0076-feel-external-java.dmn b/TestCases/compliance-level-3/0076-feel-external-java/0076-feel-external-java.dmn
index a6c35fd59..8fed0bfe0 100644
--- a/TestCases/compliance-level-3/0076-feel-external-java/0076-feel-external-java.dmn
+++ b/TestCases/compliance-level-3/0076-feel-external-java/0076-feel-external-java.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0076-feel-external-java" name="0076-feel-external-java" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0076-feel-external-java" name="0076-feel-external-java" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <description>FEEL external Java functions</description>
 
     <decision name="boxed_001" id="_boxed_001">
diff --git a/TestCases/compliance-level-3/0077-feel-nan/0077-feel-nan.dmn b/TestCases/compliance-level-3/0077-feel-nan/0077-feel-nan.dmn
index 6858bb3ac..7e49eee91 100644
--- a/TestCases/compliance-level-3/0077-feel-nan/0077-feel-nan.dmn
+++ b/TestCases/compliance-level-3/0077-feel-nan/0077-feel-nan.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0077-feel-nan" name="0077-feel-nan" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0077-feel-nan" name="0077-feel-nan" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <description>FEEL NaN</description>
 
     <decision name="decision_001" id="_decision_001">
diff --git a/TestCases/compliance-level-3/0078-feel-infinity/0078-feel-infinity.dmn b/TestCases/compliance-level-3/0078-feel-infinity/0078-feel-infinity.dmn
index 241d11745..1b4ce2919 100644
--- a/TestCases/compliance-level-3/0078-feel-infinity/0078-feel-infinity.dmn
+++ b/TestCases/compliance-level-3/0078-feel-infinity/0078-feel-infinity.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0078-feel-infinity" name="0078-feel-infinity" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0078-feel-infinity" name="0078-feel-infinity" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <description>FEEL Infinity</description>
 
     <decision name="decision_001" id="_decision_001">
diff --git a/TestCases/compliance-level-3/0080-feel-getvalue-function/0080-feel-getvalue-function.dmn b/TestCases/compliance-level-3/0080-feel-getvalue-function/0080-feel-getvalue-function.dmn
index c8f1affda..466af249e 100644
--- a/TestCases/compliance-level-3/0080-feel-getvalue-function/0080-feel-getvalue-function.dmn
+++ b/TestCases/compliance-level-3/0080-feel-getvalue-function/0080-feel-getvalue-function.dmn
@@ -2,7 +2,7 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/0080-feel-getvalue-function"
              name="0080-feel-getvalue-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
              xmlns:dmndi="http://www.omg.org/spec/DMN/20180521/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
diff --git a/TestCases/compliance-level-3/0081-feel-getentries-function/0081-feel-getentries-function.dmn b/TestCases/compliance-level-3/0081-feel-getentries-function/0081-feel-getentries-function.dmn
index 87ff4adc8..d620cbce1 100644
--- a/TestCases/compliance-level-3/0081-feel-getentries-function/0081-feel-getentries-function.dmn
+++ b/TestCases/compliance-level-3/0081-feel-getentries-function/0081-feel-getentries-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0081-feel-getentries-function" name="0081-feel-getentries-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0081-feel-getentries-function" name="0081-feel-getentries-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'get entries(m)' in unspecified category</description>
 
     <decision name="decision_001" id="_decision_001">
diff --git a/TestCases/compliance-level-3/0082-feel-coercion/0082-feel-coercion.dmn b/TestCases/compliance-level-3/0082-feel-coercion/0082-feel-coercion.dmn
index 3302b4174..fba4e761d 100644
--- a/TestCases/compliance-level-3/0082-feel-coercion/0082-feel-coercion.dmn
+++ b/TestCases/compliance-level-3/0082-feel-coercion/0082-feel-coercion.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0082-feel-coercion" name="0082-feel-coercion" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0082-feel-coercion" name="0082-feel-coercion" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <description>FEEL type conformance of DT and BKM results</description>
 
     <itemDefinition name="tNumberList" isCollection="true">
diff --git a/TestCases/compliance-level-3/0083-feel-unicode/0083-feel-unicode.dmn b/TestCases/compliance-level-3/0083-feel-unicode/0083-feel-unicode.dmn
index 29b71e838..bfedeb55b 100644
--- a/TestCases/compliance-level-3/0083-feel-unicode/0083-feel-unicode.dmn
+++ b/TestCases/compliance-level-3/0083-feel-unicode/0083-feel-unicode.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0083-feel-unicode" name="0083-feel-unicode" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0083-feel-unicode" name="0083-feel-unicode" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL unicode tests</description>
 
     <decision name="decision_001" id="_decision_001">
diff --git a/TestCases/compliance-level-3/0084-feel-for-loops/0084-feel-for-loops.dmn b/TestCases/compliance-level-3/0084-feel-for-loops/0084-feel-for-loops.dmn
index 32b23ed79..11e2d277e 100644
--- a/TestCases/compliance-level-3/0084-feel-for-loops/0084-feel-for-loops.dmn
+++ b/TestCases/compliance-level-3/0084-feel-for-loops/0084-feel-for-loops.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0084-feel-for-loops" name="0084-feel-for-loops" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0084-feel-for-loops" name="0084-feel-for-loops" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <description>FEEL for loops</description>
 
     <decision name="decision_001" id="_decision_001">
diff --git a/TestCases/compliance-level-3/0085-decision-services/0085-decision-services.dmn b/TestCases/compliance-level-3/0085-decision-services/0085-decision-services.dmn
index f1e8da162..0c0915757 100644
--- a/TestCases/compliance-level-3/0085-decision-services/0085-decision-services.dmn
+++ b/TestCases/compliance-level-3/0085-decision-services/0085-decision-services.dmn
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <definitions namespace="http://www.montera.com.au/spec/DMN/0085-decision-services" name="0085-decision-services"
-             id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <description>Decision Services</description>
diff --git a/TestCases/compliance-level-3/0086-import/0086-import.dmn b/TestCases/compliance-level-3/0086-import/0086-import.dmn
index 8703927f2..0f5fc4f12 100644
--- a/TestCases/compliance-level-3/0086-import/0086-import.dmn
+++ b/TestCases/compliance-level-3/0086-import/0086-import.dmn
@@ -2,19 +2,19 @@
 <definitions xmlns:triso="http://www.trisotech.com/2015/triso/modeling"
                       xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" 
                       xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 
-                      xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" 
-                      xmlns:feel="https://www.omg.org/spec/DMN/20211108/FEEL/" 
+                      xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
+                      xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/"
                       xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase"
                       xmlns:include1="http://www.trisotech.com/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df36" 
                       xmlns:trisofeed="http://trisotech.com/feed" 
                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
                       xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                      xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" id="_f27bb64b-6fc7-4e1f-9848-11ba35e0df36" 
+                      xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" id="_f27bb64b-6fc7-4e1f-9848-11ba35e0df36"
                       namespace="http://www.trisotech.com/definitions/_c3e08836-7973-4e4d-af2b-d46b23725c13"          exporter="DMN Modeler" exporterVersion="6.2.1" 
                       name="Import BKM and have a Decision Ctx with DT" triso:logoChoice="Default">
     <import namespace="http://www.trisotech.com/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df36"
                      name="myimport"
-                     importType="https://www.omg.org/spec/DMN/20211108/MODEL/"
+                     importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
                      />
     <inputData id="_9df2ca89-d100-4ba3-9a44-6a71cae5c001" name="A Person">
         <variable name="A Person" id="_9e1f6cbc-584f-41f6-8748-97f579a3df43" typeRef="myimport.tPerson"/>
diff --git a/TestCases/compliance-level-3/0086-import/Imported_Model.dmn b/TestCases/compliance-level-3/0086-import/Imported_Model.dmn
index 173362ecb..464c30bc8 100644
--- a/TestCases/compliance-level-3/0086-import/Imported_Model.dmn
+++ b/TestCases/compliance-level-3/0086-import/Imported_Model.dmn
@@ -2,13 +2,13 @@
 <definitions xmlns:triso="http://www.trisotech.com/2015/triso/modeling"
                       xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" 
                       xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 
-                      xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" 
-                      xmlns:feel="https://www.omg.org/spec/DMN/20211108/FEEL/" 
+                      xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
+                      xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/"
                       xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase" 
                       xmlns:trisofeed="http://trisotech.com/feed" 
                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
                       xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                      xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" id="_f27bb64b-6fc7-4e1f-9848-11ba35e0df36" 
+                      xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" id="_f27bb64b-6fc7-4e1f-9848-11ba35e0df36"
                       namespace="http://www.trisotech.com/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df36"          exporter="DMN Modeler" exporterVersion="6.2.1" 
                       name="Imported Model" triso:logoChoice="Default">
     <itemDefinition name="tPerson" label="tPerson" isCollection="false">
diff --git a/TestCases/compliance-level-3/0087-chapter-11-example/0087-chapter-11-example.dmn b/TestCases/compliance-level-3/0087-chapter-11-example/0087-chapter-11-example.dmn
index bf3119488..44ab65f18 100644
--- a/TestCases/compliance-level-3/0087-chapter-11-example/0087-chapter-11-example.dmn
+++ b/TestCases/compliance-level-3/0087-chapter-11-example/0087-chapter-11-example.dmn
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<semantic:definitions xmlns:semantic="https://www.omg.org/spec/DMN/20211108/MODEL/"
+<semantic:definitions xmlns:semantic="https://www.omg.org/spec/DMN/20230324/MODEL/"
 					  xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
 					  xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-					  xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
-					  xmlns:feel="https://www.omg.org/spec/DMN/20211108/FEEL/"
+					  xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
+					  xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/"
 					  xmlns="http://www.trisotech.com/definitions/_9d01a0c4-f529-4ad8-ad8e-ec5fb5d96ad4"
 					  id="_9d01a0c4-f529-4ad8-ad8e-ec5fb5d96ad4"
 					  namespace="http://www.trisotech.com/definitions/_9d01a0c4-f529-4ad8-ad8e-ec5fb5d96ad4"
diff --git a/TestCases/compliance-level-3/0088-no-decision-logic/0088-no-decision-logic.dmn b/TestCases/compliance-level-3/0088-no-decision-logic/0088-no-decision-logic.dmn
index e5f6a8b9f..0bf4ef165 100644
--- a/TestCases/compliance-level-3/0088-no-decision-logic/0088-no-decision-logic.dmn
+++ b/TestCases/compliance-level-3/0088-no-decision-logic/0088-no-decision-logic.dmn
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<definitions xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:kie="http://www.drools.org/kie/dmn/1.2" xmlns:feel="https://www.omg.org/spec/DMN/20211108/FEEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" id="_BA898F11-9F63-4A74-AF32-235D82663253" name="x1" expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" typeLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" namespace="https://kiegroup.org/dmn/_EBF07892-D449-49E8-B77A-08CDAAB2E820">
+<definitions xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:kie="http://www.drools.org/kie/dmn/1.2" xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" id="_BA898F11-9F63-4A74-AF32-235D82663253" name="x1" expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" typeLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" namespace="https://kiegroup.org/dmn/_EBF07892-D449-49E8-B77A-08CDAAB2E820">
   <extensionElements/>
   <itemDefinition id="_1A35CDE5-592B-4C7D-A302-15043E11830C" name="tGrade" isCollection="false">
     <typeRef>string</typeRef>
diff --git a/TestCases/compliance-level-3/0089-nested-inputdata-imports/0089-nested-inputdata-imports.dmn b/TestCases/compliance-level-3/0089-nested-inputdata-imports/0089-nested-inputdata-imports.dmn
index e158a0864..b91bf5a99 100644
--- a/TestCases/compliance-level-3/0089-nested-inputdata-imports/0089-nested-inputdata-imports.dmn
+++ b/TestCases/compliance-level-3/0089-nested-inputdata-imports/0089-nested-inputdata-imports.dmn
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<definitions xmlns:semantic="https://www.omg.org/spec/DMN/20211108/MODEL/" 
-                      xmlns:dmn11="http://www.omg.org/spec/DMN/20151101/dmn.xsd" 
+<definitions xmlns:semantic="https://www.omg.org/spec/DMN/20230324/MODEL/"
+                      xmlns:dmn11="https://www.omg.org/spec/DMN/20230324/DMN15.xsd"
                       xmlns:rss="http://purl.org/rss/2.0/" 
                       xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 
                       xmlns:drools="http://www.drools.org/kie/dmn/1.1" 
                       xmlns:trisofeed="http://trisotech.com/feed" 
-                      xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" 
+                      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/20211108/FEEL/" 
+                      xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/"
                       xmlns:include1="http://www.trisotech.com/definitions/_2a1d771a-a899-4fef-abd6-fc894332337c" 
                       xmlns:include2="http://www.trisotech.com/definitions/_9d46ece4-a96c-4cb0-abc0-0ca121ac3768"              
                       xmlns:trisodmn="http://www.trisotech.com/2016/triso/dmn"  
                       xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase"  
-                      xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" 
+                      xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
                       id="_10435dcd-8774-4575-a338-49dd554a0928" name="Model C" 
                       namespace="http://www.trisotech.com/definitions/_10435dcd-8774-4575-a338-49dd554a0928" exporter="DMN Modeler" exporterVersion="6.2.4.2" triso:logoChoice="Default">
     <import namespace="http://www.trisotech.com/definitions/_2a1d771a-a899-4fef-abd6-fc894332337c"
                      name="Model B" 
-                     importType="https://www.omg.org/spec/DMN/20211108/MODEL/" />
+                     importType="https://www.omg.org/spec/DMN/20230324/MODEL/" />
     <import namespace="http://www.trisotech.com/definitions/_9d46ece4-a96c-4cb0-abc0-0ca121ac3768" 
                      name="Model B2" 
-                     importType="https://www.omg.org/spec/DMN/20211108/MODEL/" />
+                     importType="https://www.omg.org/spec/DMN/20230324/MODEL/" />
     <decision id="_fc1bff6c-b1ca-4a10-ba9a-23b8f5e86e6a" name="Model C Decision based on Bs" triso:useOutputTypeAsAnswer="false">
         <variable name="Model C Decision based on Bs" id="_2e323310-3d83-4c51-a256-3082e0ccacea" typeRef="Any"/>
         <informationRequirement id="_e848f84a-25ef-432b-b944-2848f11ea91c">
diff --git a/TestCases/compliance-level-3/0089-nested-inputdata-imports/Model_B.dmn b/TestCases/compliance-level-3/0089-nested-inputdata-imports/Model_B.dmn
index 9cf1c8844..14f384ae9 100644
--- a/TestCases/compliance-level-3/0089-nested-inputdata-imports/Model_B.dmn
+++ b/TestCases/compliance-level-3/0089-nested-inputdata-imports/Model_B.dmn
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<definitions xmlns:semantic="https://www.omg.org/spec/DMN/20211108/MODEL/" 
-                      xmlns:dmn11="http://www.omg.org/spec/DMN/20151101/dmn.xsd" 
+<definitions xmlns:semantic="https://www.omg.org/spec/DMN/20230324/MODEL/"
+                      xmlns:dmn11="https://www.omg.org/spec/DMN/20230324/DMN15.xsd"
                       xmlns:rss="http://purl.org/rss/2.0/" 
                       xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 
                       xmlns:drools="http://www.drools.org/kie/dmn/1.1" 
                       xmlns:trisofeed="http://trisotech.com/feed" 
-                      xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" 
+                      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/20211108/FEEL/" 
+                      xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/"
                       xmlns:include1="http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9"             
                       xmlns:trisodmn="http://www.trisotech.com/2016/triso/dmn"  
                       xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase"  
-                      xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" 
+                      xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
                       id="_2a1d771a-a899-4fef-abd6-fc894332337c" name="Model B" 
                       namespace="http://www.trisotech.com/definitions/_2a1d771a-a899-4fef-abd6-fc894332337c" exporter="DMN Modeler" exporterVersion="6.2.4.2" triso:logoChoice="Default">
     <import namespace="http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9" 
                      name="modelA" 
-                     importType="https://www.omg.org/spec/DMN/20211108/MODEL/" />
+                     importType="https://www.omg.org/spec/DMN/20230324/MODEL/" />
     <decision id="_96df766e-23e1-4aa6-9d5d-545fbe2f1e23" name="Evaluating Say Hello" triso:useOutputTypeAsAnswer="false">
         <variable name="Evaluating Say Hello" id="_0a5ade68-3746-4022-99e3-e15e42216725" typeRef="string"/>
         <informationRequirement id="_d3627327-056c-4117-b167-df7029d21511">
diff --git a/TestCases/compliance-level-3/0089-nested-inputdata-imports/Model_B2.dmn b/TestCases/compliance-level-3/0089-nested-inputdata-imports/Model_B2.dmn
index 74f588ebd..7f30460ee 100644
--- a/TestCases/compliance-level-3/0089-nested-inputdata-imports/Model_B2.dmn
+++ b/TestCases/compliance-level-3/0089-nested-inputdata-imports/Model_B2.dmn
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<definitions xmlns:semantic="https://www.omg.org/spec/DMN/20211108/MODEL/" 
-                      xmlns:dmn11="http://www.omg.org/spec/DMN/20151101/dmn.xsd" 
+<definitions xmlns:semantic="https://www.omg.org/spec/DMN/20230324/MODEL/"
+                      xmlns:dmn11="https://www.omg.org/spec/DMN/20230324/DMN15.xsd"
                       xmlns:rss="http://purl.org/rss/2.0/" 
                       xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 
                       xmlns:drools="http://www.drools.org/kie/dmn/1.1" 
                       xmlns:trisofeed="http://trisotech.com/feed" 
-                      xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" 
+                      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/20211108/FEEL/" 
+                      xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/"
                       xmlns:include1="http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9"             
                       xmlns:trisodmn="http://www.trisotech.com/2016/triso/dmn"  
                       xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase"  
-                      xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" 
+                      xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
                       id="_9d46ece4-a96c-4cb0-abc0-0ca121ac3768" name="Model B2" 
                       namespace="http://www.trisotech.com/definitions/_9d46ece4-a96c-4cb0-abc0-0ca121ac3768" exporter="DMN Modeler" exporterVersion="6.2.4.2" triso:logoChoice="Default">
     <import namespace="http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9" 
             name="modelA" 
-            importType="https://www.omg.org/spec/DMN/20211108/MODEL/" />
+            importType="https://www.omg.org/spec/DMN/20230324/MODEL/" />
     <decision id="_96df766e-23e1-4aa6-9d5d-545fbe2f1e23" name="Evaluating B2 Say Hello" triso:useOutputTypeAsAnswer="false">
         <variable name="Evaluating B2 Say Hello" id="_0a5ade68-3746-4022-99e3-e15e42216725" typeRef="string"/>
         <informationRequirement id="_3eb95d84-08de-4497-9827-5dcd5cb5927e">
diff --git a/TestCases/compliance-level-3/0089-nested-inputdata-imports/Say_hello_1ID1D.dmn b/TestCases/compliance-level-3/0089-nested-inputdata-imports/Say_hello_1ID1D.dmn
index 3db63e912..d79e348c9 100644
--- a/TestCases/compliance-level-3/0089-nested-inputdata-imports/Say_hello_1ID1D.dmn
+++ b/TestCases/compliance-level-3/0089-nested-inputdata-imports/Say_hello_1ID1D.dmn
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<definitions xmlns:semantic="https://www.omg.org/spec/DMN/20211108/MODEL/"
-                      xmlns:dmn11="http://www.omg.org/spec/DMN/20151101/dmn.xsd" 
+<definitions xmlns:semantic="https://www.omg.org/spec/DMN/20230324/MODEL/"
+                      xmlns:dmn11="https://www.omg.org/spec/DMN/20230324/DMN15.xsd"
                       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/20191111/DMNDI/" 
+                      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/20211108/FEEL/"           
+                      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="https://www.omg.org/spec/DMN/20211108/MODEL/" 
+                      xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
                       id="_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9" name="Say hello 1ID1D" 
                       namespace="http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9" exporter="DMN Modeler" exporterVersion="6.2.4.2" triso:logoChoice="Default">
     <inputData id="_4f6c136c-8512-4d71-8bbf-7c9eb6e74063" name="Person name">
diff --git a/TestCases/compliance-level-3/0090-feel-paths/0090-feel-paths.dmn b/TestCases/compliance-level-3/0090-feel-paths/0090-feel-paths.dmn
index c12139b8a..b449966fc 100644
--- a/TestCases/compliance-level-3/0090-feel-paths/0090-feel-paths.dmn
+++ b/TestCases/compliance-level-3/0090-feel-paths/0090-feel-paths.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0090-feel-paths" name="0090-feel-paths" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0090-feel-paths" name="0090-feel-paths" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL path and qualified names</description>
 
     <decision name="nested_list_001" id="_nested_list_001">
diff --git a/TestCases/compliance-level-3/0091-local-hrefs/0091-local-hrefs.dmn b/TestCases/compliance-level-3/0091-local-hrefs/0091-local-hrefs.dmn
index 814db03c2..1619fb213 100644
--- a/TestCases/compliance-level-3/0091-local-hrefs/0091-local-hrefs.dmn
+++ b/TestCases/compliance-level-3/0091-local-hrefs/0091-local-hrefs.dmn
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <definitions namespace="http://www.montera.com.au/spec/DMN/0091-local-hrefs"
              name="0091-local-hrefs"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/">
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/">
 
     <description>Local (non-imported) qualified hrefs</description>
 
diff --git a/TestCases/compliance-level-3/0092-feel-lambda/0092-feel-lambda.dmn b/TestCases/compliance-level-3/0092-feel-lambda/0092-feel-lambda.dmn
index a458a3c3f..846fceaea 100644
--- a/TestCases/compliance-level-3/0092-feel-lambda/0092-feel-lambda.dmn
+++ b/TestCases/compliance-level-3/0092-feel-lambda/0092-feel-lambda.dmn
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <definitions namespace="http://www.montera.com.au/spec/DMN/0092-feel-lambda"
              name="0092-feel-lambda"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" >
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" >
     <description>FEEL lambda</description>
 
     <!-- function definitions -->
diff --git a/TestCases/compliance-level-3/0093-feel-at-literals/0093-feel-at-literals.dmn b/TestCases/compliance-level-3/0093-feel-at-literals/0093-feel-at-literals.dmn
index eed1bc84c..a913dbbe5 100644
--- a/TestCases/compliance-level-3/0093-feel-at-literals/0093-feel-at-literals.dmn
+++ b/TestCases/compliance-level-3/0093-feel-at-literals/0093-feel-at-literals.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/0093-feel-at-literals"
              name="0093-feel-at-literals"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL @ literals</description>
diff --git a/TestCases/compliance-level-3/0094-feel-product-function/0094-feel-product-function.dmn b/TestCases/compliance-level-3/0094-feel-product-function/0094-feel-product-function.dmn
index 1b9034cbd..5e7bfa367 100644
--- a/TestCases/compliance-level-3/0094-feel-product-function/0094-feel-product-function.dmn
+++ b/TestCases/compliance-level-3/0094-feel-product-function/0094-feel-product-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/0094-feel-product-function"
              name="0094-feel-product-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
diff --git a/TestCases/compliance-level-3/0095-feel-day-of-year-function/0095-feel-day-of-year-function.dmn b/TestCases/compliance-level-3/0095-feel-day-of-year-function/0095-feel-day-of-year-function.dmn
index f738fcdf6..d62976748 100644
--- a/TestCases/compliance-level-3/0095-feel-day-of-year-function/0095-feel-day-of-year-function.dmn
+++ b/TestCases/compliance-level-3/0095-feel-day-of-year-function/0095-feel-day-of-year-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/0095-feel-day-of-year-function"
              name="0095-feel-day-of-year-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>day of year function</description>
diff --git a/TestCases/compliance-level-3/0096-feel-day-of-week-function/0096-feel-day-of-week-function.dmn b/TestCases/compliance-level-3/0096-feel-day-of-week-function/0096-feel-day-of-week-function.dmn
index c8efe8ca1..402b91fab 100644
--- a/TestCases/compliance-level-3/0096-feel-day-of-week-function/0096-feel-day-of-week-function.dmn
+++ b/TestCases/compliance-level-3/0096-feel-day-of-week-function/0096-feel-day-of-week-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/0096-feel-day-of-week-function"
              name="0096-feel-day-of-week-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>day of week function</description>
diff --git a/TestCases/compliance-level-3/0097-feel-month-of-year-function/0097-feel-month-of-year-function.dmn b/TestCases/compliance-level-3/0097-feel-month-of-year-function/0097-feel-month-of-year-function.dmn
index 8d5171c3b..cfee0d4d4 100644
--- a/TestCases/compliance-level-3/0097-feel-month-of-year-function/0097-feel-month-of-year-function.dmn
+++ b/TestCases/compliance-level-3/0097-feel-month-of-year-function/0097-feel-month-of-year-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/0097-feel-month-of-year-function"
              name="0097-feel-month-of-year-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>month of year function</description>
diff --git a/TestCases/compliance-level-3/0098-feel-week-of-year-function/0098-feel-week-of-year-function.dmn b/TestCases/compliance-level-3/0098-feel-week-of-year-function/0098-feel-week-of-year-function.dmn
index a57443c5e..038593fa3 100644
--- a/TestCases/compliance-level-3/0098-feel-week-of-year-function/0098-feel-week-of-year-function.dmn
+++ b/TestCases/compliance-level-3/0098-feel-week-of-year-function/0098-feel-week-of-year-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/0098-feel-week-of-year-function"
              name="0098-feel-week-of-year-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>week of year function</description>
diff --git a/TestCases/compliance-level-3/0099-arithmetic-negation/0099-arithmetic-negation.dmn b/TestCases/compliance-level-3/0099-arithmetic-negation/0099-arithmetic-negation.dmn
index 562938513..c6d0d46b8 100644
--- a/TestCases/compliance-level-3/0099-arithmetic-negation/0099-arithmetic-negation.dmn
+++ b/TestCases/compliance-level-3/0099-arithmetic-negation/0099-arithmetic-negation.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/0099-arithmetic-negation"
              name="0099-arithmetic-negation"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>arithmetic negation</description>
diff --git a/TestCases/compliance-level-3/0100-arithmetic/0100-arithmetic.dmn b/TestCases/compliance-level-3/0100-arithmetic/0100-arithmetic.dmn
index 7be2f8776..5ee881ee6 100644
--- a/TestCases/compliance-level-3/0100-arithmetic/0100-arithmetic.dmn
+++ b/TestCases/compliance-level-3/0100-arithmetic/0100-arithmetic.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/0100-arithmetic"
      name="0100-arithmetic"
      id="_i9fboPUUEeesLuP4RHs4vA"
-     xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+     xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
      xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-     xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+     xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
      xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>arithmetic</description>
diff --git a/TestCases/compliance-level-3/0100-arithmetic/generateTests.js b/TestCases/compliance-level-3/0100-arithmetic/generateTests.js
index f267f6c22..83077627c 100644
--- a/TestCases/compliance-level-3/0100-arithmetic/generateTests.js
+++ b/TestCases/compliance-level-3/0100-arithmetic/generateTests.js
@@ -566,9 +566,9 @@ function generateModel(decisions) {
 <definitions namespace="http://www.montera.com.au/spec/DMN/0100-arithmetic"
      name="0100-arithmetic"
      id="_i9fboPUUEeesLuP4RHs4vA"
-     xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+     xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
      xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-     xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+     xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
      xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>arithmetic</description>
diff --git a/TestCases/compliance-level-3/0103-feel-is-function/0103-feel-is-function.dmn b/TestCases/compliance-level-3/0103-feel-is-function/0103-feel-is-function.dmn
index 51afd0120..8df7929e1 100644
--- a/TestCases/compliance-level-3/0103-feel-is-function/0103-feel-is-function.dmn
+++ b/TestCases/compliance-level-3/0103-feel-is-function/0103-feel-is-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/0103-feel-is-function"
              name="0103-feel-is-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>is function</description>
diff --git a/TestCases/compliance-level-3/1100-feel-decimal-function/1100-feel-decimal-function.dmn b/TestCases/compliance-level-3/1100-feel-decimal-function/1100-feel-decimal-function.dmn
index 3f609d2b0..5942993d8 100644
--- a/TestCases/compliance-level-3/1100-feel-decimal-function/1100-feel-decimal-function.dmn
+++ b/TestCases/compliance-level-3/1100-feel-decimal-function/1100-feel-decimal-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/1100-feel-decimal-function" name="1100-feel-decimal-function" id="_i6ACwPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/1100-feel-decimal-function" name="1100-feel-decimal-function" id="_i6ACwPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>FEEL built-in function 'decimal(n, scale)' in category numeric functions</description>
     <itemDefinition name="tfeel-decimal-function_001_af177e63fc_Result" id="_i7fQgfUUEeesLuP4RHs4vA">
         <typeRef>number</typeRef>
diff --git a/TestCases/compliance-level-3/1101-feel-floor-function/1101-feel-floor-function.dmn b/TestCases/compliance-level-3/1101-feel-floor-function/1101-feel-floor-function.dmn
index d5bdc60b3..375a22edc 100644
--- a/TestCases/compliance-level-3/1101-feel-floor-function/1101-feel-floor-function.dmn
+++ b/TestCases/compliance-level-3/1101-feel-floor-function/1101-feel-floor-function.dmn
@@ -2,7 +2,7 @@
 <definitions namespace="http://www.actico.com/spec/DMN/1101-feel-floor-function"
              name="1101-feel-floor-function"
              id="_i-UiEPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/">
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/">
     <description>FEEL built-in function 'floor(n, scale)' in category numeric functions</description>
 
     <decision name="decision001" id="_decision001">
diff --git a/TestCases/compliance-level-3/1102-feel-ceiling-function/1102-feel-ceiling-function.dmn b/TestCases/compliance-level-3/1102-feel-ceiling-function/1102-feel-ceiling-function.dmn
index 8b5b58860..c4c97ae2a 100644
--- a/TestCases/compliance-level-3/1102-feel-ceiling-function/1102-feel-ceiling-function.dmn
+++ b/TestCases/compliance-level-3/1102-feel-ceiling-function/1102-feel-ceiling-function.dmn
@@ -2,7 +2,7 @@
 <definitions namespace="http://www.actico.com/spec/DMN/1102-feel-ceiling-function"
              name="1102-feel-ceiling-function"
              id="_i-UiEPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/">
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/">
     <description>FEEL built-in function 'ceiling(n, scale)' in category numeric functions</description>
 
     <decision name="decision001" id="_decision001">
diff --git a/TestCases/compliance-level-3/1103-feel-substring-function/1103-feel-substring-function.dmn b/TestCases/compliance-level-3/1103-feel-substring-function/1103-feel-substring-function.dmn
index 4038b496e..c0884e81e 100644
--- a/TestCases/compliance-level-3/1103-feel-substring-function/1103-feel-substring-function.dmn
+++ b/TestCases/compliance-level-3/1103-feel-substring-function/1103-feel-substring-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/1103-feel-substring-function" name="1103-feel-substring-function" id="_i-xOAPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/1103-feel-substring-function" name="1103-feel-substring-function" id="_i-xOAPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>FEEL built-in function 'substring(string, start, position, length?) in category string functions</description>
     <itemDefinition name="tfeel-substring-function_001_53051b5628_Result" id="_i-6X8PUUEeesLuP4RHs4vA">
         <typeRef>string</typeRef>
diff --git a/TestCases/compliance-level-3/1104-feel-string-length-function/1104-feel-string-length-function.dmn b/TestCases/compliance-level-3/1104-feel-string-length-function/1104-feel-string-length-function.dmn
index 32d19b63b..443d083de 100644
--- a/TestCases/compliance-level-3/1104-feel-string-length-function/1104-feel-string-length-function.dmn
+++ b/TestCases/compliance-level-3/1104-feel-string-length-function/1104-feel-string-length-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/1104-feel-string-length-function" name="1104-feel-string-length-function" id="_i_XD4PUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/1104-feel-string-length-function" name="1104-feel-string-length-function" id="_i_XD4PUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>FEEL built-in function 'string length(string)' in category string functions</description>
     <itemDefinition name="tfeel-string-length-function_001_1afe6930d1_Result" id="_i_XD4vUUEeesLuP4RHs4vA">
         <typeRef>number</typeRef>
diff --git a/TestCases/compliance-level-3/1105-feel-upper-case-function/1105-feel-upper-case-function.dmn b/TestCases/compliance-level-3/1105-feel-upper-case-function/1105-feel-upper-case-function.dmn
index dcd7b521d..9c76170a1 100644
--- a/TestCases/compliance-level-3/1105-feel-upper-case-function/1105-feel-upper-case-function.dmn
+++ b/TestCases/compliance-level-3/1105-feel-upper-case-function/1105-feel-upper-case-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/1105-feel-upper-case-function" name="1105-feel-upper-case-function" id="_i_zv0PUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/1105-feel-upper-case-function" name="1105-feel-upper-case-function" id="_i_zv0PUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>FEEL built-in function 'upper case(string) in category string functions</description>
     <itemDefinition name="tfeel-upper-case-function_001_2395aaad55_Result" id="_i_zv0vUUEeesLuP4RHs4vA">
         <typeRef>string</typeRef>
diff --git a/TestCases/compliance-level-3/1106-feel-lower-case-function/1106-feel-lower-case-function.dmn b/TestCases/compliance-level-3/1106-feel-lower-case-function/1106-feel-lower-case-function.dmn
index 8677eb109..1dc9547a1 100644
--- a/TestCases/compliance-level-3/1106-feel-lower-case-function/1106-feel-lower-case-function.dmn
+++ b/TestCases/compliance-level-3/1106-feel-lower-case-function/1106-feel-lower-case-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/1106-feel-lower-case-function" name="1106-feel-lower-case-function" id="_jAaMwPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/1106-feel-lower-case-function" name="1106-feel-lower-case-function" id="_jAaMwPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>FEEL built-in function 'lower case(string)' in category string functions</description>
     <itemDefinition name="tfeel-lower-case-function_001_f6ff05bcfa_Result" id="_jAaMwvUUEeesLuP4RHs4vA">
         <typeRef>string</typeRef>
diff --git a/TestCases/compliance-level-3/1107-feel-substring-before-function/1107-feel-substring-before-function.dmn b/TestCases/compliance-level-3/1107-feel-substring-before-function/1107-feel-substring-before-function.dmn
index 35c876d80..beecbfdf4 100644
--- a/TestCases/compliance-level-3/1107-feel-substring-before-function/1107-feel-substring-before-function.dmn
+++ b/TestCases/compliance-level-3/1107-feel-substring-before-function/1107-feel-substring-before-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/1107-feel-substring-before-function" name="1107-feel-substring-before-function" id="_jBACoPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/1107-feel-substring-before-function" name="1107-feel-substring-before-function" id="_jBACoPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>FEEL built-in function 'substring before(string, match) in category string functions</description>
     <itemDefinition name="tfeel-substring-before-function_001_2e948ccdc7_Result" id="_jBACovUUEeesLuP4RHs4vA">
         <typeRef>string</typeRef>
diff --git a/TestCases/compliance-level-3/1108-feel-substring-after-function/1108-feel-substring-after-function.dmn b/TestCases/compliance-level-3/1108-feel-substring-after-function/1108-feel-substring-after-function.dmn
index 50cc8b735..1196d4c27 100644
--- a/TestCases/compliance-level-3/1108-feel-substring-after-function/1108-feel-substring-after-function.dmn
+++ b/TestCases/compliance-level-3/1108-feel-substring-after-function/1108-feel-substring-after-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/1108-feel-substring-after-function" name="1108-feel-substring-after-function" id="_jBcukPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/1108-feel-substring-after-function" name="1108-feel-substring-after-function" id="_jBcukPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>FEEL built-in function 'substring after(string, match) in category string functions</description>
     <itemDefinition name="tfeel-substring-after-function_001_f532be66f2_Result" id="_jBcukvUUEeesLuP4RHs4vA">
         <typeRef>string</typeRef>
diff --git a/TestCases/compliance-level-3/1109-feel-replace-function/1109-feel-replace-function.dmn b/TestCases/compliance-level-3/1109-feel-replace-function/1109-feel-replace-function.dmn
index eb4c31713..282b9004d 100644
--- a/TestCases/compliance-level-3/1109-feel-replace-function/1109-feel-replace-function.dmn
+++ b/TestCases/compliance-level-3/1109-feel-replace-function/1109-feel-replace-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/1109-feel-replace-function" name="1109-feel-replace-function" id="_jCDLgPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/1109-feel-replace-function" name="1109-feel-replace-function" id="_jCDLgPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>FEEL built-in function 'replace(input, pattern, replacement, flags?)' in category string functions</description>
     <itemDefinition name="tfeel-replace-function_001_7637e5a8ed_Result" id="_jCDLgvUUEeesLuP4RHs4vA">
         <typeRef>string</typeRef>
diff --git a/TestCases/compliance-level-3/1110-feel-contains-function/1110-feel-contains-function.dmn b/TestCases/compliance-level-3/1110-feel-contains-function/1110-feel-contains-function.dmn
index babdf3c13..3c335bbb7 100644
--- a/TestCases/compliance-level-3/1110-feel-contains-function/1110-feel-contains-function.dmn
+++ b/TestCases/compliance-level-3/1110-feel-contains-function/1110-feel-contains-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/1110-feel-contains-function" name="1110-feel-contains-function" id="_jCpBYPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/1110-feel-contains-function" name="1110-feel-contains-function" id="_jCpBYPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>FEEL built-in function 'contains(string, match)' in category string functions</description>
     <itemDefinition name="tfeel-contains-function_001_2a4d7448c6_Result" id="_jCpBYvUUEeesLuP4RHs4vA">
         <typeRef>boolean</typeRef>
diff --git a/TestCases/compliance-level-3/1111-feel-matches-function/1111-feel-matches-function.dmn b/TestCases/compliance-level-3/1111-feel-matches-function/1111-feel-matches-function.dmn
index 21e55264c..741502ab5 100644
--- a/TestCases/compliance-level-3/1111-feel-matches-function/1111-feel-matches-function.dmn
+++ b/TestCases/compliance-level-3/1111-feel-matches-function/1111-feel-matches-function.dmn
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!-- Extracted from https://dev.w3.org/2011/QT3-test-suite/ -->
 <definitions namespace="http://www.gs.com/spec/DMN/1111-feel-matches-function" name="1111-feel-matches-function"
-             id="_1111_feel_matches_function" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             id="_1111_feel_matches_function" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'matches(input, pattern, flags?)' in category string functions</description>
 
diff --git a/TestCases/compliance-level-3/1115-feel-date-function/1115-feel-date-function.dmn b/TestCases/compliance-level-3/1115-feel-date-function/1115-feel-date-function.dmn
index 78b498b6b..a74bf3554 100644
--- a/TestCases/compliance-level-3/1115-feel-date-function/1115-feel-date-function.dmn
+++ b/TestCases/compliance-level-3/1115-feel-date-function/1115-feel-date-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/1115-feel-date-function" name="1115-feel-date-function" id="_jDiZQPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/1115-feel-date-function" name="1115-feel-date-function" id="_jDiZQPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>FEEL built-in function 'date(from [string])', 'date(from [date and time])' and 'date(year,month,day)' in category conversion functions</description>
     <itemDefinition name="tfeel-date-function_001_e9ae035ab9_Result" id="_jDiZQvUUEeesLuP4RHs4vA">
         <typeRef>date</typeRef>
diff --git a/TestCases/compliance-level-3/1116-feel-time-function/1116-feel-time-function.dmn b/TestCases/compliance-level-3/1116-feel-time-function/1116-feel-time-function.dmn
index 847296a06..3eb7cac8b 100644
--- a/TestCases/compliance-level-3/1116-feel-time-function/1116-feel-time-function.dmn
+++ b/TestCases/compliance-level-3/1116-feel-time-function/1116-feel-time-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/1116-feel-time-function" name="1116-feel-time-function" id="_jEk7EPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/1116-feel-time-function" name="1116-feel-time-function" id="_jEk7EPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>FEEL built-in function 'time(from [string])', 'time(from [time, date and time])' and 'time(hour,minute,second,offset)' in category conversion functions</description>
     <itemDefinition name="tfeel-time-function_001_bdf26fdc72_Result" id="_jEusEfUUEeesLuP4RHs4vA">
         <typeRef>time</typeRef>
diff --git a/TestCases/compliance-level-3/1117-feel-date-and-time-function/1117-feel-date-and-time-function.dmn b/TestCases/compliance-level-3/1117-feel-date-and-time-function/1117-feel-date-and-time-function.dmn
index 04985c76c..65cd4a368 100644
--- a/TestCases/compliance-level-3/1117-feel-date-and-time-function/1117-feel-date-and-time-function.dmn
+++ b/TestCases/compliance-level-3/1117-feel-date-and-time-function/1117-feel-date-and-time-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/1117-feel-date-and-time-function" name="1117-feel-date-and-time-function" id="_jFxN4PUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/1117-feel-date-and-time-function" name="1117-feel-date-and-time-function" id="_jFxN4PUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>FEEL built-in function 'date and time(from [string])' and 'date and time(date, time)' in category conversion functions</description>
     <itemDefinition name="tfeel-date-and-time-function_001_05fd7d6215_Result" id="_jFxN4vUUEeesLuP4RHs4vA">
         <typeRef>dateTime</typeRef>
diff --git a/TestCases/compliance-level-3/1120-feel-duration-function/1120-feel-duration-function.dmn b/TestCases/compliance-level-3/1120-feel-duration-function/1120-feel-duration-function.dmn
index de3cb466e..a1411dba3 100644
--- a/TestCases/compliance-level-3/1120-feel-duration-function/1120-feel-duration-function.dmn
+++ b/TestCases/compliance-level-3/1120-feel-duration-function/1120-feel-duration-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/1120-feel-duration-function" name="1120-feel-duration-function" id="_jG2L8PUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/1120-feel-duration-function" name="1120-feel-duration-function" id="_jG2L8PUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>FEEL built-in function 'duration(from [String])' in category conversion functions</description>
     <itemDefinition name="tfeel-duration-function_001_f2c6cd6866_Result" id="_jG2L8vUUEeesLuP4RHs4vA"/>
     <itemDefinition name="tfeel-duration-function_002_ddca5756ca_Result" id="_jG2L9vUUEeesLuP4RHs4vA"/>
diff --git a/TestCases/compliance-level-3/1121-feel-years-and-months-duration-function/1121-feel-years-and-months-duration-function.dmn b/TestCases/compliance-level-3/1121-feel-years-and-months-duration-function/1121-feel-years-and-months-duration-function.dmn
index bcf2e5849..bc243f393 100644
--- a/TestCases/compliance-level-3/1121-feel-years-and-months-duration-function/1121-feel-years-and-months-duration-function.dmn
+++ b/TestCases/compliance-level-3/1121-feel-years-and-months-duration-function/1121-feel-years-and-months-duration-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.actico.com/spec/DMN/1121-feel-years-and-months-duration-function" name="1121-feel-years-and-months-duration-function" id="_jHaMoPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/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">
+<definitions namespace="http://www.actico.com/spec/DMN/1121-feel-years-and-months-duration-function" name="1121-feel-years-and-months-duration-function" id="_jHaMoPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" 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">
     <description>FEEL built-in function 'years and months duration(from [date and time], to [date and time])' in category conversion functions</description>
     <itemDefinition name="tfeel-years-and-months-duration-function_001_b24a0c91f2_Result" id="_jHaMovUUEeesLuP4RHs4vA">
         <typeRef>yearMonthDuration</typeRef>
diff --git a/TestCases/compliance-level-3/1130-feel-interval/1130-feel-interval.dmn b/TestCases/compliance-level-3/1130-feel-interval/1130-feel-interval.dmn
index 973c2a41a..bc2cea2f7 100644
--- a/TestCases/compliance-level-3/1130-feel-interval/1130-feel-interval.dmn
+++ b/TestCases/compliance-level-3/1130-feel-interval/1130-feel-interval.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<semantic:definitions xmlns:semantic="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:triso="http://www.trisotech.com/2015/triso/modeling" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:trisodmn="http://www.trisotech.com/2016/triso/dmn" xmlns:feel="https://www.omg.org/spec/DMN/20211108/FEEL/" xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase" xmlns:drools="http://www.drools.org/kie/dmn/1.1" xmlns:openapi="https://openapis.org/omg/extension/1.0" xmlns:dmn11="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:rss="http://purl.org/rss/2.0/" xmlns:trisofeed="http://trisotech.com/feed" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"               xmlns:xsd="http://www.w3.org/2001/XMLSchema"  xmlns="http://www.trisotech.com/definitions/_4dacb45e-9b17-48e0-9518-8cd1b47d445b" id="_4dacb45e-9b17-48e0-9518-8cd1b47d445b" name="DMN13 Intervals" namespace="http://www.trisotech.com/definitions/_4dacb45e-9b17-48e0-9518-8cd1b47d445b" exporter="Decision Modeler" exporterVersion="6.11.3" triso:logoChoice="Default">
+<semantic:definitions xmlns:semantic="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:triso="http://www.trisotech.com/2015/triso/modeling" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:trisodmn="http://www.trisotech.com/2016/triso/dmn" xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/" xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase" xmlns:drools="http://www.drools.org/kie/dmn/1.1" xmlns:openapi="https://openapis.org/omg/extension/1.0" xmlns:dmn11="https://www.omg.org/spec/DMN/20230324/DMN15.xsd" xmlns:rss="http://purl.org/rss/2.0/" xmlns:trisofeed="http://trisotech.com/feed" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"               xmlns:xsd="http://www.w3.org/2001/XMLSchema"  xmlns="http://www.trisotech.com/definitions/_4dacb45e-9b17-48e0-9518-8cd1b47d445b" id="_4dacb45e-9b17-48e0-9518-8cd1b47d445b" name="DMN13 Intervals" namespace="http://www.trisotech.com/definitions/_4dacb45e-9b17-48e0-9518-8cd1b47d445b" exporter="Decision Modeler" exporterVersion="6.11.3" triso:logoChoice="Default">
     <semantic:extensionElements>
         <tc:testCases>
             <tc:testCase id="_9e95d4d1-8335-4a43-8570-32d73fcb8cc6" name="Test case 1">
@@ -497,73 +497,73 @@
         <semantic:context id="_95da4bcf-c864-411a-936f-f381558f3d67" typeRef="Any" triso:expressionId="_4798dc49-9763-4198-b48c-621a6db4e96f">
             <semantic:contextEntry id="_3f6d548b-20b3-45f9-baf5-5fbaa9c0734f">
                 <semantic:variable name="beforePPT" id="_924731d7-0fb6-49fb-863f-640a11e56299" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_f6ab5eac-9729-4225-9c3e-0c3aacbe8011">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_f6ab5eac-9729-4225-9c3e-0c3aacbe8011">
                     <semantic:text>before( 1, 10 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_e9ca84cd-1417-467a-91b5-3c57dfc99d5c">
                 <semantic:variable name="beforPPF" id="_638633b2-82ed-4c34-97a2-7ebab772713f" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_8cc1bd80-f181-4a91-a57c-8afd1f5438c3">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_8cc1bd80-f181-4a91-a57c-8afd1f5438c3">
                     <semantic:text>before( 10, 1 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_70dc97be-1276-4e89-a39d-a95219b0ba18">
                 <semantic:variable name="beforePRF" id="_1526859d-0f25-41a5-b2d3-b15cebecc849" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_602d23da-9ad3-4615-bd25-f025d7207080">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_602d23da-9ad3-4615-bd25-f025d7207080">
                     <semantic:text>before( 1, [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_19b5e2ed-d1ff-44cc-b548-e4b70bedd320">
                 <semantic:variable name="beforePRT" id="_e743e9f5-6369-40ed-bb1f-ab639225a7b4" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_7a80e2c2-05c1-4f11-a2b6-387668ccc95b">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_7a80e2c2-05c1-4f11-a2b6-387668ccc95b">
                     <semantic:text>before( 1, (1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_21cb9587-2d01-49fc-b44c-64d081962c7c">
                 <semantic:variable name="beforePRT2" id="_8090dbfe-74f6-4931-b017-1903cfd6095e" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_4c6f479a-2604-4941-b870-299c099b1421">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_4c6f479a-2604-4941-b870-299c099b1421">
                     <semantic:text>before( 1, [5..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_96430f47-b865-4622-a696-eecf05c3c143">
                 <semantic:variable name="beforeRPF" id="_cde6bfa7-9f77-4b81-9e24-23addb60cfca" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_29373a59-091d-43c0-b6de-eb28d30c6efa">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_29373a59-091d-43c0-b6de-eb28d30c6efa">
                     <semantic:text>before( [1..10], 10 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_47df8d7b-f1d9-4d3a-9ffa-fbd9f13e0b60">
                 <semantic:variable name="beforeRPT" id="_df7c9509-6e2d-40db-a200-2a5ae3c1cfe7" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_51572988-2abd-4bd4-bc82-d8573866b3de">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_51572988-2abd-4bd4-bc82-d8573866b3de">
                     <semantic:text>before( [1..10), 10 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_6ffbe9cc-acd0-42dd-8cd6-3d8258348e31">
                 <semantic:variable name="beforeRPT2" id="_a51b5d2c-ce2f-4e6c-bdb3-c359892e1392" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_4405d25d-065c-4a81-b7a3-387f6187afce">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_4405d25d-065c-4a81-b7a3-387f6187afce">
                     <semantic:text>before( [1..10], 15 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_19ef9005-f6e2-4817-8621-bc40a1c9a4b4">
                 <semantic:variable name="beforeRRT" id="_e51d94c7-c5e4-4e03-a23d-28739cd2fb2a" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_932f6604-b718-4d82-8902-8eecc5bb0831">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_932f6604-b718-4d82-8902-8eecc5bb0831">
                     <semantic:text>before( [1..10], [15..20] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_e61b6eb4-6092-44e8-a4fb-65f9895482cb">
                 <semantic:variable name="beforeRRF" id="_612855a7-e5de-49d1-a68a-7914c4dd1f15" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_fbb34aac-6549-4794-a0a3-71b8a4e2420b">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_fbb34aac-6549-4794-a0a3-71b8a4e2420b">
                     <semantic:text>before( [1..10], [10..20] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_a07b3081-4df6-4b40-bc72-15c8dc96dbc5">
                 <semantic:variable name="beforeRRT2" id="_ce5ad6b5-66ef-4d33-9f33-d4e62a484c16" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_bcfef5f1-92d8-408c-aa15-2b150077a9e8">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_bcfef5f1-92d8-408c-aa15-2b150077a9e8">
                     <semantic:text>before( [1..10), [10..20] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_d7c8c73e-3f91-429c-8391-44b16252ffc9">
                 <semantic:variable name="beforeRRT3" id="_6d3aa6bc-2b59-4751-aae6-78bf95ea712a" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_93f8e957-7c2e-4580-ba12-4893a085c26e">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_93f8e957-7c2e-4580-ba12-4893a085c26e">
                     <semantic:text>before( [1..10], (10..20] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
@@ -577,79 +577,79 @@
         <semantic:context id="_f8b770a9-b767-461b-8a48-5cfe3b0cc212" typeRef="Any" triso:expressionId="_11ad0bc2-774a-4571-b0c7-326096447e56">
             <semantic:contextEntry id="_ef8083bb-1997-44ca-bc8d-f3ad31e4f031">
                 <semantic:variable name="afterPPT" id="_8df93529-fece-44b9-a529-d7660d94f17b" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_52530da1-b13f-4faf-9d40-056e2133496b">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_52530da1-b13f-4faf-9d40-056e2133496b">
                     <semantic:text>after( 10, 5 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_60819b04-f462-47c2-b0dd-c1ce97eb24f9">
                 <semantic:variable name="afterPPF" id="_5e356c33-53b7-46c9-aab8-76fd5056a8a6" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_9f813c36-0930-4cb7-a457-5119125a41b4">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_9f813c36-0930-4cb7-a457-5119125a41b4">
                     <semantic:text>after( 5, 10 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_28f7454a-02f1-443c-817a-58ec8310bca4">
                 <semantic:variable name="afterPRT" id="_75d42c01-9744-4d4c-a447-2e4ec38b0256" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_e6f3d6ca-a6fe-4202-8b7a-dd195972f835">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_e6f3d6ca-a6fe-4202-8b7a-dd195972f835">
                     <semantic:text>after( 12, [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_64d296c1-46c3-4a16-9623-602ce616be73">
                 <semantic:variable name="afterPRT2" id="_7af555fd-bdf9-4bc9-90ca-09308f8300b9" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_7fa2bf91-dba4-41bd-95d5-dac2d3f6133d">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_7fa2bf91-dba4-41bd-95d5-dac2d3f6133d">
                     <semantic:text>after( 10, [1..10) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_3ac5d916-d3a5-4880-aa2c-7e05a067c3d6">
                 <semantic:variable name="afterPRF" id="_0e468c26-f18b-4d83-97e5-74993fd61e97" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_220c4dc3-2701-4971-ac8b-e4dc4995dae0">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_220c4dc3-2701-4971-ac8b-e4dc4995dae0">
                     <semantic:text>after( 10, [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_8eb59a35-73ab-4777-9fa6-d6cc5f14d208">
                 <semantic:variable name="afterRPF" id="_1c933d4e-177b-4ebb-b37e-90bf0272d1ed" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_8a2de2fa-d43c-4ad2-b32a-868cb1423349">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_8a2de2fa-d43c-4ad2-b32a-868cb1423349">
                     <semantic:text>after( [11..20], 12 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_0c6dc0bf-463a-4cad-9543-fb620e379787">
                 <semantic:variable name="afterRPT" id="_f4169d18-cea6-4e12-a3cd-9ede825cac7d" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_9851b10d-7012-4474-a5d3-fc855af59b28">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_9851b10d-7012-4474-a5d3-fc855af59b28">
                     <semantic:text>after( [11..20], 10 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_34bd55af-3b47-4b5c-b483-c149670cd7b5">
                 <semantic:variable name="afterRPT2" id="_66d19a4a-0f16-40e2-bea9-31ea8ddc1edb" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_2d079df4-8def-461d-8d6f-182695328bee">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_2d079df4-8def-461d-8d6f-182695328bee">
                     <semantic:text>after( (11..20], 11 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_986add95-1901-49ad-9988-3970b3453364">
                 <semantic:variable name="afterRPF2" id="_89b95813-d4ed-41e9-a018-d6b955096934" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_d8dc2107-894d-4d33-a7ec-3f473867bc50">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_d8dc2107-894d-4d33-a7ec-3f473867bc50">
                     <semantic:text>after( [11..20], 11 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_9621c225-97f1-4c31-961b-71335fd144da">
                 <semantic:variable name="afterRRT" id="_021b5842-6358-407c-a954-412f12ba6e34" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_4436b75e-cdaf-414c-9e9c-787e9f641680">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_4436b75e-cdaf-414c-9e9c-787e9f641680">
                     <semantic:text>after( [11..20], [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_28dd9115-cf19-42e7-98b9-08b7ea081d76">
                 <semantic:variable name="afterRRF" id="_81fc0cff-16dd-4acd-9569-c0a9824b78d9" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_64941b82-bdf2-4024-bb1e-4a1651e3558e">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_64941b82-bdf2-4024-bb1e-4a1651e3558e">
                     <semantic:text>after( [1..10], [11..20] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_9fb11c26-ff80-4ab0-a5f4-b2854127dd52">
                 <semantic:variable name="afterRRT2" id="_90bd8a7e-3d22-4915-b5bc-1b0dde469145" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_8afa66da-92a2-454d-98f3-a3aaff33067c">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_8afa66da-92a2-454d-98f3-a3aaff33067c">
                     <semantic:text>after( [11..20], [1..11) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_ff1b82c8-f2be-4b86-89a5-d03180464ed9">
                 <semantic:variable name="afterRRT3" id="_f9f38395-999a-4211-9196-4ee11c895f08" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_1eed34f3-d6bf-4e22-b003-ad86e7708164">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_1eed34f3-d6bf-4e22-b003-ad86e7708164">
                     <semantic:text>after( (11..20], [1..11] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
@@ -660,25 +660,25 @@
         <semantic:context id="_75fde4d4-67d9-492b-a6f9-ef170b4885f8" typeRef="Any" triso:expressionId="_18b3985b-f236-429b-88b3-0f5975f44db4">
             <semantic:contextEntry id="_1131bbdb-5a6f-4e77-a368-c9df1299d332">
                 <semantic:variable name="meetsRRT" id="_9a48b05b-8568-4ba8-bc36-3037d637c0e8" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_2d69508a-2f51-46c7-9c60-206e1eb9f36f">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_2d69508a-2f51-46c7-9c60-206e1eb9f36f">
                     <semantic:text>meets( [1..5], [5..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_c816d07f-d60c-4e1c-a70f-20c50a59d80a">
                 <semantic:variable name="meetsRRF" id="_ba982a10-fe11-43f8-b635-f415d82a2c94" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_2d3f0fb0-2089-4dfe-a778-6734767b1ce1">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_2d3f0fb0-2089-4dfe-a778-6734767b1ce1">
                     <semantic:text>meets( [1..5), [5..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_09e45098-96b5-4c31-b22b-d2757023af53">
                 <semantic:variable name="meetsRRF2" id="_85377453-d08b-476f-8643-340ee2599eed" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_726a8819-057c-4c3c-a97e-ef16c4c60147">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_726a8819-057c-4c3c-a97e-ef16c4c60147">
                     <semantic:text>meets( [1..5], (5..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_a881737b-8638-47a7-8935-6073c6e23668">
                 <semantic:variable name="meetsRRF3" id="_bf96aeb8-e4a8-436f-b8e5-20cf759836f7" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_d0a25090-eaa5-4b21-839d-e30a993a2f3d">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_d0a25090-eaa5-4b21-839d-e30a993a2f3d">
                     <semantic:text>meets( [1..5], [6..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
@@ -689,25 +689,25 @@
         <semantic:context id="_c260ef1c-0a2c-4b8a-b18c-d741ee3555b0" typeRef="Any" triso:expressionId="_bfadf9f9-97cc-49f0-861f-1a5ea77b5627">
             <semantic:contextEntry id="_f71d0650-12e7-46c8-bcdd-0440775b92db">
                 <semantic:variable name="metbyRRT" id="_8355a2bb-9496-4627-8a9d-e97447b99446" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_52310cdd-9bcd-4be9-88bd-ec14c60aeedb">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_52310cdd-9bcd-4be9-88bd-ec14c60aeedb">
                     <semantic:text>met by( [5..10], [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_d081c5a9-324e-4fa4-899c-25e6a9a1cb3e">
                 <semantic:variable name="metbyRRF" id="_45968f0f-5450-4e69-91dd-7d6b947b1cfd" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_05a6b4f6-fd30-432d-a321-9032ce64ace8">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_05a6b4f6-fd30-432d-a321-9032ce64ace8">
                     <semantic:text>met by( [5..10],  [1..5) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_071ed844-3243-448e-ae47-e71c58106519">
                 <semantic:variable name="metbyRRF2" id="_ac08dc87-75f9-48a4-81dc-3537d765d01f" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_f18f3c76-727f-484b-bdf8-cf0530d4bf28">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_f18f3c76-727f-484b-bdf8-cf0530d4bf28">
                     <semantic:text>met by( (5..10], [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_3ce594dd-b387-4e23-a715-b14d209a486f">
                 <semantic:variable name="metbyRRF3" id="_01be1cde-b1df-4806-a8f2-3c99f5b24c1f" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_f30784f0-8883-4f66-9355-af0a2bfb6033">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_f30784f0-8883-4f66-9355-af0a2bfb6033">
                     <semantic:text>met by( [6..10], [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
@@ -718,55 +718,55 @@
         <semantic:context id="_cec1fe19-05d5-44ee-9438-05b9405911e0" typeRef="Any" triso:expressionId="_4a11ee62-0a42-477a-a13e-ce4df384085d">
             <semantic:contextEntry id="_dc5ec338-25fd-4e28-988b-afc9a5a04823">
                 <semantic:variable name="overlapsbeforeRRT" id="_186997ed-dd2e-44b8-9595-06ad075bb310" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_e007ca59-fdf3-42d5-8b59-485220161e05">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_e007ca59-fdf3-42d5-8b59-485220161e05">
                     <semantic:text>overlaps before( [1..5], [3..8] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_038b0b5e-0587-4952-b172-a7010ae12f0a">
                 <semantic:variable name="overlapsbeforeRRF" id="_03d7918e-7257-4039-8915-15e53cd0f8ba" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_fccf9d30-fb49-427a-a59d-683f3188c41c">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_fccf9d30-fb49-427a-a59d-683f3188c41c">
                     <semantic:text>overlaps before( [1..5], [6..8] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_dca83d92-0575-46c2-97a7-ebb46e8b7794">
                 <semantic:variable name="overlapsbeforeRRT2" id="_95900e9b-494d-438d-aaca-f346cfb3f2f3" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_6f6ab71e-963b-4cc1-a2cc-08d7615ebd16">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_6f6ab71e-963b-4cc1-a2cc-08d7615ebd16">
                     <semantic:text>overlaps before( [1..5], [5..8] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_4288debf-8336-4e65-b7eb-458dcb616424">
                 <semantic:variable name="overlapsbeforeRRF2" id="_f8403d9e-3d3c-410f-ac21-dea55b1a9f02" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_2dbc37c6-11e2-4a18-898c-596c228928ae">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_2dbc37c6-11e2-4a18-898c-596c228928ae">
                     <semantic:text>overlaps before( [1..5], (5..8] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_c9df6920-92b7-460e-ab4b-5dcc8a2a1dc4">
                 <semantic:variable name="overlapsbeforeRRF3" id="_7a02585d-2feb-4224-9e76-17953ee1e824" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_b2ec4cb1-f078-4584-8d29-4f3ac5c04d1d">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_b2ec4cb1-f078-4584-8d29-4f3ac5c04d1d">
                     <semantic:text>overlaps before( [1..5), [5..8] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_4680e5b3-bf87-4830-b33a-92f51b233ead">
                 <semantic:variable name="overlapsbeforeRRT3" id="_e4fae484-0da7-4c29-a5f8-be719857fb1f" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_42a9dc3c-3120-4bfa-b99b-8ea8090767cc">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_42a9dc3c-3120-4bfa-b99b-8ea8090767cc">
                     <semantic:text>overlaps before( [1..5), (1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_0df3cea7-39fe-4e5b-8392-d9dc3cb41a99">
                 <semantic:variable name="overlapsbeforeRRT4" id="_1460fb15-e79b-4714-94b7-cdfa40bcb2c2" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_ec929bec-60b3-47c8-8afb-45d9ec35dd21">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_ec929bec-60b3-47c8-8afb-45d9ec35dd21">
                     <semantic:text>overlaps before( [1..5], (1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_da92cc8c-db1f-4760-974a-a3353ceee2c0">
                 <semantic:variable name="overlapsbeforeRRF4" id="_98f8b307-0f94-4daa-88b4-4e07138547f4" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_bea16f52-7f2b-407b-931f-d0f88290c12b">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_bea16f52-7f2b-407b-931f-d0f88290c12b">
                     <semantic:text>overlaps before( [1..5), [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_e7c9377a-2ba9-4bb6-947f-f258c011fd45">
                 <semantic:variable name="overlapsbeforeRRF5" id="_28f5146c-5429-4f88-a6b2-2cde4c231130" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_a8ab84d3-a545-4cf1-890e-98edff0c7d99">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_a8ab84d3-a545-4cf1-890e-98edff0c7d99">
                     <semantic:text>overlaps before( [1..5], [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
@@ -777,55 +777,55 @@
         <semantic:context id="_682a4857-363c-4ac2-a7fc-9dffcc901107" typeRef="Any" triso:expressionId="_7c9080bb-8ac8-4424-a57c-13dc0c253e2e">
             <semantic:contextEntry id="_4b11567a-3735-44c6-bb2c-aa721f3e59c1">
                 <semantic:variable name="overlapsafterRRT" id="_c0bd5913-cfc8-4f11-92ac-6675952ca43c" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_abad5aa8-00e5-4e19-a39a-579bfe041b66">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_abad5aa8-00e5-4e19-a39a-579bfe041b66">
                     <semantic:text>overlaps after( [3..8], [1..5])</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_00211306-1da9-4644-9f61-efd0fa9bf4de">
                 <semantic:variable name="overlapsafterRRF" id="_96cd980a-b2bc-4f0e-918b-cb6995ca5918" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_740648ca-d669-481a-bae9-e8cd64e6fd0b">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_740648ca-d669-481a-bae9-e8cd64e6fd0b">
                     <semantic:text>overlaps after( [6..8], [1..5])</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_06fddf7e-e89d-4f32-89d7-b152acf0c01a">
                 <semantic:variable name="overlapsafterRRT2" id="_0bcf5560-2350-4284-a84b-e1b5433f06ea" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_bfc37474-1b80-42cc-9bee-0a46ca69c8e6">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_bfc37474-1b80-42cc-9bee-0a46ca69c8e6">
                     <semantic:text>overlaps after( [5..8], [1..5])</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_e044c1dd-533e-4d7c-a525-9095e487ae0b">
                 <semantic:variable name="overlapsafterRRF2" id="_928a7a7b-7a64-4b54-b08a-b9c1ba81de8f" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_145dfaa3-69fd-47c5-9e8c-39fffa38a701">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_145dfaa3-69fd-47c5-9e8c-39fffa38a701">
                     <semantic:text>overlaps after( (5..8], [1..5])</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_ce8cd1cd-0d3e-4805-bf5d-48b256e3cfcc">
                 <semantic:variable name="overlapsafterRRF3" id="_ab8b3961-88af-401c-bfed-dcce48f3e6f4" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_1fa4d930-a43b-4cad-9e21-88e0b3fb29d4">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_1fa4d930-a43b-4cad-9e21-88e0b3fb29d4">
                     <semantic:text>overlaps after( [5..8], [1..5))</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_986c31a6-3fd6-48b5-8ff4-fe790e54cb6e">
                 <semantic:variable name="overlapsafterRRT3" id="_8827438e-2a52-409f-98dd-81ea06bd1f52" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_d628e1b5-1178-44ba-ab76-53826cefd773">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_d628e1b5-1178-44ba-ab76-53826cefd773">
                     <semantic:text>overlaps after( (1..5], [1..5) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_d5876d93-637d-4f6b-9ace-800c1e024225">
                 <semantic:variable name="overlapsafterRRT4" id="_2dbc32f6-68b8-4a0a-9a6c-5ef8415747d3" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_ca4b0c41-011c-46f5-93b2-1604596b12de">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_ca4b0c41-011c-46f5-93b2-1604596b12de">
                     <semantic:text>overlaps after( (1..5], [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_ddbf7789-3f3f-413f-9912-88e9c829f969">
                 <semantic:variable name="overlapsafterRRF4" id="_c52a25fc-4f34-418b-9683-e3bbd6b7f587" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_7ffd12f7-db03-4e8a-925c-1e653e1a9775">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_7ffd12f7-db03-4e8a-925c-1e653e1a9775">
                     <semantic:text>overlaps after( [1..5], [1..5) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_2ac5e276-bed6-4140-b32c-0fddc3bc0acc">
                 <semantic:variable name="overlapsafterRRF5" id="_c9a78706-3dea-4fab-b536-3be181efd224" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_8ed68a09-96ac-4264-8b1f-b38f434e6f29">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_8ed68a09-96ac-4264-8b1f-b38f434e6f29">
                     <semantic:text>overlaps after( [1..5], [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
@@ -836,43 +836,43 @@
         <semantic:context id="_d98e0f6c-88ac-4388-ab33-cd8a17a70dcf" typeRef="Any" triso:expressionId="_a9f9ce35-d5a5-42f8-ad08-74bb1a82337a">
             <semantic:contextEntry id="_e197b9b1-353e-427c-baa3-1e42116f1213">
                 <semantic:variable name="fnishesPRT" id="_2377cc99-ada8-4a46-bb29-8889a0d12553" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_590036c1-09f1-481f-8722-cc03ee91782c">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_590036c1-09f1-481f-8722-cc03ee91782c">
                     <semantic:text>finishes( 10, [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_3358158d-075a-4924-a5d2-292610a9aad4">
                 <semantic:variable name="finishesPRF" id="_6c726bf7-45fa-47de-9805-4c9c82ce50b4" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_229fd9e8-5f56-44fd-8a0e-85d5b531bb35">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_229fd9e8-5f56-44fd-8a0e-85d5b531bb35">
                     <semantic:text>finishes( 10, [1..10) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_f179cfea-3d76-4b19-9bea-15fa68b7a871">
                 <semantic:variable name="finishesRRT" id="_5cd2fec3-04de-4260-8c7f-8a6a67b7a825" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_84e8acbd-d0af-40ab-b83d-6f150b6ffe10">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_84e8acbd-d0af-40ab-b83d-6f150b6ffe10">
                     <semantic:text>finishes( [5..10], [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_2079960a-a377-47fe-8b74-4887163a801a">
                 <semantic:variable name="finishesRRF" id="_01ad742a-dfcd-47d6-ad9a-4000a790abe8" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_2b5976d1-6257-4c25-8f1f-94f9bb7e0055">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_2b5976d1-6257-4c25-8f1f-94f9bb7e0055">
                     <semantic:text>finishes( [5..10), [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_3a5ecce5-ef8f-40ff-8a60-e88a337f209f">
                 <semantic:variable name="finishesRRT2" id="_97dcac27-c9ea-4ef0-8d0c-0f2f46bc4e10" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_3b950b93-f9e0-48db-8872-f813411df35a">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_3b950b93-f9e0-48db-8872-f813411df35a">
                     <semantic:text>finishes( [5..10), [1..10) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_cd83d3c5-cd15-42d7-8052-f4acdd2371cd">
                 <semantic:variable name="finishesRRF2" id="_b56d2504-bd37-400b-b7e6-e97b2732124f" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_158918f8-42e5-4aa9-9c0d-b014abce714b">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_158918f8-42e5-4aa9-9c0d-b014abce714b">
                     <semantic:text>finishes( [1..10], [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_c1f0e08b-7998-4319-9c63-cdd2d3f9f804">
                 <semantic:variable name="finishesRRT3" id="_041e9810-4ae2-46d6-b6a1-ef25092a4bfc" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_f7bf1cdd-c4f3-4061-a649-3c65c09cbb92">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_f7bf1cdd-c4f3-4061-a649-3c65c09cbb92">
                     <semantic:text>finishes( (1..10], [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
@@ -883,43 +883,43 @@
         <semantic:context id="_a8163ecc-af52-4538-a638-7f1c78993eb6" typeRef="Any" triso:expressionId="_d3719e84-a322-440f-b565-145303dfc803">
             <semantic:contextEntry id="_8a64a5c5-9c28-4991-b3da-37fdd211c451">
                 <semantic:variable name="finishedbyRPT" id="_d0e654b0-4086-466e-8232-7ce86b014843" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_0facb316-7d53-45b2-bcc1-5a9199fd7997">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_0facb316-7d53-45b2-bcc1-5a9199fd7997">
                     <semantic:text>finished by( [1..10], 10 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_f9a3bcc6-29f8-4ea9-a594-1a243ac06db7">
                 <semantic:variable name="finishedbyRPF" id="_64da9deb-dad4-4e95-964b-bbb2ba597399" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_d93cf74d-fda8-4f0e-b27c-d9d50538beaa">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_d93cf74d-fda8-4f0e-b27c-d9d50538beaa">
                     <semantic:text>finished by( [1..10), 10 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_42e5395f-8715-43d6-8289-54b96daa7e1e">
                 <semantic:variable name="finishedbyRRT" id="_ce2c3150-b499-49dc-9429-b6d7f735171a" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_3ae54616-db19-4f28-ac4c-982d3dfaf804">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_3ae54616-db19-4f28-ac4c-982d3dfaf804">
                     <semantic:text>finished by( [1..10], [5..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_f33e509d-c4fc-4212-b363-fa02ae7953e0">
                 <semantic:variable name="finishedbyRRF" id="_9259fdec-a9ca-4ffa-845c-9cf225c018ba" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_03181b06-66f2-4ab6-94c2-30d171800513">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_03181b06-66f2-4ab6-94c2-30d171800513">
                     <semantic:text>finished by( [1..10], [5..10) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_eea3d742-3f69-4fcc-afd3-ef45be132cae">
                 <semantic:variable name="finishedbyRRT2" id="_deb288da-708c-4373-b8a0-9cbed8b582ac" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_8d38c542-a793-486f-aa24-99a065c45782">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_8d38c542-a793-486f-aa24-99a065c45782">
                     <semantic:text>finished by( [1..10), [5..10) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_dc62a569-6b34-4aec-9e29-4bf9ca5a7489">
                 <semantic:variable name="finishedbyRRT3" id="_929f6122-70a4-4d04-9516-e2be9cc1eed9" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_62c34f3e-2419-4138-b2bf-935971f5570c">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_62c34f3e-2419-4138-b2bf-935971f5570c">
                     <semantic:text>finished by( [1..10], (1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_a5d11652-86c1-4a55-8c79-e7f7f9a2f65d">
                 <semantic:variable name="finishedbyRRT4" id="_234934ce-02bc-4a7e-a03c-0f9f8867b1f3" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_d599aabb-f4f3-4aa7-ab13-d699c2de9561">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_d599aabb-f4f3-4aa7-ab13-d699c2de9561">
                     <semantic:text>finished by( [1..10], [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
@@ -930,85 +930,85 @@
         <semantic:context id="_bd9d7486-5674-4792-84d9-27e2e43c88e3" typeRef="Any" triso:expressionId="_a15d2ba9-4602-4a3d-8619-ecb41979a54c">
             <semantic:contextEntry id="_0101da7f-d6b8-4469-9e1f-7ede912ef47c">
                 <semantic:variable name="includesRPT" id="_0216bab1-4fa6-4318-950c-0d958af6c720" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_4e4e4c17-515d-4837-9c53-c8542d33bdad">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_4e4e4c17-515d-4837-9c53-c8542d33bdad">
                     <semantic:text>includes( [1..10], 5 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_7288f5b9-49ec-466a-8256-d135c690083c">
                 <semantic:variable name="includesRPF" id="_eed89f53-5bc4-45d3-a4bd-676b59cb4f76" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_ecb6fc9d-c2f3-4a71-b5e0-2c0e815d0c30">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_ecb6fc9d-c2f3-4a71-b5e0-2c0e815d0c30">
                     <semantic:text>includes( [1..10], 12 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_bb63f978-7f49-40f1-8f5a-0c0a48d3a63d">
                 <semantic:variable name="includesRPT2" id="_056c954e-bb5e-4f6e-8cdc-3913d2255430" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_565afbb6-7696-42a6-a5d9-719029a4fdcd">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_565afbb6-7696-42a6-a5d9-719029a4fdcd">
                     <semantic:text>includes( [1..10], 1 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_84b6926a-861b-4c18-a0f9-b55c91ef23db">
                 <semantic:variable name="includesRPT3" id="_e9d75d1b-f7e7-43cd-9735-32cd741adc11" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_db5ead7d-08b7-486f-af81-f37fc45f312d">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_db5ead7d-08b7-486f-af81-f37fc45f312d">
                     <semantic:text>includes( [1..10], 10 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_b702d72b-f3e6-4503-9282-666267061b69">
                 <semantic:variable name="includesRPF2" id="_f9b98395-a4c1-4c95-8886-6f05f488d1a6" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_73a4ba64-5643-473b-a5a0-43e1a250eed8">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_73a4ba64-5643-473b-a5a0-43e1a250eed8">
                     <semantic:text>includes( (1..10], 1 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_69a760ff-98c8-43f1-ada3-0ed572d5b332">
                 <semantic:variable name="includesRPF3" id="_a26c19cd-5cde-47ef-933c-3d8a33f9ce1b" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_6bce5915-7367-4409-bd64-3d95fbadbd53">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_6bce5915-7367-4409-bd64-3d95fbadbd53">
                     <semantic:text>includes( [1..10), 10 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_7ca4db55-3b41-4e2c-ae0a-5d1eeda52333">
                 <semantic:variable name="includesRRT" id="_48a7c3b6-ef96-4f7c-8bb3-f056b5906f8b" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_3e95dbf8-85a2-4a0e-92da-ba23e11bdd7a">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_3e95dbf8-85a2-4a0e-92da-ba23e11bdd7a">
                     <semantic:text>includes( [1..10], [4..6] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_4de2b83b-072a-4666-910a-6696f229b69e">
                 <semantic:variable name="includesRRT2" id="_a71df089-19be-49bb-8622-0861c8185062" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_83818312-8eb7-4212-9d71-f473c0c29f73">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_83818312-8eb7-4212-9d71-f473c0c29f73">
                     <semantic:text>includes( [1..10], [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_411e84d4-361f-46a7-8c29-887fb8400fd4">
                 <semantic:variable name="includesRRT3" id="_53432d33-fa25-4ec1-8d8e-51345fade790" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_a2149052-c7d8-4f9f-be09-210866bfb39b">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_a2149052-c7d8-4f9f-be09-210866bfb39b">
                     <semantic:text>includes( (1..10], (1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_ce0a1450-8dc9-4a03-88df-8eca2b6ca228">
                 <semantic:variable name="includesRRT4" id="_13dc76c5-960d-4b8c-968c-eee9c08d0e63" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_496afd96-dbf7-47fc-beec-c184fa8eacb7">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_496afd96-dbf7-47fc-beec-c184fa8eacb7">
                     <semantic:text>includes( [1..10], (1..10) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_990bd8d4-dbcc-4362-a872-3bccd37dc394">
                 <semantic:variable name="includesRRT5" id="_60bae566-b67a-4fb1-9644-bff956d5c5d2" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_3901ee4e-7be6-48e3-b7bc-0fdbd65209f4">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_3901ee4e-7be6-48e3-b7bc-0fdbd65209f4">
                     <semantic:text>includes( [1..10), [5..10) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_8aa4f228-a24e-452c-83ab-28ead4682334">
                 <semantic:variable name="includesRRT6" id="_59540079-2f09-4c7a-b75f-bc796102623b" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_5cf90064-2494-47d9-8539-9fb13fb1dc9b">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_5cf90064-2494-47d9-8539-9fb13fb1dc9b">
                     <semantic:text>includes( [1..10], [1..10) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_b64c2a9c-6323-4a71-885c-f44f3bd993a0">
                 <semantic:variable name="includesRRT7" id="_df4ccb83-6669-46b4-8b2b-0ab1e0d72df5" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_124783ce-d169-4aaf-b543-34e10fbcf471">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_124783ce-d169-4aaf-b543-34e10fbcf471">
                     <semantic:text>includes( [1..10], (1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_85e58995-a05f-4c42-baee-6120ae877282">
                 <semantic:variable name="includesRRT8" id="_531ae6c4-af2f-4fe2-975f-e8880eda9597" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_60838b34-13cc-4469-b42e-a7c9ac2fd3bb">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_60838b34-13cc-4469-b42e-a7c9ac2fd3bb">
                     <semantic:text>includes( [1..10], [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
@@ -1019,85 +1019,85 @@
         <semantic:context id="_0ecfff0d-8a4c-45bb-997b-4b4eb58ff8c5" typeRef="Any" triso:expressionId="_13216006-adf7-40b8-823a-182c2fe2e046">
             <semantic:contextEntry id="_a01595d3-0a61-4357-b374-269f2db37df5">
                 <semantic:variable name="duringPRT" id="_5c70d394-0215-4ac2-9133-d775594d12ab" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_e92d68ac-deb3-46ca-aadb-f3a06da22fe2">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_e92d68ac-deb3-46ca-aadb-f3a06da22fe2">
                     <semantic:text>during( 5, [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_403b3037-d637-4bab-90d2-2fef93291276">
                 <semantic:variable name="duringPRF" id="_c5b7a9fa-c2d2-4283-8467-50575a501d62" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_327e2c53-f491-4c13-b83d-0658a644c16d">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_327e2c53-f491-4c13-b83d-0658a644c16d">
                     <semantic:text>during( 12, [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_8e8ed6fc-5a9b-4062-9cdf-2ac66b778909">
                 <semantic:variable name="duringPRT2" id="_c569b194-5835-4f84-87fb-e9ccff2f6e1c" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_a1f5aa2e-cc15-4ff2-b0c0-013685409e4f">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_a1f5aa2e-cc15-4ff2-b0c0-013685409e4f">
                     <semantic:text>during( 1, [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_09405024-7f96-4f18-8ffa-d53427718c7a">
                 <semantic:variable name="duringPRT3" id="_2757633f-ae6b-4f9d-8eac-7093e98730dd" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_59f55b23-c503-43ab-9971-7987aede29d6">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_59f55b23-c503-43ab-9971-7987aede29d6">
                     <semantic:text>during( 10, [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_98acba66-c17e-4738-b3c6-1138eb3ceb45">
                 <semantic:variable name="duringPRF2" id="_5f6f0693-f736-49d6-8c45-96a6fd2154f0" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_1a4a9bf1-e18d-4b1c-8ac6-b7bde0a22f4e">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_1a4a9bf1-e18d-4b1c-8ac6-b7bde0a22f4e">
                     <semantic:text>during( 1, (1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_0908f07b-854b-4977-8772-432378238240">
                 <semantic:variable name="duringPRF3" id="_8f011622-3c4a-4313-b38d-99e7aab2b80a" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_6b1e701e-fd7e-4717-8c99-cf8ca8bf5691">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_6b1e701e-fd7e-4717-8c99-cf8ca8bf5691">
                     <semantic:text>during( 10, [1..10) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_cca9e64a-e262-49fb-ac18-0e1ecf8172c5">
                 <semantic:variable name="duringRRT" id="_ddae409e-2c66-4cf2-84c0-55e5fafe9a51" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_ef966689-4c10-40f5-af20-7e784e866ad3">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_ef966689-4c10-40f5-af20-7e784e866ad3">
                     <semantic:text>during( [4..6], [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_050e81be-82cf-4eb0-b8df-22d987b59a27">
                 <semantic:variable name="duringRRT2" id="_f8b281de-ba38-4a3d-a302-aae82f7f7275" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_e3ebac2a-0a9d-4986-8f89-3db093b930f2">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_e3ebac2a-0a9d-4986-8f89-3db093b930f2">
                     <semantic:text>during( [1..5], [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_00b05cf7-7570-4f60-9729-3b60c782a58e">
                 <semantic:variable name="duringRRT3" id="_396ada81-7d42-4968-9144-6d1748361417" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_39937807-9d83-467c-bd32-4b9b0dfa8090">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_39937807-9d83-467c-bd32-4b9b0dfa8090">
                     <semantic:text>during( (1..5], (1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_65641dcb-ff65-4dc0-ac22-242fc3c3bbcc">
                 <semantic:variable name="duringRRT4" id="_b550a38f-c078-46ae-8d7f-fc65f506cc83" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_cc2eb0ba-180c-4f67-9e1e-7f93627d1d2b">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_cc2eb0ba-180c-4f67-9e1e-7f93627d1d2b">
                     <semantic:text>during( (1..10), [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_3eb4a2ef-9986-41a4-9cc8-ef7a91ac6d92">
                 <semantic:variable name="duringRRT5" id="_2da84e69-6c2c-4ee7-9347-a0b09abded8b" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_a8702072-99a9-4367-956c-4f7c03a443c2">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_a8702072-99a9-4367-956c-4f7c03a443c2">
                     <semantic:text>during( [5..10), [1..10) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_7052b71b-54e8-45d1-8728-030a58785629">
                 <semantic:variable name="duringRRT6" id="_0e523a80-3495-407e-ab53-19cbbd3ee2fe" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_8273e466-88a1-41cc-813c-d9b62e3c5a64">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_8273e466-88a1-41cc-813c-d9b62e3c5a64">
                     <semantic:text>during( [1..10), [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_a826717a-3bce-4297-9975-5a02fa977196">
                 <semantic:variable name="duringRRT7" id="_3dbaca8b-1eff-4f70-bf3e-c6638148d11f" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_26b6fe8e-bc07-4772-9fdf-f93387573465">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_26b6fe8e-bc07-4772-9fdf-f93387573465">
                     <semantic:text>during( (1..10], [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_0bafe576-ae07-4ee8-bec4-e9b14197d6b5">
                 <semantic:variable name="duringRRT8" id="_b28c468b-5666-4bbf-9f8b-e623fdd032a9" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_6edcb48f-03c6-4af4-a6f9-7b5c54bb3bab">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_6edcb48f-03c6-4af4-a6f9-7b5c54bb3bab">
                     <semantic:text>during( [1..10], [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
@@ -1108,61 +1108,61 @@
         <semantic:context id="_aa0d3b55-66bf-4f52-83df-b1575719a1e5" typeRef="Any" triso:expressionId="_f951f156-a5de-4083-8423-c8f0698b062b">
             <semantic:contextEntry id="_8c318236-3214-4b2c-9900-7507839d0ce6">
                 <semantic:variable name="startsPRT" id="_09a500c5-7983-4671-8bc0-a8165a67e572" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_bcc33f31-9221-4102-a277-b75332a8ded2">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_bcc33f31-9221-4102-a277-b75332a8ded2">
                     <semantic:text>starts( 1, [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_4246fd7c-6942-4c00-bc3c-f609679e9bc0">
                 <semantic:variable name="startsPRF" id="_c69af978-a459-46b4-a50a-e0f37a5ad170" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_d8b1ac76-ee74-4db2-8fc2-704f4214b71d">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_d8b1ac76-ee74-4db2-8fc2-704f4214b71d">
                     <semantic:text>starts( 1, (1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_2f797d8b-4347-4b40-8839-c9309cbe38b1">
                 <semantic:variable name="startsPRF2" id="_a47fcfc0-75f2-47e4-bd8e-bbfd9e0ab0e2" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_c92c4e31-6782-4a89-948b-a1019cb7fce9">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_c92c4e31-6782-4a89-948b-a1019cb7fce9">
                     <semantic:text>starts( 2, [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_a03ad602-d1e9-4457-80c7-3a3f9a3bd9f4">
                 <semantic:variable name="startsRRT" id="_7f5d5969-8d58-4bd6-8c10-6bbfba9ee546" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_7858a95c-38c5-4c23-9be3-57368b214b4e">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_7858a95c-38c5-4c23-9be3-57368b214b4e">
                     <semantic:text>starts( [1..5], [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_3d74a980-5641-416a-9786-8ed48efcd1d6">
                 <semantic:variable name="startsRRT2" id="_862620bc-6864-4d9f-927e-a5cb53ea19ac" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_fbeede61-6c40-4733-822f-03b88e98f4c6">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_fbeede61-6c40-4733-822f-03b88e98f4c6">
                     <semantic:text>starts( (1..5], (1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_7f8ef8e6-e4c6-4506-a497-527db957ae64">
                 <semantic:variable name="startsRRF" id="_fc9f10bf-81f4-4bda-a814-b1e62e277637" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_22af12d2-8837-409f-a3fc-910a5ea1e967">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_22af12d2-8837-409f-a3fc-910a5ea1e967">
                     <semantic:text>starts( (1..5], [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_9d6cdb02-74e1-44d2-9607-c54bc2f3ccc4">
                 <semantic:variable name="startsRRF2" id="_7868278d-d622-4e3b-9c63-9b24ed043129" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_c449c7fe-f683-4a6f-8b35-2b9903b7f21d">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_c449c7fe-f683-4a6f-8b35-2b9903b7f21d">
                     <semantic:text>starts( [1..5], (1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_ee9211dc-ab60-4aeb-95da-e8aad70a57c2">
                 <semantic:variable name="startsRRT3" id="_1a34dc92-0473-442c-9f08-c934df5e0c8d" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_df17c949-f363-4532-be00-e2750cf51749">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_df17c949-f363-4532-be00-e2750cf51749">
                     <semantic:text>starts( [1..10], [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_cc6e0a7f-5019-4615-b903-63ca029ebd64">
                 <semantic:variable name="startsRRT4" id="_c88c2a67-4929-43ad-844c-7c50bfa97cb6" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_3ed53fa6-5294-4b42-ad86-ec60e496f148">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_3ed53fa6-5294-4b42-ad86-ec60e496f148">
                     <semantic:text>starts( [1..10), [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_f1fdeb2f-f8b8-4076-8ff1-a3f37fadfe16">
                 <semantic:variable name="startsRRT5" id="_e01d744e-2402-4fc4-883d-edcb75a5af46" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_aaa0f061-b3ab-4135-90b1-3d2ecb901955">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_aaa0f061-b3ab-4135-90b1-3d2ecb901955">
                     <semantic:text>starts( (1..10), (1..10) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
@@ -1173,61 +1173,61 @@
         <semantic:context id="_c9458df2-63fd-43d1-9e78-82304da267e0" typeRef="Any" triso:expressionId="_c8a0d7e2-6069-44e0-b30c-9630b5727bf4">
             <semantic:contextEntry id="_370dbf9b-7abe-427c-b9bb-96ec4eae76b6">
                 <semantic:variable name="startedbyRPT" id="_196e3427-fc94-4e47-a136-710b34c1f925" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_faa95d27-1d21-4985-86f0-330611ae3aed">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_faa95d27-1d21-4985-86f0-330611ae3aed">
                     <semantic:text>started by( [1..10], 1 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_f58bd716-8500-4915-a2cd-7662c18b2eb4">
                 <semantic:variable name="startedbyRPF" id="_399bcab4-8ef4-442b-9e37-4a50b9a1299c" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_0d091d43-ad0a-497f-a28d-b1f21272d4fa">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_0d091d43-ad0a-497f-a28d-b1f21272d4fa">
                     <semantic:text>started by( (1..10], 1 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_b8538f95-fbb1-41d4-95ac-98c22c861765">
                 <semantic:variable name="startedbyRPF2" id="_19129fdf-bd0e-42fa-9a18-6a8d17efb60f" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_672f7957-0929-41cc-bb8c-49166e1fb8ee">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_672f7957-0929-41cc-bb8c-49166e1fb8ee">
                     <semantic:text>started by( [1..10], 2 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_38692397-ed38-46b7-8410-3d7a94ad1fcb">
                 <semantic:variable name="startedbyRRT" id="_60c6b083-b2f5-4f65-b93e-77e1b3cd999f" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_d9e9ec73-d64e-4df4-9dd6-ce81554da67e">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_d9e9ec73-d64e-4df4-9dd6-ce81554da67e">
                     <semantic:text>started by( [1..10], [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_468f0cc8-21e2-4301-abdf-641e755fe87a">
                 <semantic:variable name="startedbyRRT2" id="_08a4b6ee-fa9e-41b1-900a-e9cb4e6cee32" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_548f0f15-e06a-458b-ad0d-6db127054571">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_548f0f15-e06a-458b-ad0d-6db127054571">
                     <semantic:text>started by( (1..10], (1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_74604bbd-00f0-465b-b6b9-8904c4de8c58">
                 <semantic:variable name="startedbyRRF" id="_e2a0f494-414e-4a18-9fa3-782463aa2f0c" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_a19b522e-44da-4c90-b8f1-68184e247914">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_a19b522e-44da-4c90-b8f1-68184e247914">
                     <semantic:text>started by( [1..10], (1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_384bba7e-1f37-4a42-93d0-f8e8abcf9d7b">
                 <semantic:variable name="startedbyRRF2" id="_203f36c3-d056-4440-b309-687d1efc33ae" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_d9492f3e-a3f3-48c6-9a23-631bd5bedeb1">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_d9492f3e-a3f3-48c6-9a23-631bd5bedeb1">
                     <semantic:text>started by( (1..10], [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_41cd1f57-07fd-4f3d-9026-0e48b3dfa2bf">
                 <semantic:variable name="startedbyRRT3" id="_4f9f790e-b862-49fb-8a7a-af81b1471ef7" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_4f273da3-8d6a-422c-9ef1-f1f2088c1a2f">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_4f273da3-8d6a-422c-9ef1-f1f2088c1a2f">
                     <semantic:text>started by( [1..10], [1..10] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_c457f6bf-f76b-4ea7-9bde-ee67777f2ede">
                 <semantic:variable name="startedbyRRT4" id="_e5c2e000-49d6-4657-ac72-0be9016bbcc8" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_322eeb64-1f3b-4a4c-8013-c46231eeaad7">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_322eeb64-1f3b-4a4c-8013-c46231eeaad7">
                     <semantic:text>started by( [1..10], [1..10) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_0e627ac8-1b91-4c5b-a2a4-5a8bff6b0052">
                 <semantic:variable name="startedbyRRT5" id="_08e01646-b36f-4d08-a9d0-d718b048ce5c" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_c6a503c0-fb8f-460b-ab2a-f8e3dbb24206">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_c6a503c0-fb8f-460b-ab2a-f8e3dbb24206">
                     <semantic:text>started by( (1..10), (1..10) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
@@ -1238,31 +1238,31 @@
         <semantic:context id="_4aef12b4-1e40-48b7-b454-3b7c447baa30" typeRef="Any" triso:expressionId="_8bc55b04-3e8e-4172-b749-13889c78d286">
             <semantic:contextEntry id="_e7c6eb69-2e69-47bd-9ef5-6a060534f35a">
                 <semantic:variable name="coincidesPPT" id="_d6e86bc5-a714-4602-a6ff-b49ddcf8fd76" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_195e6e1d-5df5-4d68-9946-ddbb909b309b">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_195e6e1d-5df5-4d68-9946-ddbb909b309b">
                     <semantic:text>coincides( 5, 5 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_ec7f7ec6-f661-4c18-8fc9-f1d450b5690d">
                 <semantic:variable name="coincidesPPF" id="_ae704cf7-106b-45d5-9d1b-98cbb4981a40" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_555622e2-2119-4bc8-95b8-17199b44585b">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_555622e2-2119-4bc8-95b8-17199b44585b">
                     <semantic:text>coincides( 3, 4 )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_35deafa6-6c2a-4486-8da7-6a2159f7c594">
                 <semantic:variable name="coincidesRRT" id="_94873c27-e98a-40af-9dcb-00c53fdb8e26" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_9bfba3b7-0496-4b21-8ddd-66f464c42f3f">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_9bfba3b7-0496-4b21-8ddd-66f464c42f3f">
                     <semantic:text>coincides( [1..5], [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_f009d117-d510-4873-869b-3eaff78c838f">
                 <semantic:variable name="coincidesRRF" id="_f22033fe-2c09-4fc0-a9e9-b5ddbe45a226" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_d1a4c821-a85b-4bb2-b6c0-005bafbf2421">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_d1a4c821-a85b-4bb2-b6c0-005bafbf2421">
                     <semantic:text>coincides( (1..5), [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_3913efe5-b12d-46c8-b754-096be0f9dd71">
                 <semantic:variable name="coincidesRRF2" id="_cc1a5a50-3c45-4ecf-af9c-bb823af25022" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_b9bf3a44-4211-4f4b-9607-d9a7e3ae9e2c">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_b9bf3a44-4211-4f4b-9607-d9a7e3ae9e2c">
                     <semantic:text>coincides( [1..5], [2..6] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
@@ -1276,85 +1276,85 @@
         <semantic:context id="_92b05524-6ee6-4f80-9637-043512f549a2" typeRef="Any" triso:expressionId="_bfbb6171-f338-4553-9ef0-517c47bba72a">
             <semantic:contextEntry id="_d262dd90-1247-4619-9876-954a9b99bb02">
                 <semantic:variable name="overlapsRRT" id="_5c188ca5-b21a-4fd8-82c1-eab9ee27b336" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_3d266d8f-42ca-4f17-aedd-a6bf2e23fe23">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_3d266d8f-42ca-4f17-aedd-a6bf2e23fe23">
                     <semantic:text>overlaps( [1..5], [3..8] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_f15c0f07-a5e0-4dae-8dbb-14839c39b83b">
                 <semantic:variable name="overlapsRRT2" id="_3c5f93a4-bc94-4431-b968-39b22efd4d43" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_040c7b6e-a138-4f22-91ab-609fe6b587ff">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_040c7b6e-a138-4f22-91ab-609fe6b587ff">
                     <semantic:text>overlaps( [3..8], [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_b4880be6-1865-4318-82ed-6a5de8bae99c">
                 <semantic:variable name="overlapsRRT3" id="_15ac8598-c194-49ec-aaa1-65b796c59b17" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_055012e4-93b8-46cc-bc6b-755b75b6f4ea">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_055012e4-93b8-46cc-bc6b-755b75b6f4ea">
                     <semantic:text>overlaps( [1..8], [3..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_15645593-eac6-47b5-9981-3ba652f38aed">
                 <semantic:variable name="overlapsRRT4" id="_a1745f18-196d-40cf-bf1a-f5b633b54aa3" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_552c321b-d087-4acd-ba19-ba50113db313">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_552c321b-d087-4acd-ba19-ba50113db313">
                     <semantic:text>overlaps( [3..5], [1..8] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_e5e2f268-861f-4130-aaf0-f017bb9f898c">
                 <semantic:variable name="overlapsRRF" id="_784a5dd8-39ea-4e83-a356-f6bc3d9c2599" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_fb9e5377-1bc9-41cf-b575-bcf85050e2bf">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_fb9e5377-1bc9-41cf-b575-bcf85050e2bf">
                     <semantic:text>overlaps( [1..5], [6..8] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_edaaddd8-c385-4171-bb5a-d07fcf46cadb">
                 <semantic:variable name="overlapsRRF2" id="_484f42c0-f054-4136-924e-da93b9a10daa" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_882eebdd-f2fb-4e53-b434-d7214b61cf35">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_882eebdd-f2fb-4e53-b434-d7214b61cf35">
                     <semantic:text>overlaps( [6..8], [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_2a36e77b-d942-4cc0-b27f-38fdf1f888f9">
                 <semantic:variable name="overlapsRRT5" id="_1c07c53a-343a-47c2-b3cb-ba0721188e9f" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_65ed1c2f-88b7-4f06-aa74-e84a5f2ba857">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_65ed1c2f-88b7-4f06-aa74-e84a5f2ba857">
                     <semantic:text>overlaps( [1..5], [5..8] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_9305d0b4-5160-47af-b90b-c461f9e0d3c7">
                 <semantic:variable name="overlapsRRF3" id="_fc0849a8-7fd5-4bc6-97e3-ea7286e3233a" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_abd929f3-5755-49f6-932a-d342a3b85293">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_abd929f3-5755-49f6-932a-d342a3b85293">
                     <semantic:text>overlaps( [1..5], (5..8] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_df297409-bf6a-494b-9d24-9084c12e026a">
                 <semantic:variable name="overlapsRRF4" id="_9415f37d-46fb-4fee-9eea-053f9d8078fd" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_b1b9f82e-1c03-4675-bcb5-6a07d376ba8b">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_b1b9f82e-1c03-4675-bcb5-6a07d376ba8b">
                     <semantic:text>overlaps( [1..5), [5..8] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_1db4104b-0fcf-4206-900b-1f289af13504">
                 <semantic:variable name="overlapsRRF5" id="_2f59263d-531d-4abc-abd9-dd10b8837878" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_d5f863f1-2c58-4acc-94ab-fdb12386cee0">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_d5f863f1-2c58-4acc-94ab-fdb12386cee0">
                     <semantic:text>overlaps( [1..5), (5..8] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_2cc20f82-3deb-4717-b9e1-9181f74c4736">
                 <semantic:variable name="overlapsRRT6" id="_9e603652-5689-4889-a321-2077e7188bca" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_fad95a26-d965-4e40-b163-e8854efb16d8">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_fad95a26-d965-4e40-b163-e8854efb16d8">
                     <semantic:text>overlaps( [5..8], [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_a85fa3d9-19cb-4a36-bd2a-67dfd9121551">
                 <semantic:variable name="overlapsRRF6" id="_e2e6b9c4-e56f-4e7e-86fe-dc2c299b160c" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_0ecb6e51-9e7c-438c-a6c4-9144631cfd95">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_0ecb6e51-9e7c-438c-a6c4-9144631cfd95">
                     <semantic:text>overlaps( (5..8], [1..5] )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_d063d915-fd8e-44df-b370-aeae17bd4246">
                 <semantic:variable name="overlapsRRF7" id="_7d2f697c-d934-4d91-8f90-8cc97adb11c9" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_ae893f99-bb06-4ed2-b722-6c6c17915e6b">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_ae893f99-bb06-4ed2-b722-6c6c17915e6b">
                     <semantic:text>overlaps( [5..8], [1..5) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
             <semantic:contextEntry id="_dfe46d32-9bbc-49e9-bcbb-cbfd33298d70">
                 <semantic:variable name="overlapsRRF8" id="_0b9c80b0-973d-4650-8e61-5660aba6c3ef" typeRef="Any"/>
-                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20211108/FEEL/" triso:unparsed="true" id="_f147cb3f-0501-426b-84c5-33f5f91c123d">
+                <semantic:literalExpression expressionLanguage="https://www.omg.org/spec/DMN/20230324/FEEL/" triso:unparsed="true" id="_f147cb3f-0501-426b-84c5-33f5f91c123d">
                     <semantic:text>overlaps( (5..8], [1..5) )</semantic:text>
                 </semantic:literalExpression>
             </semantic:contextEntry>
diff --git a/TestCases/compliance-level-3/1131-feel-function-invocation/1131-feel-function-invocation.dmn b/TestCases/compliance-level-3/1131-feel-function-invocation/1131-feel-function-invocation.dmn
index 6510011a6..f605d45e0 100644
--- a/TestCases/compliance-level-3/1131-feel-function-invocation/1131-feel-function-invocation.dmn
+++ b/TestCases/compliance-level-3/1131-feel-function-invocation/1131-feel-function-invocation.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://camunda.com/spec/DMN/1131-feel-function-invocation" name="1131-feel-function-invocation" id="_i9fboPUasda" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://camunda.com/spec/DMN/1131-feel-function-invocation" name="1131-feel-function-invocation" id="_i9fboPUasda" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL function invocation</description>
     <decision name="decision001" id="_decision001">
         <description>Tests invocation of non-existing function</description>
diff --git a/TestCases/compliance-level-3/1140-feel-string-join-function/1140-feel-string-join-function.dmn b/TestCases/compliance-level-3/1140-feel-string-join-function/1140-feel-string-join-function.dmn
index 3ff8ad511..4cb2c7c24 100644
--- a/TestCases/compliance-level-3/1140-feel-string-join-function/1140-feel-string-join-function.dmn
+++ b/TestCases/compliance-level-3/1140-feel-string-join-function/1140-feel-string-join-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1140-feel-string-join-function"
              name="1140-feel-string-join-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'string join(string,delimiter)' in category string functions</description>
diff --git a/TestCases/compliance-level-3/1141-feel-round-up-function/1141-feel-round-up-function.dmn b/TestCases/compliance-level-3/1141-feel-round-up-function/1141-feel-round-up-function.dmn
index 54e154f1f..0ab909430 100644
--- a/TestCases/compliance-level-3/1141-feel-round-up-function/1141-feel-round-up-function.dmn
+++ b/TestCases/compliance-level-3/1141-feel-round-up-function/1141-feel-round-up-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1141-feel-round-up-function"
              name="1141-feel-round-up-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'round up(n,scale)' in category number functions</description>
diff --git a/TestCases/compliance-level-3/1142-feel-round-down-function/1142-feel-round-down-function.dmn b/TestCases/compliance-level-3/1142-feel-round-down-function/1142-feel-round-down-function.dmn
index 2c6fd209c..92d37e7a0 100644
--- a/TestCases/compliance-level-3/1142-feel-round-down-function/1142-feel-round-down-function.dmn
+++ b/TestCases/compliance-level-3/1142-feel-round-down-function/1142-feel-round-down-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1142-feel-round-down-function"
              name="1142-feel-round-down-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'round down(n,scale)' in category number functions</description>
diff --git a/TestCases/compliance-level-3/1143-feel-round-half-up-function/1143-feel-round-half-up-function.dmn b/TestCases/compliance-level-3/1143-feel-round-half-up-function/1143-feel-round-half-up-function.dmn
index 09d7906db..261f54717 100644
--- a/TestCases/compliance-level-3/1143-feel-round-half-up-function/1143-feel-round-half-up-function.dmn
+++ b/TestCases/compliance-level-3/1143-feel-round-half-up-function/1143-feel-round-half-up-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1143-feel-round-half-up-function"
              name="1143-feel-round-half-up-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'round half up(n,scale)' in category number functions</description>
diff --git a/TestCases/compliance-level-3/1144-feel-round-half-down-function/1144-feel-round-half-down-function.dmn b/TestCases/compliance-level-3/1144-feel-round-half-down-function/1144-feel-round-half-down-function.dmn
index 3fee03963..7183d50fe 100644
--- a/TestCases/compliance-level-3/1144-feel-round-half-down-function/1144-feel-round-half-down-function.dmn
+++ b/TestCases/compliance-level-3/1144-feel-round-half-down-function/1144-feel-round-half-down-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1144-feel-round-half-down-function"
              name="1144-feel-round-half-down-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'round half down(n,scale)' in category number functions</description>
diff --git a/TestCases/compliance-level-3/1145-feel-context-function/1145-feel-context-function.dmn b/TestCases/compliance-level-3/1145-feel-context-function/1145-feel-context-function.dmn
index ddfcbac25..deb7073d5 100644
--- a/TestCases/compliance-level-3/1145-feel-context-function/1145-feel-context-function.dmn
+++ b/TestCases/compliance-level-3/1145-feel-context-function/1145-feel-context-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1145-feel-context-function"
              name="1145-feel-context-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'context(entries)' in category context functions</description>
diff --git a/TestCases/compliance-level-3/1146-feel-context-put-function/1146-feel-context-put-function.dmn b/TestCases/compliance-level-3/1146-feel-context-put-function/1146-feel-context-put-function.dmn
index 73fc3fd29..769aac8ab 100644
--- a/TestCases/compliance-level-3/1146-feel-context-put-function/1146-feel-context-put-function.dmn
+++ b/TestCases/compliance-level-3/1146-feel-context-put-function/1146-feel-context-put-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1146-feel-context-put-function"
              name="1146-feel-context-put-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'context put(context, key, value)' in category context functions</description>
diff --git a/TestCases/compliance-level-3/1147-feel-context-merge-function/1147-feel-context-merge-function.dmn b/TestCases/compliance-level-3/1147-feel-context-merge-function/1147-feel-context-merge-function.dmn
index 5fd7be9c0..a5b4da8ee 100644
--- a/TestCases/compliance-level-3/1147-feel-context-merge-function/1147-feel-context-merge-function.dmn
+++ b/TestCases/compliance-level-3/1147-feel-context-merge-function/1147-feel-context-merge-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1147-feel-context-merge-function"
              name="1147-feel-context-merge-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'context put(context, key, value)' in category context functions</description>
diff --git a/TestCases/compliance-level-3/1148-feel-now-function/1148-feel-now-function.dmn b/TestCases/compliance-level-3/1148-feel-now-function/1148-feel-now-function.dmn
index c37e63ac2..d029ff8e3 100644
--- a/TestCases/compliance-level-3/1148-feel-now-function/1148-feel-now-function.dmn
+++ b/TestCases/compliance-level-3/1148-feel-now-function/1148-feel-now-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1148-feel-now-function"
              name="1148-feel-now-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'now()' in category miscellaneous functions</description>
diff --git a/TestCases/compliance-level-3/1149-feel-today-function/1149-feel-today-function.dmn b/TestCases/compliance-level-3/1149-feel-today-function/1149-feel-today-function.dmn
index 20a44112b..b7e8e0789 100644
--- a/TestCases/compliance-level-3/1149-feel-today-function/1149-feel-today-function.dmn
+++ b/TestCases/compliance-level-3/1149-feel-today-function/1149-feel-today-function.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1149-feel-today-function"
              name="1149-feel-today-function"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'today()' in category miscellaneous functions</description>
diff --git a/TestCases/compliance-level-3/1150-boxed-conditional/1150-boxed-conditional.dmn b/TestCases/compliance-level-3/1150-boxed-conditional/1150-boxed-conditional.dmn
index 0962c3eef..f702a9a9d 100644
--- a/TestCases/compliance-level-3/1150-boxed-conditional/1150-boxed-conditional.dmn
+++ b/TestCases/compliance-level-3/1150-boxed-conditional/1150-boxed-conditional.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1150-boxed-conditional"
              name="1150-boxed-conditional"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>Boxed Conditional Expression</description>
diff --git a/TestCases/compliance-level-3/1151-boxed-filter/1151-boxed-filter.dmn b/TestCases/compliance-level-3/1151-boxed-filter/1151-boxed-filter.dmn
index 6a771ae89..b8955006a 100644
--- a/TestCases/compliance-level-3/1151-boxed-filter/1151-boxed-filter.dmn
+++ b/TestCases/compliance-level-3/1151-boxed-filter/1151-boxed-filter.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1151-boxed-filter"
              name="1151-boxed-filter"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>Boxed Filter Expression</description>
diff --git a/TestCases/compliance-level-3/1152-boxed-for/1152-boxed-for.dmn b/TestCases/compliance-level-3/1152-boxed-for/1152-boxed-for.dmn
index 0f6d270a5..c71ce65ca 100644
--- a/TestCases/compliance-level-3/1152-boxed-for/1152-boxed-for.dmn
+++ b/TestCases/compliance-level-3/1152-boxed-for/1152-boxed-for.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1152-boxed-for"
              name="1152-boxed-for"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>Boxed For Expression</description>
diff --git a/TestCases/compliance-level-3/1153-boxed-some/1153-boxed-some.dmn b/TestCases/compliance-level-3/1153-boxed-some/1153-boxed-some.dmn
index 20653e875..4557bd9a7 100644
--- a/TestCases/compliance-level-3/1153-boxed-some/1153-boxed-some.dmn
+++ b/TestCases/compliance-level-3/1153-boxed-some/1153-boxed-some.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1153-boxed-some"
              name="1153-boxed-some"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>Boxed Some Expression</description>
diff --git a/TestCases/compliance-level-3/1154-boxed-every/1154-boxed-every.dmn b/TestCases/compliance-level-3/1154-boxed-every/1154-boxed-every.dmn
index 5a5c0d0a1..18c730eb4 100644
--- a/TestCases/compliance-level-3/1154-boxed-every/1154-boxed-every.dmn
+++ b/TestCases/compliance-level-3/1154-boxed-every/1154-boxed-every.dmn
@@ -2,9 +2,9 @@
 <definitions namespace="http://www.montera.com.au/spec/DMN/1154-boxed-every"
              name="1154-boxed-every"
              id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
-             xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
+             xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>Boxed Every Expression</description>
diff --git a/TestCases/compliance-level-3/labeler.xslt b/TestCases/compliance-level-3/labeler.xslt
index d39fb9746..5ff44389c 100644
--- a/TestCases/compliance-level-3/labeler.xslt
+++ b/TestCases/compliance-level-3/labeler.xslt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:n1="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:n2="http://www.omg.org/spec/DMN/20160719/testcase" xmlns="http://www.omg.org/spec/DMN/20160719/testcase" xmlns:feel="http://www.omg.org/spec/FEEL/20140401">
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:n1="https://www.omg.org/spec/DMN/20230324/DMN15.xsd" xmlns:n2="http://www.omg.org/spec/DMN/20160719/testcase" xmlns="http://www.omg.org/spec/DMN/20160719/testcase" xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/">
 	<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
 	<xsl:template match="/">
 		<xsl:variable name="foldername" select="substring-before(//n2:modelName,'.dmn')"/>
diff --git a/TestCases/non-compliant/0015-all-any/0015-all-any.dmn b/TestCases/non-compliant/0015-all-any/0015-all-any.dmn
index 0a8521f09..7ccbb641a 100644
--- a/TestCases/non-compliant/0015-all-any/0015-all-any.dmn
+++ b/TestCases/non-compliant/0015-all-any/0015-all-any.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:feel="https://www.omg.org/spec/DMN/20211108/FEEL/" xmlns:tns="http://www.trisotech.com/definitions/_0b25a236-f7a2-4845-b41e-73ab3e5ebd41" xmlns:triso="http://www.trisotech.com/2015/triso/modeling" exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.34; 1.0" id="_0b25a236-f7a2-4845-b41e-73ab3e5ebd41" name="and-or" namespace="http://www.trisotech.com/definitions/_0b25a236-f7a2-4845-b41e-73ab3e5ebd41" triso:logoChoice="Default">
+<definitions xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/" xmlns:tns="http://www.trisotech.com/definitions/_0b25a236-f7a2-4845-b41e-73ab3e5ebd41" xmlns:triso="http://www.trisotech.com/2015/triso/modeling" exporter="DMN Modeler; Method and Style trisofix.xslt" exporterVersion="5.0.34; 1.0" id="_0b25a236-f7a2-4845-b41e-73ab3e5ebd41" name="and-or" namespace="http://www.trisotech.com/definitions/_0b25a236-f7a2-4845-b41e-73ab3e5ebd41" triso:logoChoice="Default">
 	<itemDefinition id="tBoolList" isCollection="true" name="tBoolList">
 		<typeRef>boolean</typeRef>
 	</itemDefinition>
diff --git a/TestCases/non-compliant/0019-flight-rebooking/0019-flight-rebooking.dmn b/TestCases/non-compliant/0019-flight-rebooking/0019-flight-rebooking.dmn
index 940b56221..3b5a88124 100644
--- a/TestCases/non-compliant/0019-flight-rebooking/0019-flight-rebooking.dmn
+++ b/TestCases/non-compliant/0019-flight-rebooking/0019-flight-rebooking.dmn
@@ -2,9 +2,9 @@
 <definitions id="_0019_flight_rebooking" 
 	name="0019-flight-rebooking"
 	namespace="https://www.drools.org/kie-dmn"
-	xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
+	xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 	xmlns:kie="https://www.drools.org/kie-dmn"
-	xmlns:feel="https://www.omg.org/spec/DMN/20211108/FEEL/">
+	xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/">
 	
 	<itemDefinition id="_tFlight" name="tFlight">
 		<itemComponent id="_tFlight_Flight" name="Flight Number">
diff --git a/TestCases/non-compliant/0079-feel-string-function/0079-feel-string-function.dmn b/TestCases/non-compliant/0079-feel-string-function/0079-feel-string-function.dmn
index 8a3f693ff..817765473 100644
--- a/TestCases/non-compliant/0079-feel-string-function/0079-feel-string-function.dmn
+++ b/TestCases/non-compliant/0079-feel-string-function/0079-feel-string-function.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0079-feel-string-function" name="0079-feel-string-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0079-feel-string-function" name="0079-feel-string-function" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'string(any)' in category conversion functions</description>
 
     <decision name="decision_001" id="_decision_001">
diff --git a/TestCases/non-compliant/0088-recursion/0088-recursion.dmn b/TestCases/non-compliant/0088-recursion/0088-recursion.dmn
index f5f1bf9c2..70258c319 100644
--- a/TestCases/non-compliant/0088-recursion/0088-recursion.dmn
+++ b/TestCases/non-compliant/0088-recursion/0088-recursion.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/0088-reursion" name="0088-reursion" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<definitions namespace="http://www.montera.com.au/spec/DMN/0088-reursion" name="0088-reursion" id="_i9fboPUUEeesLuP4RHs4vA" xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>Recursion</description>
 
     <itemDefinition name="iTreeNode">
diff --git a/TestExamples/calc-discount/A.1.dmn b/TestExamples/calc-discount/A.1.dmn
index 65be352fb..94ecbaac7 100644
--- a/TestExamples/calc-discount/A.1.dmn
+++ b/TestExamples/calc-discount/A.1.dmn
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://onedecision.io/examples/" name="Calculate Price Decision Model" id="A.1" xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd">
+<definitions namespace="http://onedecision.io/examples/" name="Calculate Price Decision Model" id="A.1" xmlns="https://www.omg.org/spec/DMN/20230324/DMN15.xsd">
     <description>Implements the pricing model</description>
     <inputData name="age">
-        <variable typeRef="ns2:number" name="age" xmlns:ns2="http://www.omg.org/spec/FEEL/20140401">
+        <variable typeRef="ns2:number" name="age" xmlns:ns2="https://www.omg.org/spec/DMN/20230324/FEEL/">
             <description>The age of the applicant</description>
         </variable>
     </inputData>
     <inputData name="priority">
-        <variable typeRef="ns2:boolean" name="priority" xmlns:ns2="http://www.omg.org/spec/FEEL/20140401">
+        <variable typeRef="ns2:boolean" name="priority" xmlns:ns2="https://www.omg.org/spec/DMN/20230324/FEEL/">
             <description>Whether priority service was requested</description>
         </variable>
     </inputData>
     <decision name="Calculate Price Decision" id="calcPrice_d">
         <description>Determine price based on age of applicant and whether priority service requested</description>
-        <variable typeRef="ns2:number" name="price" xmlns:ns2="http://www.omg.org/spec/FEEL/20140401">
+        <variable typeRef="ns2:number" name="price" xmlns:ns2="https://www.omg.org/spec/DMN/20230324/FEEL/">
             <description>Price to charge customer</description>
         </variable>
         <decisionTable hitPolicy="UNIQUE" preferredOrientation="Rule-as-Row">
diff --git a/TestExamples/calc-discount/A.2.dmn b/TestExamples/calc-discount/A.2.dmn
index 02a2a28cf..d7c6b41af 100644
--- a/TestExamples/calc-discount/A.2.dmn
+++ b/TestExamples/calc-discount/A.2.dmn
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://onedecision.io/examples/" name="Calculate Price Decision Model" id="A.2" xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd">
+<definitions namespace="http://onedecision.io/examples/" name="Calculate Price Decision Model" id="A.2" xmlns="https://www.omg.org/spec/DMN/20230324/DMN15.xsd">
     <description>Implements the pricing model</description>
     <inputData name="age">
-        <variable typeRef="ns2:number" name="age" xmlns:ns2="http://www.omg.org/spec/FEEL/20140401">
+        <variable typeRef="ns2:number" name="age" xmlns:ns2="https://www.omg.org/spec/DMN/20230324/FEEL/">
             <description>The age of the applicant</description>
         </variable>
     </inputData>
     <inputData name="priority">
-        <variable typeRef="ns2:boolean" name="priority" xmlns:ns2="http://www.omg.org/spec/FEEL/20140401">
+        <variable typeRef="ns2:boolean" name="priority" xmlns:ns2="https://www.omg.org/spec/DMN/20230324/FEEL/">
             <description>Whether priority service was requested</description>
         </variable>
     </inputData>
diff --git a/TestExamples/calc-discount/A.3.dmn b/TestExamples/calc-discount/A.3.dmn
index fb33675f3..5797a27ca 100644
--- a/TestExamples/calc-discount/A.3.dmn
+++ b/TestExamples/calc-discount/A.3.dmn
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://onedecision.io/examples/" name="Calculate Price Decision Model" id="A.3" xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd">
+<definitions namespace="http://onedecision.io/examples/" name="Calculate Price Decision Model" id="A.3" xmlns="https://www.omg.org/spec/DMN/20230324/DMN15.xsd">
     <description>Implements the pricing model</description>
     <inputData name="age">
-        <variable typeRef="ns2:number" name="age" xmlns:ns2="http://www.omg.org/spec/FEEL/20140401">
+        <variable typeRef="ns2:number" name="age" xmlns:ns2="https://www.omg.org/spec/DMN/20230324/FEEL/">
             <description>The age of the applicant</description>
         </variable>
     </inputData>
     <inputData name="priority">
-        <variable typeRef="ns2:boolean" name="priority" xmlns:ns2="http://www.omg.org/spec/FEEL/20140401">
+        <variable typeRef="ns2:boolean" name="priority" xmlns:ns2="https://www.omg.org/spec/DMN/20230324/FEEL/">
             <description>Whether priority service was requested</description>
         </variable>
     </inputData>
     <decision name="Calculate Price Decision" id="calcPrice_d">
         <description>Determine price based on age of applicant and whether priority service requested</description>
-        <variable typeRef="ns2:number" name="price" xmlns:ns2="http://www.omg.org/spec/FEEL/20140401">
+        <variable typeRef="ns2:number" name="price" xmlns:ns2="https://www.omg.org/spec/DMN/20230324/FEEL/">
             <description>Price to charge customer</description>
         </variable>
         <context>
             <contextEntry>
-                <variable typeRef="ns2:number" name="age" xmlns:ns2="http://www.omg.org/spec/FEEL/20140401">
+                <variable typeRef="ns2:number" name="age" xmlns:ns2="https://www.omg.org/spec/DMN/20230324/FEEL/">
                     <description>The age of the applicant</description>
                 </variable>
                 <literalExpression>
@@ -26,7 +26,7 @@
                 </literalExpression>
             </contextEntry>
             <contextEntry>
-                <variable typeRef="ns2:boolean" name="priority" xmlns:ns2="http://www.omg.org/spec/FEEL/20140401">
+                <variable typeRef="ns2:boolean" name="priority" xmlns:ns2="https://www.omg.org/spec/DMN/20230324/FEEL/">
                     <description>Whether priority service was requested</description>
                 </variable>
                 <literalExpression>
@@ -34,7 +34,7 @@
                 </literalExpression>
             </contextEntry>
             <contextEntry>
-                <variable typeRef="ns2:number" name="price" xmlns:ns2="http://www.omg.org/spec/FEEL/20140401">
+                <variable typeRef="ns2:number" name="price" xmlns:ns2="https://www.omg.org/spec/DMN/20230324/FEEL/">
                     <description>Price to charge customer</description>
                 </variable>
                 <literalExpression>
diff --git a/TestExamples/lending1/lending1.dmn b/TestExamples/lending1/lending1.dmn
index 38a027861..624376a01 100644
--- a/TestExamples/lending1/lending1.dmn
+++ b/TestExamples/lending1/lending1.dmn
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2013 rel. 2 sp2 (x64) (http://www.altova.com) by Bruce Silver (private) -->
 <?altova_sps ..\dmn60627.sps?>
 <?xml-stylesheet type="text/xsl" href="..\libgen 60803c.xslt"?>
-<definitions id="def01" name="Lending decision - Original" namespace="methodandstyle.com/lendingOriginal" xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:tns="methodandstyle.com/lendingOriginal" xmlns:feel="http://www.omg.org/spec/FEEL/20140401" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/spec/DMN/20151101/dmn.xsd file:///C:/Users/Bruce/Documents/DMN/DMN1.1%20final/dmn.xsd">
+<definitions id="def01" name="Lending decision - Original" namespace="methodandstyle.com/lendingOriginal" xmlns="https://www.omg.org/spec/DMN/20230324/DMN15.xsd" xmlns:tns="methodandstyle.com/lendingOriginal" xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.omg.org/spec/DMN/20230324/DMN15.xsd file:///C:/Users/Bruce/Documents/DMN/DMN1.1%20final/dmn.xsd">
 	<itemDefinition name="tEligibility">
 		<typeRef>feel:string</typeRef>
 		<allowedValues>
diff --git a/TestExamples/order-discount/order-discount.dmn b/TestExamples/order-discount/order-discount.dmn
index 927893e78..6b72478d9 100644
--- a/TestExamples/order-discount/order-discount.dmn
+++ b/TestExamples/order-discount/order-discount.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" id="definitions" name="definitions" namespace="http://camunda.org/schema/1.0/dmn" xmlns:feel="http://www.omg.org/spec/FEEL/20140401">
+<definitions xmlns="https://www.omg.org/spec/DMN/20230324/DMN15.xsd" id="definitions" name="definitions" namespace="http://camunda.org/schema/1.0/dmn" xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/">
   <decision id="order-discount" name="Order Discount">
     <decisionTable id="decisionTable">
       <input id="input1" label="Amount">
diff --git a/runners/dmn-tck-marshaller/src/test/resources/compliance-level-2/0001-input-data-string/0001-input-data-string.dmn b/runners/dmn-tck-marshaller/src/test/resources/compliance-level-2/0001-input-data-string/0001-input-data-string.dmn
index 212f2f197..a481e475e 100644
--- a/runners/dmn-tck-marshaller/src/test/resources/compliance-level-2/0001-input-data-string/0001-input-data-string.dmn
+++ b/runners/dmn-tck-marshaller/src/test/resources/compliance-level-2/0001-input-data-string/0001-input-data-string.dmn
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions id="0001-input-data-string" name="0001-input-data-string"
 	namespace="https://github.com/agilepro/dmn-tck"
-	xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd"
-	xmlns:feel="http://www.omg.org/spec/FEEL/20140401">
+	xmlns="https://www.omg.org/spec/DMN/20230324/DMN15.xsd"
+	xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/">
 	<decision name="Greeting Message" id="d_GreetingMessage">
 		<variable name="Greeting Message" typeRef="feel:string"/>
 		<informationRequirement>
diff --git a/runners/dmn-tck-marshaller/src/test/resources/compliance-level-2/0002-input-data-number/0002-input-data-number.dmn b/runners/dmn-tck-marshaller/src/test/resources/compliance-level-2/0002-input-data-number/0002-input-data-number.dmn
index 28b4fef9b..049e6693d 100644
--- a/runners/dmn-tck-marshaller/src/test/resources/compliance-level-2/0002-input-data-number/0002-input-data-number.dmn
+++ b/runners/dmn-tck-marshaller/src/test/resources/compliance-level-2/0002-input-data-number/0002-input-data-number.dmn
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions id="0002-input-data-number" name="0002-input-data-number"
 	namespace="https://github.com/agilepro/dmn-tck"
-	xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd"
-	xmlns:feel="http://www.omg.org/spec/FEEL/20140401">
+	xmlns="https://www.omg.org/spec/DMN/20230324/DMN15.xsd"
+	xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/">
 	<decision name="Yearly Salary" id="d_YearlySalary">
 		<variable name="Yearly Salary" typeRef="feel:number"/>
 		<informationRequirement>
diff --git a/runners/dmn-tck-marshaller/src/test/resources/compliance-level-2/0003-input-data-string-allowed-values/0003-input-data-string-allowed-values.dmn b/runners/dmn-tck-marshaller/src/test/resources/compliance-level-2/0003-input-data-string-allowed-values/0003-input-data-string-allowed-values.dmn
index 8ddbee082..ed51bb227 100644
--- a/runners/dmn-tck-marshaller/src/test/resources/compliance-level-2/0003-input-data-string-allowed-values/0003-input-data-string-allowed-values.dmn
+++ b/runners/dmn-tck-marshaller/src/test/resources/compliance-level-2/0003-input-data-string-allowed-values/0003-input-data-string-allowed-values.dmn
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions id="0003-input-data-string-allowed-values" name="0003-input-data-string-allowed-values"
 	namespace="https://github.com/agilepro/dmn-tck"
-	xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd"
-	xmlns:feel="http://www.omg.org/spec/FEEL/20140401"
+	xmlns="https://www.omg.org/spec/DMN/20230324/DMN15.xsd"
+	xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/"
 	xmlns:tck="https://github.com/agilepro/dmn-tck">
 	<itemDefinition name="tEmploymentStatus">
 		<typeRef>feel:string</typeRef>
diff --git a/runners/dmn-tck-validation/src/test/java/org/omg/dmn/tck/validation/TestCasesFiles.java b/runners/dmn-tck-validation/src/test/java/org/omg/dmn/tck/validation/TestCasesFiles.java
index 335a2f3a2..b1fd207f5 100644
--- a/runners/dmn-tck-validation/src/test/java/org/omg/dmn/tck/validation/TestCasesFiles.java
+++ b/runners/dmn-tck-validation/src/test/java/org/omg/dmn/tck/validation/TestCasesFiles.java
@@ -52,8 +52,8 @@ public class TestCasesFiles {
             dmnSchema = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI)
                     .newSchema(new Source[]{new StreamSource(new File("../../TestCases/DC.xsd")),
                                             new StreamSource(new File("../../TestCases/DI.xsd")),
-                                            new StreamSource(new File("../../TestCases/DMNDI13.xsd")),
-                                            new StreamSource(new File("../../TestCases/DMN14.xsd"))
+                                            new StreamSource(new File("../../TestCases/DMNDI15.xsd")),
+                                            new StreamSource(new File("../../TestCases/DMN15.xsd"))
                     });
             testCasesSchema = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI).newSchema(new File("../../TestCases/testCases.xsd"));
         } catch (SAXException e) {
diff --git a/utils/dmn-tck-packager/README.md b/utils/dmn-tck-packager/README.md
index ec6969794..f805d1ba4 100644
--- a/utils/dmn-tck-packager/README.md
+++ b/utils/dmn-tck-packager/README.md
@@ -5,7 +5,7 @@ This utility can package/extract DMN TCK Test Cases file in DMN XML file extende
 The TCK test cases are packaged in the DMN model `definitions` level as an `extensionElements`.
 
 ```
-<semantic:definitions xmlns:semantic="https://www.omg.org/spec/DMN/20211108/MODEL/" xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase">
+<semantic:definitions xmlns:semantic="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase">
     <semantic:extensionElements>
         <tc:testCases>
             <tc:testCase id="tc-1" name="Test Case 1">