diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
index 1a463ac204b2c0af78881984160d4d3b466d522b..d5711021a34fd13dc744ab71d790c72a08c58c59 100644
--- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
+++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Dictionaries xmlns="http://uri.etsi.org/03280/common/2019/10/Dictionaries">
-	<Dictionary>
+	<Dictionary>   											<!--ObjectType: see Clause 6.4.8 Table 6.14 -->
 		<Owner>ETSI</Owner>
 		<Name>ObjectType</Name>
 		<DictionaryEntries>
@@ -30,7 +30,7 @@
             </DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--AuthorisationLegalType: see Clause 7.2.3 Table 7.4 -->
 		<Owner>ETSI</Owner>
 		<Name>AuthorisationLegalType</Name>
 		<DictionaryEntries>
@@ -40,7 +40,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--AuthorisationPriority: see Clause 7.2.4 Table 7.5 -->
 		<Owner>ETSI</Owner>
 		<Name>AuthorisationPriority</Name>
 		<DictionaryEntries>
@@ -54,7 +54,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--AuthorisationStatus: see Clause 7.2.5 Table 7.6 -->
 		<Owner>ETSI</Owner>
 		<Name>AuthorisationStatus</Name>
 		<DictionaryEntries>
@@ -92,7 +92,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--AuthorisationDesiredStatus: see Clause 7.2.6 Table 7.7 -->
 		<Owner>ETSI</Owner>
 		<Name>AuthorisationDesiredStatus</Name>
 		<DictionaryEntries>
@@ -126,7 +126,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--AuthorisationFlags: see Clause 7.2.5 Table 7.6 -->
 		<Owner>ETSI</Owner>
 		<Name>AuthorisationFlag</Name>
 		<DictionaryEntries>
@@ -144,7 +144,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--DocumentStatus: see Clause 7.3.4 Table 7.11 -->
 		<Owner>ETSI</Owner>
 		<Name>DocumentStatus</Name>
 		<DictionaryEntries>
@@ -178,7 +178,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--DocumentDesiredStatus: see Clause 7.3.5 Table 7.12 -->
 		<Owner>ETSI</Owner>
 		<Name>DocumentDesiredStatus</Name>
 		<DictionaryEntries>
@@ -208,17 +208,17 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--DocumentType: see Clause 7.3.7 Table 7.14 -->
 		<Owner>ETSI</Owner>
 		<Name>DocumentType</Name>
 		<DictionaryEntries>
 			<DictionaryEntry>
 				<Value>Warrant</Value>
-				<Meaning>This Document represents a legal Warrant</Meaning>
+				<Meaning>This Document represents a legal warrant</Meaning>
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--NotificationType: see Clause 7.4.3 Table 7.18 -->
 		<Owner>ETSI</Owner>
 		<Name>NotificationType</Name>
 		<DictionaryEntries>
@@ -228,7 +228,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--TaskStatus: see Clause 8.2.3 Table 8.2 -->
 		<Owner>ETSI</Owner>
 		<Name>TaskStatus</Name>
 		<DictionaryEntries>
@@ -270,7 +270,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--TaskDesiredStatus: see Clause 8.3.3 Table 8.3 -->
 		<Owner>ETSI</Owner>
 		<Name>TaskDesiredStatus</Name>
 		<DictionaryEntries>
@@ -304,12 +304,12 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--TaskServiceType: see Clause 8.2.6.4 Table 8.9 -->
 		<Owner>ETSI</Owner>
 		<Name>TaskServiceType</Name>
-		<DictionaryEntries></DictionaryEntries>
+		<DictionaryEntries></DictionaryEntries>           	<!--No definition so far -->
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--TaskDeliveryType: see Clause 8.2.7 Table 8.10 -->
 		<Owner>ETSI</Owner>
 		<Name>TaskDeliveryType</Name>
 		<DictionaryEntries>
@@ -327,7 +327,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--HandoverFormat: see Clause 8.2.8.4 Table 8.13 -->
 		<Owner>ETSI</Owner>
 		<Name>HandoverFormat</Name>
 		<DictionaryEntries>
@@ -357,7 +357,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--TaskFlag: see Clause 8.2.12 Table 8.14 -->
 		<Owner>ETSI</Owner>
 		<Name>TaskFlag</Name>
 		<DictionaryEntries>
@@ -372,14 +372,83 @@
 			<DictionaryEntry>
 				<Value>IsNonLocal</Value>
 				<Meaning>Indicates that the current Task shall be intercepted as a non-local identity.</Meaning>
-			</DictionaryEntry>			
+			</DictionaryEntry>
 			<DictionaryEntry>
 				<Value>IsLocal</Value>
 				<Meaning>Indicates that the current Task shall be intercepted as local identity. If both the IsNonLocal and IsLocal flag are absent, the Task shall be intercepted as a local identity unless otherwise agreed.</Meaning>
-			</DictionaryEntry>			
+			</DictionaryEntry>
+		</DictionaryEntries>
+	</Dictionary>
+    <Dictionary>   											<!--LDTaskStatus: see Clause 8.3.3 Table 8.16 -->
+		<Owner>ETSI</Owner>
+		<Name>LDTaskStatus</Name>
+		<DictionaryEntries>
+			<DictionaryEntry>
+				<Value>AwaitingApproval</Value>
+				<Meaning>The Task is still waiting approval from one or more relevant authorities</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>AwaitingDisclosure</Value>
+				<Meaning>The Task is approved, but is not yet processed by the LD system</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Disclosed</Value>
+				<Meaning>The Task has been processed and the product has been disclosed by the LD system</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>DisclosureNotAvailable</Value>
+				<Meaning>The Task has been processed and the CSP has determined there is no product available to disclosure</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Rejected</Value>
+				<Meaning>The Task has been explicitly denied or rejected by one or more relevant authorities.</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Cancelled</Value>
+				<Meaning>The Task has been permanently cancelled</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Error</Value>
+				<Meaning>The Task has not been processed due to a problem with the underlying LD system</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Invalid</Value>
+				<Meaning>The Task is not active due to a problem with the current information populated in the Task Object</Meaning>
+			</DictionaryEntry>
+		</DictionaryEntries>
+	</Dictionary>
+	<Dictionary>   											<!--LDTaskDesiredStatus: see Clause 8.3.4 Table 8.17 -->
+		<Owner>ETSI</Owner>
+		<Name>LDTaskDesiredStatus</Name>
+		<DictionaryEntries>
+			<DictionaryEntry>
+				<Value>AwaitingApproval</Value>
+				<Meaning>The Task is still waiting approval from one or more relevant authorities</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>AwaitingDisclosure</Value>
+				<Meaning>The Task is approved, but is not yet processed by the LD system</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Disclosed</Value>
+				<Meaning>The Task has been processed and the product has been disclosed by the LD system</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Rejected</Value>
+				<Meaning>The Task has been explicitly denied or rejected by one or more relevant authorities.</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Cancelled</Value>
+				<Meaning>The Task has been permanently cancelled</Meaning>
+			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-    <Dictionary>
+<Dictionary>   											<!--RequestType: see Clause 8.3.5.2 Table 8.19 -->
+		<Owner>ETSI</Owner>
+		<Name>RequestType</Name>
+		<DictionaryEntries></DictionaryEntries> 		<!--No definition so far -->
+	</Dictionary>
+	<Dictionary>   											<!--LDHandoverFormat: see Clause 8.3.5.2 Table 8.19 -->
         <Owner>ETSI</Owner>
         <Name>LDHandoverFormat</Name>
         <DictionaryEntries>
@@ -401,4 +470,40 @@
             </DictionaryEntry>
         </DictionaryEntries>
     </Dictionary>
