From 1afc3ff46c9baf6ff95de265e0e601c17c5c740e Mon Sep 17 00:00:00 2001
From: marttikaarik <martti.kaarik@elvior.com>
Date: Fri, 30 Jun 2017 16:15:12 +0300
Subject: [PATCH] Updated meta-model to v1.4.0 (unpublished stable).

Change-Id: I3622c673c922a120b87d9f765d0e40115565fc36
---
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../org.etsi.mts.tdl.model/model/tdl.ecore    | 375 ++++++++++++------
 .../org.etsi.mts.tdl.model/model/tdl.genmodel |  28 +-
 plugins/org.etsi.mts.tdl.model/plugin.xml     |   2 +-
 4 files changed, 273 insertions(+), 134 deletions(-)

diff --git a/plugins/org.etsi.mts.tdl.model/META-INF/MANIFEST.MF b/plugins/org.etsi.mts.tdl.model/META-INF/MANIFEST.MF
index cace2df3..90bbd868 100644
--- a/plugins/org.etsi.mts.tdl.model/META-INF/MANIFEST.MF
+++ b/plugins/org.etsi.mts.tdl.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.etsi.mts.tdl.model;singleton:=true
-Bundle-Version: 1.3.1.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.etsi.mts.tdl.model/model/tdl.ecore b/plugins/org.etsi.mts.tdl.model/model/tdl.ecore
index 522a3f89..6140cfce 100644
--- a/plugins/org.etsi.mts.tdl.model/model/tdl.ecore
+++ b/plugins/org.etsi.mts.tdl.model/model/tdl.ecore
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="tdl" nsURI="http://www.etsi.org/spec/TDL/1.3.1" nsPrefix="tdl">
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="tdl" nsURI="http://www.etsi.org/spec/TDL/1.4.0" nsPrefix="tdl">
   <eClassifiers xsi:type="ecore:EClass" name="Element" abstract="true">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="comment" ordered="false"
-        upperBound="-1" eType="#//Comment" containment="true" eOpposite="#//Comment/commentedElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="comment" upperBound="-1"
+        eType="#//Comment" containment="true" eOpposite="#//Comment/commentedElement">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="annotation" ordered="false"
-        upperBound="-1" eType="#//Annotation" containment="true" eOpposite="#//Annotation/annotatedElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="annotation" upperBound="-1"
+        eType="#//Annotation" containment="true" eOpposite="#//Annotation/annotatedElement">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" unique="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
       </eAnnotations>
@@ -27,13 +28,14 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" ordered="false" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="commentedElement" lowerBound="1"
-        eType="#//Element" eOpposite="#//Element/comment">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="commentedElement" ordered="false"
+        unique="false" lowerBound="1" eType="#//Element" eOpposite="#//Element/comment">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
       </eAnnotations>
@@ -43,18 +45,20 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false"
+        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="key" lowerBound="1" eType="#//AnnotationType">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="key" ordered="false" unique="false"
+        lowerBound="1" eType="#//AnnotationType">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="annotatedElement" lowerBound="1"
-        eType="#//Element" eOpposite="#//Element/annotation">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="annotatedElement" ordered="false"
+        unique="false" lowerBound="1" eType="#//Element" eOpposite="#//Element/annotation">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
       </eAnnotations>
@@ -75,9 +79,9 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" changeable="false"
-        volatile="true" transient="true" derived="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"
+        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        changeable="false" volatile="true" transient="true" derived="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
       </eAnnotations>
@@ -116,8 +120,8 @@
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="importedPackage" lowerBound="1"
-        eType="#//Package">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="importedPackage" ordered="false"
+        lowerBound="1" eType="#//Package">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
       </eAnnotations>
@@ -133,7 +137,8 @@
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" ordered="false"
+        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>
       </eAnnotations>