+	<Dictionary>   											<!--LDTaskFlag: see Clause 8.3.7 Table 8.25 -->
+		<Owner>ETSI</Owner>
+		<Name>LDTaskFlag</Name>
+		<DictionaryEntries>
+			<DictionaryEntry>
+				<Value>IsTest</Value>
+				<Meaning>Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>IsEmergency</Value>
+				<Meaning>Indicates if the LD Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3)</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>IsNonLocal</Value>
+				<Meaning>Indicates that the current Task shall disclose information about a non-local identity.</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>IsLocal</Value>
+				<Meaning>Indicates that the current Task shall disclose information about a local identity. If both the IsNonLocal and IsLocal flag are absent, the identity provided within the Task shall be considered as a local identity unless otherwise agreed.</Meaning>
+			</DictionaryEntry>
+		</DictionaryEntries>
+	</Dictionary>
+	<Dictionary>   											<!--ManifestSpecification: see Clause 10.2.2 Table 10.3 -->
+        <Owner>ETSI</Owner>
+        <Name>ManifestSpecification</Name>
+        <DictionaryEntries>
+            <DictionaryEntry>
+                <Value>TS102657-ASN.1</Value>
+                <Meaning>Delievery according to ETSI TS 102 657 using ASN.1 encoding</Meaning>
+            </DictionaryEntry>
+			<DictionaryEntry>
+                <Value>TS102657-XML</Value>
+                <Meaning>Delievery according to ETSI TS 102 657 using XML encoding</Meaning>
+            </DictionaryEntry>
+        </DictionaryEntries>
+    </Dictionary>
 </Dictionaries>
diff --git a/103120/examples/mutliple-auth-example-request.xml b/103120/examples/mutliple-auth-example-request.xml
index 198e00ac9301711cbf02882a5d76261473d16c4a..5e5f226800ba796c704d3f2075b837b783dc7cb1 100644
--- a/103120/examples/mutliple-auth-example-request.xml
+++ b/103120/examples/mutliple-auth-example-request.xml
@@ -12,7 +12,7 @@
     <TransactionIdentifier>d442c58c-d5e1-4fd9-90ec-9c228ad947f1</TransactionIdentifier>
     <Timestamp>2020-09-22T08:06:17.025833Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.7.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.1.1</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml
index 34ecaed2f8c9dbf1095e0789c0115e1d705ae24c..e8b6a5f8b113cfebe8e5f05f6aee82752fbc0184 100644
--- a/103120/examples/request1.xml
+++ b/103120/examples/request1.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
     <Timestamp>2015-09-01T12:00:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.7.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -26,7 +26,7 @@
             <HI1Object xsi:type="auth:AuthorisationObject">
               <ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</ObjectIdentifier>
               <CountryCode>XX</CountryCode>
-              <OwnerIdentifier>SENDER01</OwnerIdentifier>
+              <OwnerIdentifier>ACTOR01</OwnerIdentifier>
               <auth:AuthorisationReference>W000001</auth:AuthorisationReference>
               <auth:AuthorisationTimespan>
                 <auth:StartTime>2015-09-01T12:00:00Z</auth:StartTime>
@@ -41,7 +41,7 @@
             <HI1Object xsi:type="task:LITaskObject">
               <ObjectIdentifier>2b36a78b-b628-416d-bd22-404e68a0cd36</ObjectIdentifier>
               <CountryCode>XX</CountryCode>
-              <OwnerIdentifier>SENDER01</OwnerIdentifier>
+              <OwnerIdentifier>ACTOR01</OwnerIdentifier>
               <AssociatedObjects>
                 <AssociatedObject>7dbbc880-8750-4d3c-abe7-ea4a17646045</AssociatedObject>
               </AssociatedObjects>
diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml
index 81476ba57e6154be6ac7a5bef0e3589de043953f..67cbefd85d9617fe8c574c0bd449694b2dbcdc8f 100644
--- a/103120/examples/request2.xml
+++ b/103120/examples/request2.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>45002c1e-dc4a-470a-9152-8e752638c86c</TransactionIdentifier>
     <Timestamp>2015-09-01T12:01:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.7.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml
index 59d4621a98811473ea1b745848246e94b3d8d0d7..5da0df382bc54aab96d7a577222fcc449c0fe42b 100644
--- a/103120/examples/request3.xml
+++ b/103120/examples/request3.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>69353ac0-9582-4c71-b162-86259c99de20</TransactionIdentifier>
     <Timestamp>2015-09-01T12:02:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.7.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -26,7 +26,7 @@
               <HI1Object xsi:type="doc:DocumentObject">
                 <ObjectIdentifier>4193f541-5e19-468e-b4a3-1c636ce115e9</ObjectIdentifier>
                 <CountryCode>XX</CountryCode>
-                <OwnerIdentifier>SENDER01</OwnerIdentifier>
+                <OwnerIdentifier>ACTOR01</OwnerIdentifier>
                 <doc:DocumentReference>W000001</doc:DocumentReference>
                 <doc:DocumentTimespan>
                   <doc:StartTime>2015-09-01T12:00:00Z</doc:StartTime>
diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml
index c4e750dbd1e2ae130020425d0be9e9d89bad48a8..555974f0a91b1cda95c0ec060fd6d75bf278de9f 100644
--- a/103120/examples/request4.xml
+++ b/103120/examples/request4.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECEIVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.7.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -26,7 +26,7 @@
             <HI1Object xsi:type="auth:AuthorisationObject">
               <ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</ObjectIdentifier>
               <CountryCode>XX</CountryCode>
-              <OwnerIdentifier>SENDER01</OwnerIdentifier>
+              <OwnerIdentifier>ACTOR01</OwnerIdentifier>
               <auth:AuthorisationReference>W000001</auth:AuthorisationReference>
               <auth:AuthorisationTimespan>
                 <auth:StartTime>2019-09-30T12:00:00Z</auth:StartTime>
@@ -41,11 +41,11 @@
             <HI1Object xsi:type="task:LDTaskObject">
               <ObjectIdentifier>2b36a78b-b628-416d-bd22-404e68a0cd36</ObjectIdentifier>
               <CountryCode>XX</CountryCode>
-              <OwnerIdentifier>SENDER01</OwnerIdentifier>
+              <OwnerIdentifier>ACTOR01</OwnerIdentifier>
               <AssociatedObjects>
                 <AssociatedObject>7dbbc880-8750-4d3c-abe7-ea4a17646045</AssociatedObject>
               </AssociatedObjects>
-              <task:Reference>XX-SENDER01-1234</task:Reference>
+              <task:Reference>XX-ACTOR01-1234</task:Reference>
               <task:RequestDetails>
                 <task:StartTime>2019-09-30T12:00:00Z</task:StartTime>
                 <task:EndTime>2019-12-30T12:00:00Z</task:EndTime>
@@ -68,7 +68,7 @@
               </task:DeliveryDetails>
               <task:CSPID>
                 <CountryCode>XX</CountryCode>
-                <UniqueIdentifier>RECEIVER01</UniqueIdentifier>
+                <UniqueIdentifier>ACTOR02</UniqueIdentifier>
               </task:CSPID>
             </HI1Object>
           </CREATE>
diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/request5-Binary-Deli.xml
similarity index 92%
rename from 103120/examples/request5-Binary-Delivery.xml
rename to 103120/examples/request5-Binary-Deli.xml
index 048837e9087d22cfbca224d4d6df2d31d9ecf040..7d5170752e0475762923ed6fbdcc9282801b8114 100644
--- a/103120/examples/request5-Binary-Delivery.xml
+++ b/103120/examples/request5-Binary-Deli.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR2</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECEIVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR1</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.7.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -30,7 +30,7 @@
                 <AssociatedObject>2b36a78b-b628-416d-bd22-404e68a0cd36</AssociatedObject>
               </AssociatedObjects>
               <delivery:Reference>
-                <delivery:LDID>XX-SENDER01-12345</delivery:LDID>
+                <delivery:LDID>XX-ACTOR01-1234</delivery:LDID>
               </delivery:Reference>
               <delivery:DeliveryID>d1079830-8e9a-4731-8fb7-36b9b961eb72</delivery:DeliveryID>
               <delivery:SequenceNumber>1</delivery:SequenceNumber>
diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Deli.xml
similarity index 95%
rename from 103120/examples/request5-XML-Delivery.xml
rename to 103120/examples/request5-XML-Deli.xml
index f6636600dd012c2dc826285023b6408256feb4b8..f9314cdd3f3719b3d67dd0ba88122e0071a905d4 100644
--- a/103120/examples/request5-XML-Delivery.xml
+++ b/103120/examples/request5-XML-Deli.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECEIVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.7.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -30,7 +30,7 @@
                 <AssociatedObject>2b36a78b-b628-416d-bd22-404e68a0cd36</AssociatedObject>
               </AssociatedObjects>
               <delivery:Reference>
-                <delivery:LIID>ExampleLIID</delivery:LIID>
+                <delivery:LDID>XX-ACTOR01-1234</delivery:LDID>
               </delivery:Reference>
               <delivery:DeliveryID>d1079830-8e9a-4731-8fb7-36b9b961eb72</delivery:DeliveryID>
               <delivery:SequenceNumber>1</delivery:SequenceNumber>
diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml
index aca92d177f4115dbd2a5dc452550f1ecdbae009c..25aa22c9fee5e4873142b34d7aff30c82e25021e 100644
--- a/103120/examples/response1.xml
+++ b/103120/examples/response1.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
     <Timestamp>2015-09-01T12:00:01.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.7.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml
index 1980184631a9a0c44bc1652ac573fd0f441b2359..9ae5d35a80a58d747f995357752a222cdb41cd5d 100644
--- a/103120/examples/response2.xml
+++ b/103120/examples/response2.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>45002c1e-dc4a-470a-9152-8e752638c86c</TransactionIdentifier>
     <Timestamp>2015-09-01T12:01:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.7.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -26,7 +26,7 @@
               <HI1Object xsi:type="auth:AuthorisationObject">
                 <ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</ObjectIdentifier>
                 <CountryCode>XX</CountryCode>
-                <OwnerIdentifier>SENDER01</OwnerIdentifier>
+                <OwnerIdentifier>ACTOR01</OwnerIdentifier>
                 <Generation>1</Generation>
                 <LastChanged>2015-09-01T12:00:00Z</LastChanged>
                 <auth:AuthorisationReference>W000001</auth:AuthorisationReference>
@@ -52,7 +52,7 @@
                 <HI1Object xsi:type="task:LITaskObject">
                   <ObjectIdentifier>2b36a78b-b628-416d-bd22-404e68a0cd36</ObjectIdentifier>
                   <CountryCode>XX</CountryCode>
-                  <OwnerIdentifier>SENDER01</OwnerIdentifier>
+                  <OwnerIdentifier>ACTOR01</OwnerIdentifier>
                   <Generation>1</Generation>
                   <AssociatedObjects>
                     <AssociatedObject>7dbbc880-8750-4d3c-abe7-ea4a17646045</AssociatedObject>
@@ -89,7 +89,7 @@
                   </task:DeliveryDetails>
                   <task:CSPID>
                     <CountryCode>XX</CountryCode>
-                    <UniqueIdentifier>RECVER01</UniqueIdentifier>
+                    <UniqueIdentifier>ACTOR02</UniqueIdentifier>
                   </task:CSPID>
                   <task:InvalidReason>
                     <ErrorCode>3000</ErrorCode>
diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml
index 6487a8dc04f310d6e0e2bcae09367ac3b371991d..e3b1537dce4c53c395ef3c1adc6090af76661793 100644
--- a/103120/examples/response3.xml
+++ b/103120/examples/response3.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>69353ac0-9582-4c71-b162-86259c99de20</TransactionIdentifier>
     <Timestamp>2015-09-01T12:02:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.7.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -33,7 +33,7 @@
               <HI1Object xsi:type="auth:AuthorisationObject">
                 <ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</ObjectIdentifier>
                 <CountryCode>XX</CountryCode>
-                <OwnerIdentifier>SENDER01</OwnerIdentifier>
+                <OwnerIdentifier>ACTOR01</OwnerIdentifier>
                 <Generation>2</Generation>
                 <AssociatedObjects>
                   <AssociatedObject>4193f541-5e19-468e-b4a3-1c636ce115e9</AssociatedObject>
diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml
index 4a5e16c2ed62cf75fd2b7b8632e7fe628acf1ed0..a8dc811c0046124966418f8127ad3b8affd9f312 100644
--- a/103120/examples/response4.xml
+++ b/103120/examples/response4.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECEIVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:01.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.7.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml
index 030867e205c902579f01117f69f86bd87da0b4c6..e210444e8a85f4dab6b4e2e9a593c551db3b8596 100644
--- a/103120/examples/response5.xml
+++ b/103120/examples/response5.xml
@@ -8,16 +8,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECEIVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.7.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/portal/dictionaries/ts_103120v010401p0_Dictionaries.xsd b/103120/portal/dictionaries/ts_103120v010801p0_Dictionaries.xsd
similarity index 100%
rename from 103120/portal/dictionaries/ts_103120v010401p0_Dictionaries.xsd
rename to 103120/portal/dictionaries/ts_103120v010801p0_Dictionaries.xsd
diff --git a/103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml b/103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml
similarity index 61%
rename from 103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml
rename to 103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml
index 477914c542be7f6b946ca106e9f7fb0cc9b26a31..d5711021a34fd13dc744ab71d790c72a08c58c59 100644
--- a/103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml
+++ b/103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Dictionaries xmlns="http://uri.etsi.org/03280/common/2019/10/Dictionaries">
-	<Dictionary>
+	<Dictionary>   											<!--ObjectType: see Clause 6.4.8 Table 6.14 -->
 		<Owner>ETSI</Owner>
 		<Name>ObjectType</Name>
 		<DictionaryEntries>
@@ -18,11 +18,19 @@
 			</DictionaryEntry>
 			<DictionaryEntry>
 				<Value>Task</Value>
-				<Meaning>A Task Object as defined in section 8.2</Meaning>
-			</DictionaryEntry>
+				<Meaning>An LI Task Object as defined in section 8.2</Meaning>
+			</DictionaryEntry>
+            <DictionaryEntry>
+                <Value>LDTask</Value>
+                <Meaning>An LD Task Object as defined in section 8.3</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>Delivery</Value>
+                <Meaning>A Delivery Object as defined in section 10</Meaning>
+            </DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--AuthorisationLegalType: see Clause 7.2.3 Table 7.4 -->
 		<Owner>ETSI</Owner>
 		<Name>AuthorisationLegalType</Name>
 		<DictionaryEntries>
@@ -32,7 +40,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--AuthorisationPriority: see Clause 7.2.4 Table 7.5 -->
 		<Owner>ETSI</Owner>
 		<Name>AuthorisationPriority</Name>
 		<DictionaryEntries>
@@ -46,7 +54,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--AuthorisationStatus: see Clause 7.2.5 Table 7.6 -->
 		<Owner>ETSI</Owner>
 		<Name>AuthorisationStatus</Name>
 		<DictionaryEntries>
@@ -84,7 +92,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--AuthorisationDesiredStatus: see Clause 7.2.6 Table 7.7 -->
 		<Owner>ETSI</Owner>
 		<Name>AuthorisationDesiredStatus</Name>
 		<DictionaryEntries>
@@ -118,7 +126,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--AuthorisationFlags: see Clause 7.2.5 Table 7.6 -->
 		<Owner>ETSI</Owner>
 		<Name>AuthorisationFlag</Name>
 		<DictionaryEntries>
@@ -136,7 +144,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--DocumentStatus: see Clause 7.3.4 Table 7.11 -->
 		<Owner>ETSI</Owner>
 		<Name>DocumentStatus</Name>
 		<DictionaryEntries>
@@ -170,7 +178,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--DocumentDesiredStatus: see Clause 7.3.5 Table 7.12 -->
 		<Owner>ETSI</Owner>
 		<Name>DocumentDesiredStatus</Name>
 		<DictionaryEntries>
@@ -200,17 +208,17 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--DocumentType: see Clause 7.3.7 Table 7.14 -->
 		<Owner>ETSI</Owner>
 		<Name>DocumentType</Name>
 		<DictionaryEntries>
 			<DictionaryEntry>
 				<Value>Warrant</Value>