@@ -143,8 +148,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="dataType" lowerBound="1"
-        eType="#//DataType">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="dataType" ordered="false"
+        lowerBound="1" eType="#//DataType">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
@@ -165,7 +170,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURI" ordered="false"
+        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
@@ -175,19 +181,20 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mappableDataElement" lowerBound="1"
-        eType="#//MappableDataElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="mappableDataElement" ordered="false"
+        lowerBound="1" eType="#//MappableDataElement">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementURI" ordered="false"
+        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="dataResourceMapping" lowerBound="1"
-        eType="#//DataResourceMapping">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="dataResourceMapping" ordered="false"
+        unique="false" lowerBound="1" eType="#//DataResourceMapping">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
@@ -203,13 +210,14 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="parameterURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="parameterURI" ordered="false"
+        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" lowerBound="1"
-        eType="#//Parameter">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" ordered="false"
+        lowerBound="1" eType="#//Parameter">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
       </eAnnotations>
@@ -219,8 +227,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="dataType" lowerBound="1"
-        eType="#//DataType">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="dataType" ordered="false"
+        lowerBound="1" eType="#//DataType">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
       </eAnnotations>
@@ -251,8 +259,9 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isOptional" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isOptional" ordered="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
@@ -268,7 +277,8 @@
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unassignedMember" eType="#//UnassignedMemberTreatment">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unassignedMember" ordered="false"
+        unique="false" eType="#//UnassignedMemberTreatment">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
@@ -278,14 +288,14 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="member" lowerBound="1"
-        eType="#//Member">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="member" ordered="false"
+        unique="false" lowerBound="1" eType="#//Member">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="memberSpec" lowerBound="1"
-        eType="#//StaticDataUse" containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="memberSpec" ordered="false"
+        lowerBound="1" eType="#//StaticDataUse" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
@@ -312,19 +322,25 @@
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="collectionIndex" ordered="false"
+        upperBound="-1" eType="#//DataUse" containment="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ParameterBinding" eSuperTypes="#//Element">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="dataUse" lowerBound="1"
-        eType="#//DataUse" containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="dataUse" ordered="false"
+        lowerBound="1" eType="#//DataUse" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" lowerBound="1"
-        eType="#//Parameter">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" ordered="false"
+        lowerBound="1" eType="#//Parameter">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
       </eAnnotations>
@@ -341,7 +357,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" ordered="false" unique="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
@@ -362,8 +379,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" lowerBound="1"
-        eType="#//DataType">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" ordered="false"
+        lowerBound="1" eType="#//DataType">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
@@ -373,8 +390,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" lowerBound="1"
-        eType="#//FormalParameter">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" ordered="false"
+        lowerBound="1" eType="#//FormalParameter">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
@@ -389,8 +406,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="dataType" lowerBound="1"
-        eType="#//DataType">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="dataType" ordered="false"
+        lowerBound="1" eType="#//DataType">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
@@ -400,8 +417,49 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="function" lowerBound="1"
-        eType="#//Function">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="function" ordered="false"
+        lowerBound="1" eType="#//Function">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Procedure" eSuperTypes="#//DataType">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" ordered="false"
+        lowerBound="1" upperBound="-1" eType="#//ProcedureParameter" containment="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ProcedureParameter" eSuperTypes="#//Parameter">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" ordered="false" lowerBound="1"
+        eType="#//ParameterKind">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="ParameterKind">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
+    </eAnnotations>
+    <eLiterals name="IN"/>
+    <eLiterals name="OUT" value="1"/>
+    <eLiterals name="EXCEPTION" value="2"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CollectionDataInstance" eSuperTypes="#//DataInstance">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="member" ordered="false"
+        upperBound="-1" eType="#//StaticDataUse" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>
       </eAnnotations>
@@ -411,14 +469,14 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" lowerBound="1"
-        eType="#//ComponentInstance">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" ordered="false"
+        lowerBound="1" eType="#//ComponentInstance">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" lowerBound="1"
-        eType="#//Variable">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" ordered="false"
+        lowerBound="1" eType="#//Variable">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
       </eAnnotations>
@@ -428,12 +486,14 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestConfiguration.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1" eType="#//ComponentType">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" unique="false"
+        lowerBound="1" eType="#//ComponentType">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestConfiguration.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="role" lowerBound="1" eType="#//ComponentInstanceRole">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="role" ordered="false" unique="false"
+        lowerBound="1" eType="#//ComponentInstanceRole">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestConfiguration.&lt;/p>"/>
       </eAnnotations>
@@ -466,7 +526,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestConfiguration.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1" eType="#//GateType">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" unique="false"
+        lowerBound="1" eType="#//GateType">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestConfiguration.&lt;/p>"/>
       </eAnnotations>
@@ -509,7 +570,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="dataType" eType="#//DataType">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="dataType" ordered="false"
+        eType="#//DataType">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
       </eAnnotations>
@@ -524,17 +586,20 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="dataInstance" eType="#//DataInstance">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="dataInstance" ordered="false"
+        eType="#//DataInstance">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unassignedMember" eType="#//UnassignedMemberTreatment">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unassignedMember" ordered="false"
+        unique="false" eType="#//UnassignedMemberTreatment">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="dataType" eType="#//DataType">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="dataType" ordered="false"
+        eType="#//DataType">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
       </eAnnotations>
@@ -554,13 +619,14 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timer" lowerBound="1" eType="#//Timer">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="timer" ordered="false"
+        unique="false" lowerBound="1" eType="#//Timer">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" lowerBound="1"
-        eType="#//ComponentInstance">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" ordered="false"
+        lowerBound="1" eType="#//ComponentInstance">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>
       </eAnnotations>
@@ -576,8 +642,8 @@
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timeLabel" eType="#//TimeLabel"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="timeLabel" ordered="false"
+        eType="#//TimeLabel" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -599,7 +665,7 @@
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="timeConstraintExpression"
-        lowerBound="1" eType="#//DataUse" containment="true">
+        ordered="false" lowerBound="1" eType="#//DataUse" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>
       </eAnnotations>
@@ -609,8 +675,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="period" lowerBound="1"
-        eType="#//DataUse" containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="period" ordered="false"
+        lowerBound="1" eType="#//DataUse" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>
       </eAnnotations>
@@ -630,13 +696,14 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" eType="#//ComponentInstance">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" ordered="false"
+        unique="false" eType="#//ComponentInstance">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="period" lowerBound="1"
-        eType="#//DataUse" containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="period" ordered="false"
+        lowerBound="1" eType="#//DataUse" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>
       </eAnnotations>
@@ -651,7 +718,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="gateReference" eType="#//GateReference">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="gateReference" ordered="false"
+        eType="#//GateReference">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>
       </eAnnotations>
@@ -661,13 +729,14 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestConfiguration.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="component" lowerBound="1"
-        eType="#//ComponentInstance">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="component" ordered="false"
+        lowerBound="1" eType="#//ComponentInstance">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestConfiguration.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="gate" lowerBound="1" eType="#//GateInstance">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="gate" ordered="false" lowerBound="1"
+        eType="#//GateInstance">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestConfiguration.&lt;/p>"/>
       </eAnnotations>
@@ -677,8 +746,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timeLabel" lowerBound="1"
-        eType="#//TimeLabel">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="timeLabel" ordered="false"
+        lowerBound="1" eType="#//TimeLabel">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>
       </eAnnotations>
@@ -716,8 +785,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::TestDescription.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="testConfiguration" lowerBound="1"
-        eType="#//TestConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="testConfiguration" ordered="false"
+        unique="false" lowerBound="1" eType="#//TestConfiguration">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::TestDescription.&lt;/p>"/>
       </eAnnotations>
@@ -728,8 +797,8 @@
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::TestDescription.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="behaviourDescription" eType="#//BehaviourDescription"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="behaviourDescription" ordered="false"
+        eType="#//BehaviourDescription" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::TestDescription.&lt;/p>"/>
       </eAnnotations>
@@ -740,13 +809,20 @@
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::TestDescription.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isLocallyOrdered" ordered="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::TestDescription.&lt;/p>"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BehaviourDescription" eSuperTypes="#//Element">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::TestDescription.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="behaviour" lowerBound="1"
-        eType="#//Behaviour" containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="behaviour" ordered="false"
+        lowerBound="1" eType="#//Behaviour" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::TestDescription.&lt;/p>"/>
       </eAnnotations>