-				<Meaning>This Document represents a legal Warrant</Meaning>
+				<Meaning>This Document represents a legal warrant</Meaning>
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--NotificationType: see Clause 7.4.3 Table 7.18 -->
 		<Owner>ETSI</Owner>
 		<Name>NotificationType</Name>
 		<DictionaryEntries>
@@ -220,7 +228,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--TaskStatus: see Clause 8.2.3 Table 8.2 -->
 		<Owner>ETSI</Owner>
 		<Name>TaskStatus</Name>
 		<DictionaryEntries>
@@ -262,7 +270,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--TaskDesiredStatus: see Clause 8.3.3 Table 8.3 -->
 		<Owner>ETSI</Owner>
 		<Name>TaskDesiredStatus</Name>
 		<DictionaryEntries>
@@ -296,12 +304,12 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--TaskServiceType: see Clause 8.2.6.4 Table 8.9 -->
 		<Owner>ETSI</Owner>
 		<Name>TaskServiceType</Name>
-		<DictionaryEntries></DictionaryEntries>
+		<DictionaryEntries></DictionaryEntries>           	<!--No definition so far -->
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--TaskDeliveryType: see Clause 8.2.7 Table 8.10 -->
 		<Owner>ETSI</Owner>
 		<Name>TaskDeliveryType</Name>
 		<DictionaryEntries>
@@ -319,7 +327,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--HandoverFormat: see Clause 8.2.8.4 Table 8.13 -->
 		<Owner>ETSI</Owner>
 		<Name>HandoverFormat</Name>
 		<DictionaryEntries>
@@ -349,7 +357,7 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
-	<Dictionary>
+	<Dictionary>   											<!--TaskFlag: see Clause 8.2.12 Table 8.14 -->
 		<Owner>ETSI</Owner>
 		<Name>TaskFlag</Name>
 		<DictionaryEntries>
@@ -361,6 +369,141 @@
 				<Value>IsEmergency</Value>
 				<Meaning>Indicates if the LI Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3)</Meaning>
 			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>IsNonLocal</Value>
+				<Meaning>Indicates that the current Task shall be intercepted as a non-local identity.</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>IsLocal</Value>
+				<Meaning>Indicates that the current Task shall be intercepted as local identity. If both the IsNonLocal and IsLocal flag are absent, the Task shall be intercepted as a local identity unless otherwise agreed.</Meaning>
+			</DictionaryEntry>
+		</DictionaryEntries>
+	</Dictionary>
+    <Dictionary>   											<!--LDTaskStatus: see Clause 8.3.3 Table 8.16 -->
+		<Owner>ETSI</Owner>
+		<Name>LDTaskStatus</Name>
+		<DictionaryEntries>
+			<DictionaryEntry>
+				<Value>AwaitingApproval</Value>
+				<Meaning>The Task is still waiting approval from one or more relevant authorities</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>AwaitingDisclosure</Value>
+				<Meaning>The Task is approved, but is not yet processed by the LD system</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Disclosed</Value>
+				<Meaning>The Task has been processed and the product has been disclosed by the LD system</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>DisclosureNotAvailable</Value>
+				<Meaning>The Task has been processed and the CSP has determined there is no product available to disclosure</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Rejected</Value>
+				<Meaning>The Task has been explicitly denied or rejected by one or more relevant authorities.</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Cancelled</Value>
+				<Meaning>The Task has been permanently cancelled</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Error</Value>
+				<Meaning>The Task has not been processed due to a problem with the underlying LD system</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Invalid</Value>
+				<Meaning>The Task is not active due to a problem with the current information populated in the Task Object</Meaning>
+			</DictionaryEntry>
+		</DictionaryEntries>
+	</Dictionary>
+	<Dictionary>   											<!--LDTaskDesiredStatus: see Clause 8.3.4 Table 8.17 -->
+		<Owner>ETSI</Owner>
+		<Name>LDTaskDesiredStatus</Name>
+		<DictionaryEntries>
+			<DictionaryEntry>
+				<Value>AwaitingApproval</Value>
+				<Meaning>The Task is still waiting approval from one or more relevant authorities</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>AwaitingDisclosure</Value>
+				<Meaning>The Task is approved, but is not yet processed by the LD system</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Disclosed</Value>
+				<Meaning>The Task has been processed and the product has been disclosed by the LD system</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Rejected</Value>
+				<Meaning>The Task has been explicitly denied or rejected by one or more relevant authorities.</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>Cancelled</Value>
+				<Meaning>The Task has been permanently cancelled</Meaning>
+			</DictionaryEntry>
+		</DictionaryEntries>
+	</Dictionary>
+<Dictionary>   											<!--RequestType: see Clause 8.3.5.2 Table 8.19 -->
+		<Owner>ETSI</Owner>
+		<Name>RequestType</Name>
+		<DictionaryEntries></DictionaryEntries> 		<!--No definition so far -->
+	</Dictionary>
+	<Dictionary>   											<!--LDHandoverFormat: see Clause 8.3.5.2 Table 8.19 -->
+        <Owner>ETSI</Owner>
+        <Name>LDHandoverFormat</Name>
+        <DictionaryEntries>
+            <DictionaryEntry>
+                <Value>TS102657</Value>
+                <Meaning>Handed over in ETSI TS 102 657 format, using HI-B</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>EncapsulatedTS102657</Value>
+                <Meaning>Handed over as ETSI TS 102 657 format using the DeliveryObject as described in clause 10</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>TS103120</Value>
+                <Meaning>Handed over using the DeliveryObject as described in clause 10</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>TS103707</Value>
+                <Meaning>Handed over as ETSI TS 103 707, using the DeliveryObject as described in clause 10</Meaning>
+            </DictionaryEntry>
+        </DictionaryEntries>
+    </Dictionary>
+	<Dictionary>   											<!--LDTaskFlag: see Clause 8.3.7 Table 8.25 -->
+		<Owner>ETSI</Owner>
+		<Name>LDTaskFlag</Name>
+		<DictionaryEntries>
+			<DictionaryEntry>
+				<Value>IsTest</Value>
+				<Meaning>Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>IsEmergency</Value>
+				<Meaning>Indicates if the LD Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3)</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>IsNonLocal</Value>
+				<Meaning>Indicates that the current Task shall disclose information about a non-local identity.</Meaning>
+			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>IsLocal</Value>
+				<Meaning>Indicates that the current Task shall disclose information about a local identity. If both the IsNonLocal and IsLocal flag are absent, the identity provided within the Task shall be considered as a local identity unless otherwise agreed.</Meaning>
+			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
+	<Dictionary>   											<!--ManifestSpecification: see Clause 10.2.2 Table 10.3 -->
+        <Owner>ETSI</Owner>
+        <Name>ManifestSpecification</Name>
+        <DictionaryEntries>
+            <DictionaryEntry>
+                <Value>TS102657-ASN.1</Value>
+                <Meaning>Delievery according to ETSI TS 102 657 using ASN.1 encoding</Meaning>
+            </DictionaryEntry>
+			<DictionaryEntry>
+                <Value>TS102657-XML</Value>
+                <Meaning>Delievery according to ETSI TS 102 657 using XML encoding</Meaning>
+            </DictionaryEntry>
+        </DictionaryEntries>
+    </Dictionary>
 </Dictionaries>