@@ -762,8 +838,8 @@
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="guard" eType="#//DataUse"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="guard" ordered="false"
+        eType="#//DataUse" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -785,19 +861,25 @@
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="scope" ordered="false"
+        eType="#//ComponentInstance">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PeriodicBehaviour" eSuperTypes="#//Behaviour">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="block" lowerBound="1" eType="#//Block"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="block" ordered="false"
+        unique="false" lowerBound="1" eType="#//Block" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="period" lowerBound="1"
-        eType="#//DataUse" containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="period" ordered="false"
+        lowerBound="1" eType="#//DataUse" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -808,13 +890,14 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="block" lowerBound="1" eType="#//Block"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="block" ordered="false"
+        unique="false" lowerBound="1" eType="#//Block" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="guardedComponent" eType="#//ComponentInstance">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="guardedComponent" ordered="false"
+        unique="false" eType="#//ComponentInstance">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -846,8 +929,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="numIteration" lowerBound="1"
-        eType="#//DataUse" containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="numIteration" ordered="false"
+        lowerBound="1" eType="#//DataUse" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -858,8 +941,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="block" lowerBound="1" eType="#//Block"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="block" ordered="false"
+        unique="false" lowerBound="1" eType="#//Block" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -894,13 +977,14 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="targetGate" lowerBound="1"
-        eType="#//GateReference">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="targetGate" ordered="false"
+        lowerBound="1" eType="#//GateReference">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" ordered="false"
+        upperBound="-1" eType="#//Variable">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -910,8 +994,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="verdict" lowerBound="1"
-        eType="#//DataUse" containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="verdict" ordered="false"
+        lowerBound="1" eType="#//DataUse" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -921,14 +1005,20 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="otherwise" eType="#//DataUse"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="otherwise" ordered="false"
+        eType="#//DataUse" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="condition" lowerBound="1"
-        eType="#//DataUse" containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="condition" ordered="false"
+        lowerBound="1" eType="#//DataUse" containment="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="scope" ordered="false"
+        eType="#//ComponentInstance">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -948,14 +1038,14 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" lowerBound="1"
-        eType="#//Variable">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" ordered="false"
+        lowerBound="1" eType="#//VariableUse" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="expression" lowerBound="1"
-        eType="#//DataUse" containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
+        lowerBound="1" eType="#//DataUse" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -965,7 +1055,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" eType="#//ComponentInstance">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" ordered="false"
+        eType="#//ComponentInstance">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -975,7 +1066,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -985,8 +1077,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="action" lowerBound="1"
-        eType="#//Action">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="action" ordered="false"
+        unique="false" lowerBound="1" eType="#//Action">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -1002,8 +1094,8 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="testDescription" lowerBound="1"
-        eType="#//TestDescription">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="testDescription" ordered="false"
+        lowerBound="1" eType="#//TestDescription">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -1025,14 +1117,14 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="formalComponent" lowerBound="1"
-        eType="#//ComponentInstance">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="formalComponent" ordered="false"
+        lowerBound="1" eType="#//ComponentInstance">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="actualComponent" lowerBound="1"
-        eType="#//ComponentInstance">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="actualComponent" ordered="false"
+        lowerBound="1" eType="#//ComponentInstance">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
@@ -1042,26 +1134,49 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceGate" lowerBound="1"
-        eType="#//GateReference">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"
+        lowerBound="1" upperBound="-1" eType="#//Target" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isTrigger" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="argument" ordered="false"
+        lowerBound="1" upperBound="-1" eType="#//DataUse" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Target" containment="true">
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ProcedureCall" eSuperTypes="#//Interaction">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="procedure" ordered="false"
+        lowerBound="1" eType="#//Procedure">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="argument" lowerBound="1"
-        eType="#//DataUse" containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"
+        lowerBound="1" eType="#//Target" containment="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Message" eSuperTypes="#//Interaction">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isTrigger" ordered="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceGate" ordered="false"
+        unique="false" lowerBound="1" eType="#//GateReference">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>
       </eAnnotations>