diff --git a/103120/portal/examples/mutliple-auth-example-request.xml b/103120/portal/examples/mutliple-auth-example-request.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5e5f226800ba796c704d3f2075b837b783dc7cb1
--- /dev/null
+++ b/103120/portal/examples/mutliple-auth-example-request.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" ?>
+<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Header>
+    <SenderIdentifier>
+      <CountryCode>XX</CountryCode>
+      <UniqueIdentifier>Sender</UniqueIdentifier>
+    </SenderIdentifier>
+    <ReceiverIdentifier>
+      <CountryCode>XX</CountryCode>
+      <UniqueIdentifier>Receiver</UniqueIdentifier>
+    </ReceiverIdentifier>
+    <TransactionIdentifier>d442c58c-d5e1-4fd9-90ec-9c228ad947f1</TransactionIdentifier>
+    <Timestamp>2020-09-22T08:06:17.025833Z</Timestamp>
+    <Version>
+      <ETSIVersion>V1.8.1</ETSIVersion>
+      <NationalProfileOwner>XX</NationalProfileOwner>
+      <NationalProfileVersion>v1.1.1</NationalProfileVersion>
+    </Version>
+  </Header>
+  <Payload>
+    <RequestPayload>
+      <ActionRequests>
+        <ActionRequest>
+          <ActionIdentifier>1</ActionIdentifier>
+          <CREATE>
+            <HI1Object xsi:type="task:LITaskObject">
+              <ObjectIdentifier>cd3994b1-e5f3-4b59-a852-5fecd02bd247</ObjectIdentifier>
+              <task:ApprovalDetails>
+                <common:ApprovalDescription>Single Approval</common:ApprovalDescription>
+              </task:ApprovalDetails>
+            </HI1Object>
+          </CREATE>
+        </ActionRequest>
+        <ActionRequest>
+          <ActionIdentifier>2</ActionIdentifier>
+          <CREATE>
+            <HI1Object xsi:type="task:LITaskObject">
+              <ObjectIdentifier>64e8681a-a4de-4dea-9686-4a2a15e54786</ObjectIdentifier>
+              <task:ApprovalDetails>
+                <common:ApprovalDescription>First of two approvals</common:ApprovalDescription>
+              </task:ApprovalDetails>
+              <task:ApprovalDetails>
+                <common:ApprovalDescription>Second of two approvals</common:ApprovalDescription>
+              </task:ApprovalDetails>
+            </HI1Object>
+          </CREATE>
+        </ActionRequest>
+      </ActionRequests>
+    </RequestPayload>
+  </Payload>
+</HI1Message>
\ No newline at end of file
diff --git a/103120/portal/examples/request1.xml b/103120/portal/examples/request1.xml
index 94e268009f8f13143cba608f08e9241193afc098..e8b6a5f8b113cfebe8e5f05f6aee82752fbc0184 100644
--- a/103120/portal/examples/request1.xml
+++ b/103120/portal/examples/request1.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
     <Timestamp>2015-09-01T12:00:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.6.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -26,7 +26,7 @@
             <HI1Object xsi:type="auth:AuthorisationObject">
               <ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</ObjectIdentifier>
               <CountryCode>XX</CountryCode>
-              <OwnerIdentifier>SENDER01</OwnerIdentifier>
+              <OwnerIdentifier>ACTOR01</OwnerIdentifier>
               <auth:AuthorisationReference>W000001</auth:AuthorisationReference>
               <auth:AuthorisationTimespan>
                 <auth:StartTime>2015-09-01T12:00:00Z</auth:StartTime>
@@ -41,7 +41,7 @@
             <HI1Object xsi:type="task:LITaskObject">
               <ObjectIdentifier>2b36a78b-b628-416d-bd22-404e68a0cd36</ObjectIdentifier>
               <CountryCode>XX</CountryCode>
-              <OwnerIdentifier>SENDER01</OwnerIdentifier>
+              <OwnerIdentifier>ACTOR01</OwnerIdentifier>
               <AssociatedObjects>
                 <AssociatedObject>7dbbc880-8750-4d3c-abe7-ea4a17646045</AssociatedObject>
               </AssociatedObjects>
diff --git a/103120/portal/examples/request2.xml b/103120/portal/examples/request2.xml
index 4841ccf6734dbf725a5cf73abdebbc5b8050b8ee..67cbefd85d9617fe8c574c0bd449694b2dbcdc8f 100644
--- a/103120/portal/examples/request2.xml
+++ b/103120/portal/examples/request2.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>45002c1e-dc4a-470a-9152-8e752638c86c</TransactionIdentifier>
     <Timestamp>2015-09-01T12:01:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.6.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/portal/examples/request3.xml b/103120/portal/examples/request3.xml
index 4de508d530ab73e6698d7aa659c7c28977f2cbad..5da0df382bc54aab96d7a577222fcc449c0fe42b 100644
--- a/103120/portal/examples/request3.xml
+++ b/103120/portal/examples/request3.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>69353ac0-9582-4c71-b162-86259c99de20</TransactionIdentifier>
     <Timestamp>2015-09-01T12:02:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.6.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -26,7 +26,7 @@
               <HI1Object xsi:type="doc:DocumentObject">
                 <ObjectIdentifier>4193f541-5e19-468e-b4a3-1c636ce115e9</ObjectIdentifier>
                 <CountryCode>XX</CountryCode>
-                <OwnerIdentifier>SENDER01</OwnerIdentifier>
+                <OwnerIdentifier>ACTOR01</OwnerIdentifier>
                 <doc:DocumentReference>W000001</doc:DocumentReference>
                 <doc:DocumentTimespan>
                   <doc:StartTime>2015-09-01T12:00:00Z</doc:StartTime>
diff --git a/103120/portal/examples/request4.xml b/103120/portal/examples/request4.xml
index d3a0da03e4e099d2e7dd296f1e7abcfedc1203da..555974f0a91b1cda95c0ec060fd6d75bf278de9f 100644
--- a/103120/portal/examples/request4.xml
+++ b/103120/portal/examples/request4.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECEIVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.6.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -26,7 +26,7 @@
             <HI1Object xsi:type="auth:AuthorisationObject">
               <ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</ObjectIdentifier>
               <CountryCode>XX</CountryCode>
-              <OwnerIdentifier>SENDER01</OwnerIdentifier>
+              <OwnerIdentifier>ACTOR01</OwnerIdentifier>
               <auth:AuthorisationReference>W000001</auth:AuthorisationReference>
               <auth:AuthorisationTimespan>
                 <auth:StartTime>2019-09-30T12:00:00Z</auth:StartTime>
@@ -41,11 +41,11 @@
             <HI1Object xsi:type="task:LDTaskObject">
               <ObjectIdentifier>2b36a78b-b628-416d-bd22-404e68a0cd36</ObjectIdentifier>
               <CountryCode>XX</CountryCode>
-              <OwnerIdentifier>SENDER01</OwnerIdentifier>
+              <OwnerIdentifier>ACTOR01</OwnerIdentifier>
               <AssociatedObjects>
                 <AssociatedObject>7dbbc880-8750-4d3c-abe7-ea4a17646045</AssociatedObject>
               </AssociatedObjects>
-              <task:Reference>XX-SENDER01-1234</task:Reference>
+              <task:Reference>XX-ACTOR01-1234</task:Reference>
               <task:RequestDetails>
                 <task:StartTime>2019-09-30T12:00:00Z</task:StartTime>
                 <task:EndTime>2019-12-30T12:00:00Z</task:EndTime>
@@ -68,7 +68,7 @@
               </task:DeliveryDetails>
               <task:CSPID>
                 <CountryCode>XX</CountryCode>
-                <UniqueIdentifier>RECEIVER01</UniqueIdentifier>
+                <UniqueIdentifier>ACTOR02</UniqueIdentifier>
               </task:CSPID>
             </HI1Object>
           </CREATE>
diff --git a/103120/portal/examples/request5-Binary-Delivery.xml b/103120/portal/examples/request5-Binary-Delivery.xml
index ae0caca1073de116ac21f898be0e6ee810f12296..7d5170752e0475762923ed6fbdcc9282801b8114 100644
--- a/103120/portal/examples/request5-Binary-Delivery.xml
+++ b/103120/portal/examples/request5-Binary-Delivery.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR2</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECEIVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR1</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.6.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -30,7 +30,7 @@
                 <AssociatedObject>2b36a78b-b628-416d-bd22-404e68a0cd36</AssociatedObject>
               </AssociatedObjects>
               <delivery:Reference>
-                <delivery:LDID>XX-SENDER01-12345</delivery:LDID>
+                <delivery:LDID>XX-ACTOR01-1234</delivery:LDID>
               </delivery:Reference>
               <delivery:DeliveryID>d1079830-8e9a-4731-8fb7-36b9b961eb72</delivery:DeliveryID>
               <delivery:SequenceNumber>1</delivery:SequenceNumber>
diff --git a/103120/portal/examples/request5-XML-Delivery.xml b/103120/portal/examples/request5-XML-Delivery.xml
index b70a8f73d2bec96422467f1bb9025ef7c5dc71a4..f9314cdd3f3719b3d67dd0ba88122e0071a905d4 100644
--- a/103120/portal/examples/request5-XML-Delivery.xml
+++ b/103120/portal/examples/request5-XML-Delivery.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECEIVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.6.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -30,7 +30,7 @@
                 <AssociatedObject>2b36a78b-b628-416d-bd22-404e68a0cd36</AssociatedObject>
               </AssociatedObjects>
               <delivery:Reference>
-                <delivery:LIID>ExampleLIID</delivery:LIID>
+                <delivery:LDID>XX-ACTOR01-1234</delivery:LDID>
               </delivery:Reference>
               <delivery:DeliveryID>d1079830-8e9a-4731-8fb7-36b9b961eb72</delivery:DeliveryID>
               <delivery:SequenceNumber>1</delivery:SequenceNumber>
diff --git a/103120/portal/examples/response1.xml b/103120/portal/examples/response1.xml
index 5378b8e939ccc59168f8ecd75c481d357f42c1af..25aa22c9fee5e4873142b34d7aff30c82e25021e 100644
--- a/103120/portal/examples/response1.xml
+++ b/103120/portal/examples/response1.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
     <Timestamp>2015-09-01T12:00:01.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.6.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/portal/examples/response2.xml b/103120/portal/examples/response2.xml
index 73da83e8951378e7e9760341d36127ecc7fd35cb..9ae5d35a80a58d747f995357752a222cdb41cd5d 100644
--- a/103120/portal/examples/response2.xml
+++ b/103120/portal/examples/response2.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>45002c1e-dc4a-470a-9152-8e752638c86c</TransactionIdentifier>
     <Timestamp>2015-09-01T12:01:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.6.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -26,7 +26,7 @@
               <HI1Object xsi:type="auth:AuthorisationObject">
                 <ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</ObjectIdentifier>
                 <CountryCode>XX</CountryCode>
-                <OwnerIdentifier>SENDER01</OwnerIdentifier>
+                <OwnerIdentifier>ACTOR01</OwnerIdentifier>
                 <Generation>1</Generation>
                 <LastChanged>2015-09-01T12:00:00Z</LastChanged>
                 <auth:AuthorisationReference>W000001</auth:AuthorisationReference>
@@ -52,7 +52,7 @@
                 <HI1Object xsi:type="task:LITaskObject">
                   <ObjectIdentifier>2b36a78b-b628-416d-bd22-404e68a0cd36</ObjectIdentifier>
                   <CountryCode>XX</CountryCode>
-                  <OwnerIdentifier>SENDER01</OwnerIdentifier>
+                  <OwnerIdentifier>ACTOR01</OwnerIdentifier>
                   <Generation>1</Generation>
                   <AssociatedObjects>
                     <AssociatedObject>7dbbc880-8750-4d3c-abe7-ea4a17646045</AssociatedObject>
@@ -89,7 +89,7 @@
                   </task:DeliveryDetails>
                   <task:CSPID>
                     <CountryCode>XX</CountryCode>
-                    <UniqueIdentifier>RECVER01</UniqueIdentifier>
+                    <UniqueIdentifier>ACTOR02</UniqueIdentifier>
                   </task:CSPID>
                   <task:InvalidReason>
                     <ErrorCode>3000</ErrorCode>
diff --git a/103120/portal/examples/response3.xml b/103120/portal/examples/response3.xml
index 44ba51e4a5a29d9d5ed60566bfea880b18f4ee07..e3b1537dce4c53c395ef3c1adc6090af76661793 100644
--- a/103120/portal/examples/response3.xml
+++ b/103120/portal/examples/response3.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>69353ac0-9582-4c71-b162-86259c99de20</TransactionIdentifier>
     <Timestamp>2015-09-01T12:02:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.6.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -33,7 +33,7 @@
               <HI1Object xsi:type="auth:AuthorisationObject">
                 <ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</ObjectIdentifier>
                 <CountryCode>XX</CountryCode>
-                <OwnerIdentifier>SENDER01</OwnerIdentifier>
+                <OwnerIdentifier>ACTOR01</OwnerIdentifier>
                 <Generation>2</Generation>
                 <AssociatedObjects>
                   <AssociatedObject>4193f541-5e19-468e-b4a3-1c636ce115e9</AssociatedObject>
diff --git a/103120/portal/examples/response4.xml b/103120/portal/examples/response4.xml
index 39c27e6b451c1f5a1d7074514ef77a02a1511f87..a8dc811c0046124966418f8127ad3b8affd9f312 100644
--- a/103120/portal/examples/response4.xml
+++ b/103120/portal/examples/response4.xml
@@ -3,16 +3,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECEIVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:01.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.6.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/portal/examples/response5.xml b/103120/portal/examples/response5.xml
index e135903b07ac62a9528c2356e16c4ed0c723a21b..e210444e8a85f4dab6b4e2e9a593c551db3b8596 100644
--- a/103120/portal/examples/response5.xml
+++ b/103120/portal/examples/response5.xml
@@ -8,16 +8,16 @@
   <Header>
     <SenderIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>SENDER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
     </SenderIdentifier>
     <ReceiverIdentifier>
       <CountryCode>XX</CountryCode>
-      <UniqueIdentifier>RECEIVER01</UniqueIdentifier>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
     </ReceiverIdentifier>
     <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.6.1</ETSIVersion>