diff --git a/plugins/org.etsi.mts.tdl.model/model/tdl.genmodel b/plugins/org.etsi.mts.tdl.model/model/tdl.genmodel
index 6eafe96f..be88f4e7 100644
--- a/plugins/org.etsi.mts.tdl.model/model/tdl.genmodel
+++ b/plugins/org.etsi.mts.tdl.model/model/tdl.genmodel
@@ -122,6 +122,11 @@
       <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//UnassignedMemberTreatment/AnyValue"/>
       <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//UnassignedMemberTreatment/AnyValueOrOmit"/>
     </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="tdl.ecore#//ParameterKind">
+      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ParameterKind/IN"/>
+      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ParameterKind/OUT"/>
+      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ParameterKind/EXCEPTION"/>
+    </genEnums>
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="tdl.ecore#//ComponentInstanceRole">
       <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ComponentInstanceRole/SUT"/>
       <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ComponentInstanceRole/Tester"/>
@@ -199,6 +204,7 @@
     <genClasses image="false" ecoreClass="tdl.ecore#//DataUse">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/argument"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/reduction"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/collectionIndex"/>
     </genClasses>
     <genClasses ecoreClass="tdl.ecore#//ParameterBinding">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//ParameterBinding/dataUse"/>
@@ -222,6 +228,15 @@
     <genClasses ecoreClass="tdl.ecore#//FunctionCall">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//FunctionCall/function"/>
     </genClasses>
+    <genClasses ecoreClass="tdl.ecore#//Procedure">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Procedure/parameter"/>
+    </genClasses>
+    <genClasses ecoreClass="tdl.ecore#//ProcedureParameter">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//ProcedureParameter/kind"/>
+    </genClasses>
+    <genClasses ecoreClass="tdl.ecore#//CollectionDataInstance">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//CollectionDataInstance/member"/>
+    </genClasses>
     <genClasses ecoreClass="tdl.ecore#//VariableUse">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//VariableUse/componentInstance"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//VariableUse/variable"/>
@@ -301,6 +316,7 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//TestDescription/formalParameter"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//TestDescription/behaviourDescription"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//TestDescription/testObjective"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//TestDescription/isLocallyOrdered"/>
     </genClasses>
     <genClasses ecoreClass="tdl.ecore#//BehaviourDescription">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//BehaviourDescription/behaviour"/>
@@ -312,6 +328,7 @@
     <genClasses image="false" ecoreClass="tdl.ecore#//CombinedBehaviour">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//CombinedBehaviour/periodic"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//CombinedBehaviour/exceptional"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//CombinedBehaviour/scope"/>
     </genClasses>
     <genClasses ecoreClass="tdl.ecore#//PeriodicBehaviour">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//PeriodicBehaviour/block"/>
@@ -347,6 +364,7 @@
     <genClasses ecoreClass="tdl.ecore#//Assertion">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Assertion/otherwise"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Assertion/condition"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//Assertion/scope"/>
     </genClasses>
     <genClasses ecoreClass="tdl.ecore#//Stop"/>
     <genClasses ecoreClass="tdl.ecore#//Break"/>
@@ -374,10 +392,16 @@
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//ComponentInstanceBinding/actualComponent"/>
     </genClasses>
     <genClasses ecoreClass="tdl.ecore#//Interaction">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/sourceGate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//Interaction/isTrigger"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/target"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/argument"/>
     </genClasses>
+    <genClasses ecoreClass="tdl.ecore#//ProcedureCall">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//ProcedureCall/procedure"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//ProcedureCall/source"/>
+    </genClasses>
+    <genClasses ecoreClass="tdl.ecore#//Message">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//Message/isTrigger"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//Message/sourceGate"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/plugins/org.etsi.mts.tdl.model/plugin.xml b/plugins/org.etsi.mts.tdl.model/plugin.xml
index f6719bbc..5d9e3b88 100644
--- a/plugins/org.etsi.mts.tdl.model/plugin.xml
+++ b/plugins/org.etsi.mts.tdl.model/plugin.xml
@@ -9,7 +9,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated tdl -->
       <package
-            uri="http://www.etsi.org/spec/TDL/1.3.1"
+            uri="http://www.etsi.org/spec/TDL/1.4.0"
             class="org.etsi.mts.tdl.tdlPackage"
             genModel="model/tdl.genmodel"/>
    </extension>
-- 
GitLab