+      <ETSIVersion>V1.8.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/portal/schema/TS_103_280_v020401.xsd b/103120/portal/schema/TS_103_280_v020401.xsd
deleted file mode 100644
index 1f321550ca94b417d34b3cf7b113426766e97d6e..0000000000000000000000000000000000000000
--- a/103120/portal/schema/TS_103_280_v020401.xsd
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.4.1" elementFormDefault="qualified">
-    <xs:simpleType name="ShortString">
-        <xs:restriction base="xs:string">
-            <xs:maxLength value="255"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="LongString">
-        <xs:restriction base="xs:string">
-            <xs:maxLength value="65535"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="LIID">
-        <xs:restriction base="xs:normalizedString">
-            <xs:pattern value="([!-~]{1,25})|([0-9a-f]{26,50})"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="UTCDateTime">
-        <xs:restriction base="xs:dateTime">
-            <xs:pattern value="[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="UTCMicrosecondDateTime">
-        <xs:restriction base="xs:dateTime">
-            <xs:pattern value="[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{6}Z"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="QualifiedDateTime">
-        <xs:restriction base="xs:dateTime">
-            <xs:pattern value="[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(Z|[+-][0-9]{2}:[0-9]{2})"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="QualifiedMicrosecondDateTime">
-        <xs:restriction base="xs:dateTime">
-            <xs:pattern value="[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{6}(Z|[+-][0-9]{2}:[0-9]{2})"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="InternationalE164">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="[0-9]{1,15}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="IMSI">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="[0-9]{6,15}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="IMEI">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="[0-9]{14}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="IMEICheckDigit">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="[0-9]{15}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="IMEISV">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="[0-9]{16}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="IPv4Address">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="IPv4CIDR">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/([1-2]?[0-9]|3[0-2])"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="IPv6Address">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="([0-9a-f]{4}:){7}([0-9a-f]{4})"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="IPv6CIDR">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="IPAddress">
-        <xs:choice>
-            <xs:element name="IPv4Address" type="IPv4Address"/>
-            <xs:element name="IPv6Address" type="IPv6Address"/>
-        </xs:choice>
-    </xs:complexType>
-    <xs:complexType name="IPCIDR">
-        <xs:choice>
-            <xs:element name="IPv4CIDR" type="IPv4CIDR"/>
-            <xs:element name="IPv6CIDR" type="IPv6CIDR"/>
-        </xs:choice>
-    </xs:complexType>
-    <xs:simpleType name="TCPPort">
-        <xs:restriction base="xs:integer">
-            <xs:minExclusive value="1"/>
-            <xs:maxInclusive value="65535"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="TCPPortRange">
-        <xs:sequence>
-            <xs:element name="start" type="TCPPort"/>
-            <xs:element name="end" type="TCPPort"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="UDPPort">
-        <xs:restriction base="xs:integer">
-            <xs:minInclusive value="0"/>
-            <xs:maxInclusive value="65535"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="UDPPortRange">
-        <xs:sequence>
-            <xs:element name="start" type="UDPPort"/>
-            <xs:element name="end" type="UDPPort"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="Port">
-        <xs:choice>
-            <xs:element name="TCPPort" type="TCPPort"/>
-            <xs:element name="UDPPort" type="UDPPort"/>
-        </xs:choice>
-    </xs:complexType>
-    <xs:complexType name="PortRange">
-        <xs:choice>
-            <xs:element name="TCPPortRange" type="TCPPortRange"/>
-            <xs:element name="UDPPortRange" type="UDPPortRange"/>
-        </xs:choice>
-    </xs:complexType>
-    <xs:complexType name="IPAddressPort">
-        <xs:sequence>
-            <xs:element name="address" type="IPAddress"/>
-            <xs:element name="port" type="Port"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="IPAddressPortRange">
-        <xs:sequence>
-            <xs:element name="address" type="IPAddress"/>
-            <xs:element name="portRange" type="PortRange"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="MACAddress">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="([a-f0-9]{2}:){5}[a-f0-9]{2}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="EmailAddress">
-        <xs:restriction base="ShortString">
-            <xs:pattern value="[a-zA-Z0-9\.!#$%&amp;'\\+\\/=\?\^_`\{\|\}~\-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="UUID">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ISOCountryCode">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="[A-Z]{2}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="SIPURI">
-        <xs:restriction base="xs:anyURI">
-            <xs:pattern value="sips?:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="TELURI">
-        <xs:restriction base="xs:anyURI">
-            <xs:pattern value="tel:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="WGS84CoordinateDecimal">
-        <xs:sequence>
-            <xs:element name="latitude" type="WGS84LatitudeDecimal"/>
-            <xs:element name="longitude" type="WGS84LongitudeDecimal"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="WGS84LatitudeDecimal">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[NS][0-9]{2}\.[0-9]{6}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="WGS84LongitudeDecimal">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[EW][0-9]{3}\.[0-9]{6}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="WGS84CoordinateAngular">
-        <xs:sequence>
-            <xs:element name="latitude" type="WGS84LatitudeAngular"/>
-            <xs:element name="longitude" type="WGS84LongitudeAngular"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="WGS84LatitudeAngular">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[NS][0-9]{6}\.[0-9]{2}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="WGS84LongitudeAngular">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[EW][0-9]{7}\.[0-9]{2}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="SUPIIMSI">
-        <xs:restriction base="IMSI"/>
-    </xs:simpleType>
-    <xs:simpleType name="SUPINAI">
-        <xs:restriction base="NAI"/>
-    </xs:simpleType>
-    <xs:simpleType name="SUCI">
-        <xs:restriction base="xs:hexBinary"/>
-    </xs:simpleType>
-    <xs:simpleType name="PEIIMEI">
-        <xs:restriction base="IMEI"/>
-    </xs:simpleType>
-    <xs:simpleType name="PEIIMEICheckDigit">
-        <xs:restriction base="IMEICheckDigit"/>
-    </xs:simpleType>
-    <xs:simpleType name="PEIIMEISV">
-        <xs:restriction base="IMEISV"/>
-    </xs:simpleType>
-     <xs:simpleType name="GPSIMSISDN">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="[0-9]{1,15}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="GPSINAI">
-        <xs:restriction base="NAI"/>
-    </xs:simpleType>
-    <xs:simpleType name="NAI">
-        <xs:restriction base="xs:string"/>
-    </xs:simpleType>
-    <xs:simpleType name="LDID">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="([A-Z]{2}-.+-.+)"/>
-        </xs:restriction>
-    </xs:simpleType>
-</xs:schema>
\ No newline at end of file
diff --git a/103120/portal/schema/ts_103120v010501p0_Authorisation.xsd b/103120/portal/schema/ts_103120v010801p0_Authorisation.xsd
similarity index 93%
rename from 103120/portal/schema/ts_103120v010501p0_Authorisation.xsd
rename to 103120/portal/schema/ts_103120v010801p0_Authorisation.xsd
index 14b50d7e6005b76431f32dee18b8de5042e968c6..72e87c0407ab6750187b5283c95fbf2ff85fe1d0 100644
--- a/103120/portal/schema/ts_103120v010501p0_Authorisation.xsd
+++ b/103120/portal/schema/ts_103120v010801p0_Authorisation.xsd
@@ -3,8 +3,8 @@
            xmlns:etsi="http://uri.etsi.org/03280/common/2017/07"
            xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common"
            xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
-           xmlns="http://uri.etsi.org/03120/common/2016/02/Authorisation"
-           targetNamespace="http://uri.etsi.org/03120/common/2016/02/Authorisation"
+           xmlns="http://uri.etsi.org/03120/common/2020/09/Authorisation"
+           targetNamespace="http://uri.etsi.org/03120/common/2020/09/Authorisation"
            elementFormDefault="qualified"
            attributeFormDefault="unqualified">
 
@@ -26,7 +26,7 @@
 					<xs:element name="AuthorisationCreationTimestamp" type="etsi:QualifiedDateTime" minOccurs="0"></xs:element>
 					<xs:element name="AuthorisationServedTimestamp" type="etsi:QualifiedDateTime" minOccurs="0"></xs:element>
 					<xs:element name="AuthorisationTerminationTimestamp" type="etsi:QualifiedDateTime" minOccurs="0"></xs:element>
-					<xs:element name="AuthorisationApprovalDetails" type="common:ApprovalDetails" minOccurs="0"></xs:element>
+					<xs:element name="AuthorisationApprovalDetails" type="common:ApprovalDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
 					<xs:element name="AuthorisationInvalidReason" type="core:ActionUnsuccesfulInformation" minOccurs="0"></xs:element>
 					<xs:element name="AuthorisationFlags" type="AuthorisationFlags" minOccurs="0"></xs:element>
 					<xs:element name="AuthorisationManualInformation" type="etsi:LongString" minOccurs="0"></xs:element>
diff --git a/103120/portal/schema/ts_103120v010501p0_Common.xsd b/103120/portal/schema/ts_103120v010801p0_Common.xsd
similarity index 100%
rename from 103120/portal/schema/ts_103120v010501p0_Common.xsd
rename to 103120/portal/schema/ts_103120v010801p0_Common.xsd
diff --git a/103120/portal/schema/ts_103120v010501p0_Core.xsd b/103120/portal/schema/ts_103120v010801p0_Core.xsd
similarity index 100%
rename from 103120/portal/schema/ts_103120v010501p0_Core.xsd
rename to 103120/portal/schema/ts_103120v010801p0_Core.xsd
diff --git a/103120/portal/schema/ts_103120v010501p0_Delivery.xsd b/103120/portal/schema/ts_103120v010801p0_Delivery.xsd
similarity index 100%
rename from 103120/portal/schema/ts_103120v010501p0_Delivery.xsd
rename to 103120/portal/schema/ts_103120v010801p0_Delivery.xsd
diff --git a/103120/portal/schema/ts_103120v010501p0_Document.xsd b/103120/portal/schema/ts_103120v010801p0_Document.xsd
similarity index 93%
rename from 103120/portal/schema/ts_103120v010501p0_Document.xsd
rename to 103120/portal/schema/ts_103120v010801p0_Document.xsd
index 86b719295193146c4dcb25d6a1c5f0d43f366288..af6f13979824aba2c967860b1473bc7df91fac32 100644
--- a/103120/portal/schema/ts_103120v010501p0_Document.xsd
+++ b/103120/portal/schema/ts_103120v010801p0_Document.xsd
@@ -3,8 +3,8 @@
            xmlns:etsi="http://uri.etsi.org/03280/common/2017/07"
            xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common"
            xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
-           xmlns="http://uri.etsi.org/03120/common/2016/02/Document"
-           targetNamespace="http://uri.etsi.org/03120/common/2016/02/Document"
+           xmlns="http://uri.etsi.org/03120/common/2020/09/Document"
+           targetNamespace="http://uri.etsi.org/03120/common/2020/09/Document"
            elementFormDefault="qualified"
            attributeFormDefault="unqualified">
 
@@ -24,7 +24,7 @@
 					<xs:element name="DocumentType" type="common:DictionaryEntry" minOccurs="0"></xs:element>
 					<xs:element name="DocumentProperties" type="DocumentProperties" minOccurs="0"></xs:element>
 					<xs:element name="DocumentBody" type="DocumentBody" minOccurs="0"></xs:element>
-					<xs:element name="DocumentSignature" type="common:ApprovalDetails" minOccurs="0"></xs:element>
+					<xs:element name="DocumentSignature" type="common:ApprovalDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
 					<xs:element name="DocumentInvalidReason" type="core:ActionUnsuccesfulInformation" minOccurs="0"/>
 					<xs:element name="NationalDocumentParameters" type="NationalDocumentParameters" minOccurs="0"></xs:element>
 				</xs:sequence>
diff --git a/103120/portal/schema/ts_103120v010501p0_Notification.xsd b/103120/portal/schema/ts_103120v010801p0_Notification.xsd
similarity index 100%
rename from 103120/portal/schema/ts_103120v010501p0_Notification.xsd
rename to 103120/portal/schema/ts_103120v010801p0_Notification.xsd
diff --git a/103120/portal/schema/ts_103120v010501p0_Task.xsd b/103120/portal/schema/ts_103120v010801p0_Task.xsd
similarity index 97%
rename from 103120/portal/schema/ts_103120v010501p0_Task.xsd
rename to 103120/portal/schema/ts_103120v010801p0_Task.xsd
index ed8974ed70f7bf67d1a97b7b3e445682299c9d56..ae3e65e38bb1acce08c953ff0393154c57f5d217 100644
--- a/103120/portal/schema/ts_103120v010501p0_Task.xsd
+++ b/103120/portal/schema/ts_103120v010801p0_Task.xsd
@@ -3,8 +3,8 @@
            xmlns:etsi="http://uri.etsi.org/03280/common/2017/07"
            xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common"
            xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
-           xmlns="http://uri.etsi.org/03120/common/2019/10/Task"
-           targetNamespace="http://uri.etsi.org/03120/common/2019/10/Task"
+           xmlns="http://uri.etsi.org/03120/common/2020/09/Task"
+           targetNamespace="http://uri.etsi.org/03120/common/2020/09/Task"
            elementFormDefault="qualified"
            attributeFormDefault="unqualified">
 
@@ -23,7 +23,7 @@
 					<xs:element name="TargetIdentifier" type="TargetIdentifier" minOccurs="0"/>
 					<xs:element name="DeliveryType" type="common:DictionaryEntry" minOccurs="0"/>
 					<xs:element name="DeliveryDetails" type="TaskDeliveryDetails" minOccurs="0"/>
-					<xs:element name="ApprovalDetails" type="common:ApprovalDetails" minOccurs="0"/>
+					<xs:element name="ApprovalDetails" type="common:ApprovalDetails" minOccurs="0" maxOccurs="unbounded"/>
 					<xs:element name="CSPID" type="core:EndpointID" minOccurs="0"/>
 					<xs:element name="HandlingProfile" type="common:DictionaryEntry" minOccurs="0"/>
 					<xs:element name="InvalidReason" type="core:ActionUnsuccesfulInformation" minOccurs="0"/>
@@ -123,7 +123,7 @@
 					<xs:element name="DesiredStatus" type="common:DictionaryEntry" minOccurs="0"/>
 					<xs:element name="RequestDetails" type="RequestDetails" minOccurs="0"/>
 					<xs:element name="DeliveryDetails" type="LDDeliveryDetails" minOccurs="0"/>
-					<xs:element name="ApprovalDetails" type="common:ApprovalDetails" minOccurs="0"/>
+					<xs:element name="ApprovalDetails" type="common:ApprovalDetails" minOccurs="0" maxOccurs="unbounded"/>
 					<xs:element name="CSPID" type="core:EndpointID" minOccurs="0"/>
 					<xs:element name="HandlingProfile" type="common:DictionaryEntry" minOccurs="0"/>
 					<xs:element name="Flags" type="LDTaskFlags" minOccurs="0" />
diff --git a/103120/portal/validate_examples.py b/103120/portal/validate_examples.py
deleted file mode 100644
index 60c611ca32a8ec342fc689a351e9960326d6fc3d..0000000000000000000000000000000000000000
--- a/103120/portal/validate_examples.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import glob
-import sys
-from pathlib import Path
-from pprint import pprint
-
-if __name__ == '__main__':
-
-    if sys.version_info <= (3, 5):
-        sys.exit('ERROR: You need at least Python 3.5 to run this tool')
-
-    try:
-        from lxml import etree
-    except ImportError:
-        sys.exit('ERROR: You need to install the Python lxml library')
-
-    try:
-        import xmlschema
-    except ImportError:
-        sys.exit('ERROR: You need to install the xml schema library')
-
-
-    locations = []
-    schemaFiles = glob.glob('schema/*.xsd')
-    for schemaFile in schemaFiles:
-        xs = xmlschema.XMLSchema(schemaFile, validation='skip')
-        locations.append((xs.default_namespace, str(Path(schemaFile))[7:]))
-
-    coreSchema = xmlschema.XMLSchema('schema/ts_103120v010501p0_Core.xsd', locations=locations)
-
-    for schema in schemaFiles:
-        newSchema = xmlschema.XMLSchema(schema, locations=locations)
-        coreSchema.import_schema(newSchema.default_namespace, schema)
-
-    examples = glob.glob('examples/*.xml')
-    for example in examples:
-        try:
-            coreSchema.validate(example)
-            print ("{0} passed validation".format(example))
-        except Exception as ex:
-            print ("{0} failed validation: {1}".format(example, ex))
-
-    print ('Done')
\ No newline at end of file
diff --git a/103120/schema/ts_103120_Delivery.xsd b/103120/schema/ts_103120_Deli.xsd
similarity index 100%
rename from 103120/schema/ts_103120_Delivery.xsd
rename to 103120/schema/ts_103120_Deli.xsd
diff --git a/103120/validate_examples.py b/103120/validate_examples.py
deleted file mode 100644
index 133bad9e9e14f94a17666a9ad5bfb43b2db64c6c..0000000000000000000000000000000000000000
--- a/103120/validate_examples.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import glob
-import sys
-from pathlib import Path
-from pprint import pprint
-
-if __name__ == '__main__':
-
-    if sys.version_info <= (3, 5):
-        sys.exit('ERROR: You need at least Python 3.5 to run this tool')
-
-    try:
-        from lxml import etree
-    except ImportError:
-        sys.exit('ERROR: You need to install the Python lxml library')
-
-    try:
-        import xmlschema
-    except ImportError:
-        sys.exit('ERROR: You need to install the xml schema library')
-
-
-    locations = []
-    schemaFiles = glob.glob('schema/*.xsd')
-    for schemaFile in schemaFiles:
-        xs = xmlschema.XMLSchema(schemaFile, validation='skip')
-        locations.append((xs.default_namespace, str(Path(schemaFile))[7:]))
-
-    etsiSchema = str(Path('../103280/TS_103_280.xsd'))
-    xs = xmlschema.XMLSchema(etsiSchema, validation='skip')
-    locations.append((xs.default_namespace, str(Path("../" + etsiSchema))))
-
-    for location in locations:
-        print (location)
-
-    coreSchema = xmlschema.XMLSchema('schema/ts_103120_Core.xsd', locations=locations)
-
-    for schema in schemaFiles:
-        newSchema = xmlschema.XMLSchema(schema, locations=locations)
-        coreSchema.import_schema(newSchema.default_namespace, schema)
-
-    examples = glob.glob('examples/*.xml')
-    for example in examples:
-        try:
-            coreSchema.validate(example)
-            print ("{0} passed validation".format(example))
-        except Exception as ex:
-            print ("{0} failed validation: {1}".format(example, ex))
-
-    print ('Done')
\ No newline at end of file