diff --git a/public/api/conf/1.0/docs/schema.md b/public/api/conf/1.0/docs/schema.md
index 1dfa7f52..dfc1ea80 100644
--- a/public/api/conf/1.0/docs/schema.md
+++ b/public/api/conf/1.0/docs/schema.md
@@ -4,6 +4,6 @@ Schema definitions for all the API endpoints request and response payloads can b
   <a href="/api-documentation/docs/api/download/customs-inventory-linking-exports/1.0/inventory-linking-exports-schemas.zip" class="govuk-link">Schemas and example messages</a>
 </p>
 
-<p class="govuk-body-s" style="font-size: 16px;margin-bottom: 15px;">ZIP, 2.0MB last updated 17/06/2022</p>
+<p class="govuk-body-s" style="font-size: 16px;margin-bottom: 15px;">ZIP, 2.0MB last updated 20/07/2022</p>
 
 <p class="govuk-body-s" style="font-size: 16px;margin-bottom: 15px;">The ZIP file contains XML files. Open in your preferred file viewer.</p>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/Annotated_Scenario_Descriptions_TTM19.0.1_20220719.xlsx b/public/api/conf/1.0/examples/annotated_XML_samples/Annotated_Scenario_Descriptions_TTM19.0.1_20220719.xlsx
new file mode 100644
index 00000000..627d80c5
Binary files /dev/null and b/public/api/conf/1.0/examples/annotated_XML_samples/Annotated_Scenario_Descriptions_TTM19.0.1_20220719.xlsx differ
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/Annotated_Scenario_Descriptions_TTM19.0_20220616.xlsx b/public/api/conf/1.0/examples/annotated_XML_samples/Annotated_Scenario_Descriptions_TTM19.0_20220616.xlsx
deleted file mode 100644
index b91f5acd..00000000
Binary files a/public/api/conf/1.0/examples/annotated_XML_samples/Annotated_Scenario_Descriptions_TTM19.0_20220616.xlsx and /dev/null differ
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_EX002a/TT_EX002a_v2.0.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_EX002a/TT_EX002a_v2.0.xml
index 8b4f7fbe..d9a1c133 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_EX002a/TT_EX002a_v2.0.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_EX002a/TT_EX002a_v2.0.xml
@@ -242,11 +242,11 @@
 				<LineNumeric>1</LineNumeric>
 			</PreviousDocument>
 		</GoodsShipment>
-		<!--DE 5/27: Supervising customs office. The Supervising Office Code for the
-			   HMRC Office overseeing the Customs Warehouse procedure. In this scenario, this
-			   is Nottingham Customs Office.-->
+		<!--DE 5/27: Supervising Customs Office.
+			In this scenario, this is Nottingham Customs Office. -->
 		<SupervisingOffice>
 			<ID>GBNTG004</ID>
 		</SupervisingOffice>
 	</Declaration>
 </md:MetaData>
+ 
\ No newline at end of file
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_EX002b/TT_EX002a_v2.0.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_EX002b/TT_EX002a_v2.1.xml
similarity index 96%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_EX002b/TT_EX002a_v2.0.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_EX002b/TT_EX002a_v2.1.xml
index 8b4f7fbe..44780345 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_EX002b/TT_EX002a_v2.0.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_EX002b/TT_EX002a_v2.1.xml
@@ -242,9 +242,8 @@
 				<LineNumeric>1</LineNumeric>
 			</PreviousDocument>
 		</GoodsShipment>
-		<!--DE 5/27: Supervising customs office. The Supervising Office Code for the
-			   HMRC Office overseeing the Customs Warehouse procedure. In this scenario, this
-			   is Nottingham Customs Office.-->
+		<!--DE 5/27: Supervising customs office. 
+			In this scenario, this is Nottingham Customs Office. -->
 		<SupervisingOffice>
 			<ID>GBNTG004</ID>
 		</SupervisingOffice>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_EX023a/TT_EX023a_v1.3.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_EX023a/TT_EX023a_v1.4.xml
similarity index 83%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_EX023a/TT_EX023a_v1.3.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_EX023a/TT_EX023a_v1.4.xml
index e88c17eb..810d428e 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_EX023a/TT_EX023a_v1.3.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_EX023a/TT_EX023a_v1.4.xml
@@ -43,19 +43,20 @@
 		<IssueDateTime>
 			<p1:DateTimeString formatCode="304">20210923080000+01</p1:DateTimeString>
 		</IssueDateTime>
-		<!--DE 1/1: EX to represent an Export declaration.-->
-		<!--DE 1/2: A to represent a standard frontier declaration.-->
+		<!--DE 1/1: Declaration Type. 
+			EX to represent an Export declaration. -->
+		<!--DE 1/2: Additional Declaration Type. 
+			A to represent a standard frontier declaration. -->
 		<TypeCode>EXA</TypeCode>
-		<!--DE 1/9: Total number of goods items on the declaration.-->
+		<!--DE 1/9: Total Number of Items. -->
 		<GoodsItemQuantity>1</GoodsItemQuantity>
 		<!--DE 5/26: Customs Office of Presentation. 
-			Note 1: This information is only required when centralised clearance/SASP is being used, and
-			may be removed in the next version of this sample.
+			Note 1: This information is only required when centralised clearance/SASP is being used, and may be removed in the next version of this sample.
 			Note 2: 'DeclarationOfficeID' and 'Declaration/PresentationOffice/ID' are two different fields. DeclarationOfficeID is unassigned from any UCC/Data Element number so this can apply to any Data Element number: in this case 5/26. -->
 		<DeclarationOfficeID>GBLBA001</DeclarationOfficeID>
-		<!--DE 4/11: Total invoice amount. -->
+		<!--DE 4/11: Total Amount Invoiced. -->
 		<InvoiceAmount currencyID="JPY">15000</InvoiceAmount>
-		<!--DE 6/18: Total packages. -->
+		<!--DE 6/18: Total Packages. -->
 		<TotalPackageQuantity>50</TotalPackageQuantity>
 		<!--DE 3/39: Holder of the authorisation identification number. 
 			OPO indicates authorisation for the use of outward processing procedure. -->
@@ -63,7 +64,7 @@
 			<ID>GB896458895023</ID>
 			<CategoryCode>OPO</CategoryCode>
 		</AuthorisationHolder>
-		<!--DE 3/39: Holder of the authorisation identification number.
+		<!--DE 3/39: Holder of the Authorisation Identification Number.
 			An authorisation type code of CSE indicates Customs Supervised Exports authorisation issued by the competent authorities of the Member States. -->
 		<AuthorisationHolder>
 			<ID>GB896458895023</ID>
@@ -89,11 +90,12 @@
 					<PostcodeID>SE1 7PB</PostcodeID>
 				</Address>
 			</Carrier>
-			<!-- DE 4/2: Transport charges method of payment. C indicating payment by cheque. -->
+			<!--DE 4/2: Transport charges method of payment. 
+				C indicating payment by cheque. -->
 			<Freight>
 				<PaymentMethodCode>C</PaymentMethodCode>
 			</Freight>
-			<!-- DE 5/18: Countries of routing codes. 
+			<!--DE 5/18: Countries of Routing Codes. 
 				GBJP Routing from GB to JP. 
 				This is Security and Safety Data. -->
 			<Itinerary>
@@ -105,20 +107,22 @@
 				<RoutingCountryCode>JP</RoutingCountryCode>
 			</Itinerary>
 		</Consignment>
-		<!--DE 3/18: EORI number of the Declarant. -->
+		<!--DE 3/18: Declarant Identification Number.  
+			EORI number of the Declarant. -->
 		<Declarant>
 			<ID>GB896458895023</ID>
 		</Declarant>
-		<!--DE 5/12 Customs office of exit. -->
+		<!--DE 5/12: Customs Office of Exit. -->
 		<ExitOffice>
 			<ID>GB000051</ID>
 		</ExitOffice>
-		<!--DE 3/2: EORI number of the Exporter, the same as 3/18. -->
+		<!--DE 3/2: Exporter Identification Number. 
+			EORI number of the Exporter, the same as 3/18. -->
 		<Exporter>
 			<ID>GB896458895023</ID>
 		</Exporter>
 		<GoodsShipment>
-			<!-- DE 3/9: Consignee name and address details. -->
+			<!--DE 3/9: Consignee Name and Address. -->
 			<Consignee>
 				<Name>Tokyo Export</Name>
 				<Address>
@@ -129,16 +133,19 @@
 				</Address>
 			</Consignee>
 			<Consignment>
-				<!--DE 7/2: 1 to indicate that the goods are transported in containers. -->
+				<!--DE 7/2: Container. 
+					1 to indicate that the goods are transported in containers. -->
 				<ContainerCode>1</ContainerCode>
-				<!--DE 7/7: ID of the means of transport. -->
-				<!--DE 7/5: '3' indicating lorry from CSE location to the ship/boat. -->
+				<!--DE 7/7: Identity of the means of transport at departure. -->
+				<!--DE 7/5: Inland Mode of Transport. 
+					'3' indicating lorry from CSE location to the ship/boat. -->
 				<DepartureTransportMeans>
 					<ID>123</ID>
 					<IdentificationTypeCode>10</IdentificationTypeCode>
 					<ModeCode>3</ModeCode>
 				</DepartureTransportMeans>
-				<!--DE 5/23: ID to give a unique position of the location.
+				<!--DE 5/23: Location of Goods. 
+					ID to give a unique position of the location.
 					FXTFXTFXT Indicating Felixstowe. -->
 				<GoodsLocation>
 					<Name>FXTFXTFXT</Name>
@@ -153,19 +160,19 @@
 						Sequence number and ID of the container. -->
 					<SequenceNumeric>1</SequenceNumeric>
 					<ID>Container123</ID>
-					<!--DE 7/18: Seal sequence number 1, then seal number. -->
+					<!--DE 7/18: Seal number. -->
 					<Seal>
 						<SequenceNumeric>1</SequenceNumeric>
 						<ID>12345</ID>
 					</Seal>
 				</TransportEquipment>
 			</Consignment>
-			<!--DE 5/8: Country code of the destination country.
+			<!--DE 5/8: Country of Destination Code.
 				JP Indicating Indicating Japan. -->
 			<Destination>
 				<CountryCode>JP</CountryCode>
 			</Destination>
-			<!--DE 5/14: Country of Destination Code.
+			<!--DE 5/14: Country of Dispatch/Export Code. 
 				In this case GB. -->
 			<ExportCountry>
 				<ID>GB</ID>
@@ -196,7 +203,7 @@
 					<ID>GBCSE896458895023E</ID>
 					<TypeCode>019</TypeCode>
 				</AdditionalDocument>
-				<!--DE 2/2: Additional information. 
+				<!--DE 2/2: Additional Information. 
 					00400 Indicating Self representation i.e. the declarant and the exporter are the same party. -->
 				<AdditionalInformation>
 					<StatementCode>00400</StatementCode>
@@ -204,23 +211,23 @@
 					<StatementTypeCode>ACB</StatementTypeCode>
 				</AdditionalInformation>
 				<Commodity>
-					<!--DE 6/8: Description of the goods. -->
+					<!--DE 6/8: Description of Goods. -->
 					<Description>Straw envelopes for bottles</Description>
-					<!--DE 6/14: Commodity code - combined nomenclature code. -->
+					<!--DE 6/14: Commodity Code - Combined Nomenclature Code. -->
 					<Classification>
 						<ID>46021910</ID>
 						<IdentificationTypeCode>TSP</IdentificationTypeCode>
 					</Classification>
 					<GoodsMeasure>
 						<!--DE 6/5: Gross Mass.
-							Mass of the goods in kilograms including packaging. -->
+							Weight of the goods in kilograms including packaging. -->
 						<GrossMassMeasure unitCode="KGM">700</GrossMassMeasure>
 						<!--DE 6/1: Net Mass. 
-							Mass of the goods in kilograms without any packaging. -->
+							Weight of the goods in kilograms without any packaging. -->
 						<NetNetWeightMeasure unitCode="KGM">500</NetNetWeightMeasure>
 					</GoodsMeasure>
 				</Commodity>
-				<!--DE 1/10: Procedure Code.
+				<!--DE 1/10: Procedure.
 					Requested procedure of 2100 indicating temporary export under outward processing where the goods have not been subject to any previous procedure. -->
 				<GovernmentProcedure>
 					<CurrentCode>21</CurrentCode>
@@ -244,7 +251,7 @@
 					<TypeCode>BX</TypeCode>
 				</Packaging>
 			</GovernmentAgencyGoodsItem>
-			<!--DE 2/1: Simplified Declaration/ Previous Documents .
+			<!--DE 2/1: Simplified Declaration/ Previous Documents.
 				Previous document to show the DUCR assigned to the consignment. -->
 			<PreviousDocument>
 				<CategoryCode>Z</CategoryCode>
@@ -254,7 +261,6 @@
 			</PreviousDocument>
 		</GoodsShipment>
 		<!--DE 5/27: Supervising Customs Office. 
-			The Supervising Office Code for the HMRC Office overseeing the Customs Warehouse procedure. 
 			ID GBBEL004 is Belfast, Dorchester House (NIRU). -->
 		<SupervisingOffice>
 			<ID>GBBEL004</ID>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI001a/TT_FI001a_v1.6.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI001a/TT_FI001a_v1.7.xml
similarity index 96%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_FI001a/TT_FI001a_v1.6.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_FI001a/TT_FI001a_v1.7.xml
index 7346ea57..e8f5e92d 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI001a/TT_FI001a_v1.6.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI001a/TT_FI001a_v1.7.xml
@@ -192,9 +192,9 @@
 					<MethodCode>1</MethodCode>
 				</CustomsValuation>
 				<GovernmentProcedure>
-					<!--DE 1/10: Requested Procedure of 40 indicating Release to free circulation where goods are released from a customs warehouse.-->
+					<!--DE 1/10: Requested Procedure of 40 indicating there is no previous procedure. -->
 					<CurrentCode>40</CurrentCode>
-					<!--DE 1/10: Previous Procedure of 00 indicating there is no previous procedure-->
+					<!--DE 1/10: Previous Procedure of 00 indicating there is no previous procedure. -->
 					<PreviousCode>00</PreviousCode>
 				</GovernmentProcedure>
 				<!--DE 1/11: Additional Procedure.
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI001b/TT_FI001b_v1.5.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI001b/TT_FI001b_v1.6.xml
similarity index 96%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_FI001b/TT_FI001b_v1.5.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_FI001b/TT_FI001b_v1.6.xml
index 2738f769..9ab267a4 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI001b/TT_FI001b_v1.5.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI001b/TT_FI001b_v1.6.xml
@@ -189,9 +189,9 @@
 					<MethodCode>1</MethodCode>
 				</CustomsValuation>
 				<GovernmentProcedure>
-					<!--DE 1/10: Requested Procedure of 40 indicating Release to free circulation where goods are released from a customs warehouse. -->
+					<!--DE 1/10: Requested Procedure of 40 indicating there is no previous procedure. -->
 					<CurrentCode>40</CurrentCode>
-					<!--DE 1/10: Previous Procedure of 00 indicating placing of goods under the customs warehousing procedure. -->
+					<!--DE 1/10: Previous Procedure of 00 indicating there is no previous procedure. -->
 					<PreviousCode>00</PreviousCode>
 				</GovernmentProcedure>
 				<!--DE 1/11: C28 to indicate simultaneous release for free circulation and home use of goods imported. -->
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI002a/TT_FI002a_v1.6.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI002a/TT_FI002a_v1.7.xml
similarity index 96%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_FI002a/TT_FI002a_v1.6.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_FI002a/TT_FI002a_v1.7.xml
index 44ce1c4e..e0ca508d 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI002a/TT_FI002a_v1.6.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI002a/TT_FI002a_v1.7.xml
@@ -96,8 +96,7 @@
 					<IdentificationTypeCode>10</IdentificationTypeCode>
 				</ArrivalTransportMeans>
 				<GoodsLocation>
-					<!--DE 5/23: Location of Goods - Identification of location.
-						The location code for the Customs Warehouse. 
+					<!--DE 5/23: Location of Goods - Identification of location. 
 						Note that this declaration uses a frontier declaration at Wallasea Island, Baltic Wharf (NILP) for test purposes only: for business use a pre-lodged declaration must be submitted because Baltic Wharf is listed as an 'Other listed location'. -->
 					<Name>WLALONBTW</Name>
 					<!--DE 5/23: Location of Goods - Type of location.
@@ -278,8 +277,7 @@
 					<!--DE 1/10: Requested Procedure of 44 indicating Release to free circulation with duty 
 						relief granted under the End Use Special Procedure.-->
 					<CurrentCode>44</CurrentCode>
-					<!--DE 1/10: Previous Procedure of 00 indicating there is no Previous Procedure a 
-						customs warehouse.-->
+					<!--DE 1/10: Previous Procedure of 00 indicating there is no Previous Procedure. -->
 					<PreviousCode>00</PreviousCode>
 				</GovernmentProcedure>
 				<!--DE 1/11: Goods imported under the shipwork end-use procedure.-->
@@ -353,9 +351,9 @@
 			<SecurityDetailsCode>3</SecurityDetailsCode>
 		</ObligationGuarantee>
 		<SupervisingOffice>
-			<!--DE 5/27: Supervising customs office. The Supervising Office Code for the HMRC Office 
-				overseeing the Customs Warehouse procedure. 
-				In this scenario, this is Belfast, Dorchester House (NIRU).-->
+			<!--DE 5/27: Supervising customs office. 
+				The Supervising Office Code for the HMRC Office. 
+				In this scenario, this is Belfast, Dorchester House (NIRU). -->
 			<ID>GBBEL004</ID>
 		</SupervisingOffice>
 	</Declaration>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI005a/TT_FI005a_v1.5.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI005a/TT_FI005a_v1.6.xml
similarity index 96%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_FI005a/TT_FI005a_v1.5.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_FI005a/TT_FI005a_v1.6.xml
index 33065157..d80816ba 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI005a/TT_FI005a_v1.5.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI005a/TT_FI005a_v1.6.xml
@@ -112,9 +112,7 @@
 						linked location.
 						Note that this declaration uses a frontier declaration at Wallasea Island, Baltic Wharf (NILP) for test purposes only: for business use a pre-lodged declaration must be submitted because Baltic Wharf is listed as an 'Other listed location'. -->
 					<Name>WLALONBTW</Name>
-					<!--DE 5/23: Location of Goods - Type of location.
-						Type of Location - B is used to identify inland locations such as 
-						customs warehouses.-->
+					<!--DE 5/23: Location of Goods - Type of location.-->
 					<TypeCode>A</TypeCode>
 					<Address>
 						<!--DE 5/23: Location of Goods - Qualifier of the identification.
@@ -235,8 +233,7 @@
 					<!--DE 1/10: Requested Procedure of 44 indicating Release to free circulation with 
 						duty relief granted under the End Use Special Procedure. -->
 					<CurrentCode>44</CurrentCode>
-					<!--DE 1/10: Previous Procedure of 00 indicating there is no Previous Procedure a 
-						customs warehouse.-->
+					<!--DE 1/10: Previous Procedure of 00 indicating there is no Previous Procedure. -->
 					<PreviousCode>00</PreviousCode>
 				</GovernmentProcedure>
 				<!--DE 1/11: 000 to indicate no additional procedure.-->
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI005b/TT_FI005b_v1.4.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI005b/TT_FI005b_v1.5.xml
similarity index 95%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_FI005b/TT_FI005b_v1.4.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_FI005b/TT_FI005b_v1.5.xml
index 5ebae08a..d1156508 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI005b/TT_FI005b_v1.4.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI005b/TT_FI005b_v1.5.xml
@@ -96,11 +96,9 @@
 				</ArrivalTransportMeans>
 				<GoodsLocation>
 					<!--DE 5/23: Location of Goods - Identification of location.
-						The location code for the Customs Warehouse.
 						Note that this declaration uses a frontier declaration at Wallasea Island, Baltic Wharf (NILP) for test purposes only: for business use a pre-lodged declaration must be submitted because Baltic Wharf is listed as an 'Other listed location'. -->
 					<Name>WLALONBTW</Name>
-					<!--DE 5/23: Location of Goods - Type of location.
-						B is used to identify inland locations such as customs warehouses. -->
+					<!--DE 5/23: Location of Goods - Type of location. -->
 					<TypeCode>A</TypeCode>
 					<Address>
 						<!--DE 5/23: Location of Goods - Qualifier of the identification.
@@ -210,8 +208,7 @@
 					<!--DE 1/10: Procedure.
 						Requested Procedure of 44 indicating Release to free circulation with duty relief granted under the End Use Special Procedure. -->
 					<CurrentCode>44</CurrentCode>
-					<!--DE 1/10: Procedure.
-						Previous Procedure of 00 indicating there is no Previous Procedure a customs warehouse. -->
+					<!--DE 1/10: Procedure. -->
 					<PreviousCode>00</PreviousCode>
 				</GovernmentProcedure>
 				<!--DE 1/11: Additional Procedure Code.
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM002c/TT_IM002c_Complex_Multi_Amendment_v1.3.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM002c/TT_IM002c_Complex_Multi_Amendment_v1.3.xml
new file mode 100644
index 00000000..a43ec8ae
--- /dev/null
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM002c/TT_IM002c_Complex_Multi_Amendment_v1.3.xml
@@ -0,0 +1,270 @@
+<md:MetaData
+      xmlns="urn:wco:datamodel:WCO:DEC-DMS:2"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xmlns:clm63055="urn:un:unece:uncefact:codelist:standard:UNECE:AgencyIdentificationCode:D12B"
+      xmlns:ds="urn:wco:datamodel:WCO:MetaData_DS-DMS:2"
+      xmlns:md="urn:wco:datamodel:WCO:DocumentMetaData-DMS:2"
+      xsi:schemaLocation="urn:wco:datamodel:WCO:DocumentMetaData-DMS:2 ../DocumentMetaData_2_DMS.xsd "    >
+			<md:WCODataModelVersionCode>3.6</md:WCODataModelVersionCode>
+			<md:WCOTypeName>DEC</md:WCOTypeName>
+			<md:ResponsibleCountryCode>GB</md:ResponsibleCountryCode>
+			<md:ResponsibleAgencyName>HMRC</md:ResponsibleAgencyName>
+			<md:AgencyAssignedCustomizationVersionCode>v2.1</md:AgencyAssignedCustomizationVersionCode>
+			<Declaration
+        xmlns="urn:wco:datamodel:WCO:DEC-DMS:2"
+        xmlns:clm5ISO42173A="urn:un:unece:uncefact:codelist:standard:ISO:ISO3AlphaCurrencyCode:2012-08-31"
+        xmlns:clm63055="urn:un:unece:uncefact:codelist:standard:UNECE:AgencyIdentificationCode:D12B"
+        xmlns:p1="urn:wco:datamodel:WCO:Declaration_DS:DMS:2"
+        xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:6"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="urn:wco:datamodel:WCO:DEC-DMS:2 ../WCO_DEC_2_DMS.xsd " >
+				<!--Function Code of 13 to represent Request (Additional Message). -->
+				<FunctionCode>13</FunctionCode>
+				<!--The trader assigned reference to the additional message. 
+					Note that this reference is independent of the declaration. -->
+				<FunctionalReferenceID>TT_IM02c_0307_886</FunctionalReferenceID>
+				<!--Declaration ID of the corresponding Declaration to be amended. -->
+				<ID>20GB7BKUHU20XX8PR5</ID>
+				<!--Defines the type of additional message.
+					In this scenario, COR to indicate that this additional message is an amendment. -->
+				<TypeCode>COR</TypeCode>
+				<TotalPackageQuantity>53</TotalPackageQuantity>						<!-- 146 -->
+				<AdditionalInformation>
+					<StatementDescription>Amend TotalPackageQuantity DE 6/18 - Tag 146</StatementDescription>
+					<!--TotalPackageQuantity -->
+					<StatementTypeCode>AES</StatementTypeCode>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>06A</DocumentSectionCode>
+					</Pointer>
+				</AdditionalInformation>    
+				<AdditionalInformation>
+					<!--Textual description of the reason for amendment. -->
+					<StatementDescription>Amend Exporter Name Tag R031</StatementDescription>
+					<!--Exporter/Name -->
+					<!--The type of Additional Information. 
+						'AES' should always be used or Cancellations and Amendments to indicate a free text reason is being provided. -->
+					<StatementTypeCode>AES</StatementTypeCode>
+					<!--The two pointer elements below point to the Declaration (42A) and the Amendment (06A) in the Declaration (which can be seen below).
+                        This is so that the textual description can be linked to its corresponding amendment reason code. -->
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>2</SequenceNumeric>
+						<DocumentSectionCode>06A</DocumentSectionCode>
+					</Pointer>
+				</AdditionalInformation>
+				<AdditionalInformation>
+					<!--Textual description of the reason for amendment. -->
+					<StatementDescription>Amend Exporter CityName Tag 241</StatementDescription>
+					<!--CityName -->
+					<!--The type of Additional Information. 
+						'AES' should always be used for Cancellations and Amendments to indicate a free text reason is being provided. -->
+					<StatementTypeCode>AES</StatementTypeCode>
+					<!--The two pointer elements below point to the Declaration (42A) and the Amendment (06A) in the Declaration (which can be seen below).
+                        This is so that the textual description can be linked to its corresponding amendment reason code. -->
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>3</SequenceNumeric>
+						<DocumentSectionCode>06A</DocumentSectionCode>
+					</Pointer>
+				</AdditionalInformation>
+				<AdditionalInformation>
+					<!--Textual description of the reason for amendment. -->
+					<StatementDescription>Amend Exporter Address Line Tag 239</StatementDescription>
+					<!--Line -->
+					<!--The type of Additional Information. 
+						'AES' should always be used for Cancellations and Amendments to indicate a free text reason is being provided.-->
+					<StatementTypeCode>AES</StatementTypeCode>
+					<!--The two pointer elements below point to the Declaration (42A) and the Amendment (06A) in the Declaration (which can be seen below).
+                        This is so that the textual description can be linked to its corresponding amendment reason code. -->
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>4</SequenceNumeric>
+						<DocumentSectionCode>06A</DocumentSectionCode>
+					</Pointer>
+				</AdditionalInformation>
+				<AdditionalInformation>
+					<!--Textual description of the reason for amendment-->
+					<StatementDescription>Amend Exporter Postal Code Tag 245</StatementDescription>
+					<!--PostcodeID-->
+					<!--The type of Additional Information. 
+						'AES' should always be used for Cancellations and Amendments to indicate a free text reason is being provided. -->
+					<StatementTypeCode>AES</StatementTypeCode>
+					<!--The two pointer elements below point to the Declaration (42A) and the Amendment (06A) in the Declaration (which can be seen below).
+                        This is so that the textual description can be linked to its corresponding amendment reason code. -->
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>5</SequenceNumeric>
+						<DocumentSectionCode>06A</DocumentSectionCode>
+					</Pointer>
+				</AdditionalInformation>
+				<AdditionalInformation>
+					<StatementDescription>Amend QuantityQuantity DE 6/10 - Tag 144</StatementDescription>
+					<!--QtyQty-->
+					<StatementTypeCode>AES</StatementTypeCode>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>6</SequenceNumeric>
+						<DocumentSectionCode>06A</DocumentSectionCode>
+					</Pointer>
+				</AdditionalInformation>                            
+				<!-- *********************************************************************************************** -->
+				<Amendment>
+					<!--Change Reason Code.
+						Used to indicate the reason for the amendment. 
+						In this scenario, a code of 28 to indicate reason for amendment in this case 'Amend weight or quantity'. -->
+					<ChangeReasonCode>28</ChangeReasonCode>
+					<!--Pointers describe the declaration tree down to the part of the Declaration which needs to be amended as follows: 
+                        Declaration (42A) -> Tag 146 for TotalPackageQuantityQuantity. -->
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+						<TagID>146</TagID>
+						<!--TotalPackageQuantity -->
+					</Pointer>
+				</Amendment>
+				<!--Details of the amendment to be made to the Declaration. -->
+				<Amendment>
+					<!--Used to indicate the reason for the amendment - in this scenario, a code of 29 to indicate that consignee/consignor is being amended. -->
+					<ChangeReasonCode>29</ChangeReasonCode>
+					<!--Pointers describe the declaration tree down to the part of the Declaration which needs to be amended as follows:
+						Declaration (42A) ->
+							Exporter (57A) ->  
+								Exporter/Address (04A) -->              
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>2</SequenceNumeric>
+						<DocumentSectionCode>57A</DocumentSectionCode>
+						<TagID>R031</TagID>
+						<!--Exporter/Name -->
+					</Pointer>
+				</Amendment>
+				<Amendment>
+					<ChangeReasonCode>29</ChangeReasonCode>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>57A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>3</SequenceNumeric>
+						<DocumentSectionCode>04A</DocumentSectionCode>                 
+						<TagID>241</TagID>
+						<!--CityName -->
+					</Pointer>
+				</Amendment>
+				<Amendment>
+					<ChangeReasonCode>29</ChangeReasonCode>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>57A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>4</SequenceNumeric>
+						<DocumentSectionCode>04A</DocumentSectionCode>                 
+						<TagID>239</TagID>
+						<!--Address Line -->
+					</Pointer>
+				</Amendment>
+				<Amendment>
+					<ChangeReasonCode>29</ChangeReasonCode>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>57A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>5</SequenceNumeric>
+						<DocumentSectionCode>04A</DocumentSectionCode>                 
+						<TagID>245</TagID>
+						<!--PostcodeID -->
+					</Pointer>
+				</Amendment>
+				<!--End of Exporter Name and Address. -->
+				<!--Details of the QuantityQuantity amendment to be made to the Declaration. -->
+				<Amendment>
+					<!--Change Reason Code - Used to indicate the reason for the amendment. 
+                        In this scenario, a code of 28 to indicate reason for amendment in this case 'Amend weight or quantity'. -->
+					<ChangeReasonCode>28</ChangeReasonCode>
+					<!--Pointers describe the declaration tree down to the part of the Declaration which needs to be amended as follows: 
+							Declaration (42A) -> 
+								GoodsShipment (67A) -> 
+									GovernmentAgencyGoodsItem (68A) -> 
+										Packaging (93A) -> 
+										   Tag 144 for QuantityQuantity -->
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>67A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>68A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>93A</DocumentSectionCode>
+						<TagID>144</TagID>
+						<!--QuantityQuantity -->
+					</Pointer>
+				</Amendment>
+				<!--***********************************************************************************-->
+				<!--The details below refer to the Declaration data that is being amended. 
+                    As described by the pointer structure above, the information below maps to the element being amended. -->
+				<Exporter>
+					<Name>Detroit Cocoa Company</Name>								<!--R031 -->       
+					<Address>														<!--04A -->
+						<CityName>Detroit</CityName>								<!--241 -->
+						<CountryCode>US</CountryCode>	
+						<Line>101 Peterboro Avenue</Line>							<!--239 -->
+						<PostcodeID>48201</PostcodeID>								<!--245 -->
+					</Address>
+				</Exporter>
+				<GoodsShipment>		
+					<GovernmentAgencyGoodsItem>
+						<SequenceNumeric>1</SequenceNumeric>
+						<Packaging>
+							<SequenceNumeric>1</SequenceNumeric>
+							<MarksNumbersID>PK12345</MarksNumbersID>
+							<QuantityQuantity>53</QuantityQuantity>					<!--144 -->
+							<TypeCode>IG</TypeCode>
+						</Packaging>
+					</GovernmentAgencyGoodsItem>
+				</GoodsShipment>
+			</Declaration>
+		</md:MetaData>
\ No newline at end of file
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM009a/TT_IM009a_v2.5.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM009a/TT_IM009a_v2.6.xml
similarity index 97%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM009a/TT_IM009a_v2.5.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM009a/TT_IM009a_v2.6.xml
index 10daabbb..38503083 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM009a/TT_IM009a_v2.5.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM009a/TT_IM009a_v2.6.xml
@@ -336,9 +336,8 @@
 			<SecurityDetailsCode>1</SecurityDetailsCode>
 		</ObligationGuarantee>
 		<SupervisingOffice>
-			<!--DE 5/27: Supervising customs office. The Supervising Office Code for the
-			  HMRC Office overseeing the Customs Warehouse procedure. In this scenario, this
-			  is Belfast, Dorchester House (NIRU).-->
+			<!--DE 5/27: Supervising Customs Office. 
+				In this scenario, this is Belfast, Dorchester House (NIRU). -->
 			<ID>GBBEL004</ID>
 		</SupervisingOffice>
 	</Declaration>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM009b/TT_IM009b_v2.2.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM009b/TT_IM009b_v2.3.xml
similarity index 95%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM009b/TT_IM009b_v2.2.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM009b/TT_IM009b_v2.3.xml
index 3f398dbb..058e80b0 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM009b/TT_IM009b_v2.2.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM009b/TT_IM009b_v2.3.xml
@@ -88,15 +88,14 @@
 				</ArrivalTransportMeans>
 				<GoodsLocation>
 					<!--DE 5/23: Location of Goods - Identification of location. 
-						The location code for the Customs Warehouse. 
 						Note that this declaration uses a frontier declaration at Wallasea Island, Baltic Wharf (NILP) for test purposes only: for business use a pre-lodged declaration must be submitted because Baltic Wharf is listed as an 'Other listed location'. -->
 					<Name>WLALONBTW</Name>
 					<!--DE 5/23: Location of Goods - Type of location.
-						B is used to identify inland locations such as customs warehouses. -->
+						A is used to identify Frontier or Frontier linker locations such as Airports, ITSFs etc. -->
 					<TypeCode>A</TypeCode>
 					<Address>
 						<!--DE 5/23: Location of Goods - Qualifier of the identification.
-							Type of ID of the Location - Y is used where the goods location is identified by an authorisation number. -->
+							Type of ID of the Location - U is used where the goods location is identified by an authorisation number. -->
 						<TypeCode>U</TypeCode>
 						<!--DE 5/23: Location of Goods - Country.
 							Country code of the country where the goods may be examined, GB in this scenario. -->
@@ -204,7 +203,7 @@
 				<GovernmentProcedure>
 					<!--DE 1/10: Requested Procedure of 44 indicating Release to free circulation with duty relief granted under the End Use Special Procedure.-->
 					<CurrentCode>44</CurrentCode>
-					<!--DE 1/10: Previous Procedure of 00 indicating there is no Previous Procedure a customs warehouse.-->
+					<!--DE 1/10: Previous Procedure of 00 indicating there is no Previous Procedure. -->
 					<PreviousCode>00</PreviousCode>
 				</GovernmentProcedure>
 				<!--DE 1/11: 000 to indicate no additional procedure.-->
@@ -255,7 +254,8 @@
 			<SecurityDetailsCode>1</SecurityDetailsCode>
 		</ObligationGuarantee>
 		<SupervisingOffice>
-			<!--DE 5/27: Supervising customs office. The Supervising Office Code for the HMRC Office overseeing the Customs Warehouse procedure. In this scenario, this is Belfast, Dorchester House (NIRU).-->
+			<!--DE 5/27: Supervising customs office.
+				In this scenario, this is Belfast, Dorchester House (NIRU). -->
 			<ID>GBBEL004</ID>
 		</SupervisingOffice>
 	</Declaration>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM026a/TT_IM026a_v1.8.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM026a/TT_IM026a_v1.9.xml
similarity index 96%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM026a/TT_IM026a_v1.8.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM026a/TT_IM026a_v1.9.xml
index c37886d4..ba1c5817 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM026a/TT_IM026a_v1.8.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM026a/TT_IM026a_v1.9.xml
@@ -19,6 +19,10 @@
 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 			xsi:schemaLocation="urn:wco:datamodel:WCO:DEC-DMS:2 ../WCO_DEC_2_DMS.xsd " >
 		<!--
+			***
+			Following TTM19.0.1, the A50 and A70 Tax Types have altered due to exchange rate variances. However, a security amount is expected for the CAP Safeguard duty, which is not being applied. This is because the item value is now less than the representative price. Therefore, no security is charged, just CAP Safeguarding and third country duty. A sample update so that the security amount is charged is planned for TTM20.0.
+			***
+			
 			SCENARIO
 			GB-NI 'At Risk' - CAP Safeguarding Duties
 
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM029a/TT_IM029a_v1.3.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM029a/TT_IM029a_v1.4.xml
similarity index 97%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM029a/TT_IM029a_v1.3.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM029a/TT_IM029a_v1.4.xml
index 0a84b519..b513d1cd 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM029a/TT_IM029a_v1.3.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM029a/TT_IM029a_v1.4.xml
@@ -418,8 +418,7 @@
 			<SecurityDetailsCode>0</SecurityDetailsCode>
 		</ObligationGuarantee>
 		<!--DE 5/27: Supervising customs office. 
-				The Supervising Office Code for the HMRC Office overseeing the Customs Warehouse procedure. 
-				In this scenario, this is Belfast, Erskine House (NIRU)-->
+			In this scenario, this is Belfast, Erskine House (NIRU)-->
 		<SupervisingOffice>
 			<ID>GBBEL004</ID>
 		</SupervisingOffice>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/02._DMSTAX.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/01_DMSTAX.xml
similarity index 66%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/02._DMSTAX.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/01_DMSTAX.xml
index 7689ff27..769f77b4 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/02._DMSTAX.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/01_DMSTAX.xml
@@ -1,9 +1,4 @@
-<!--
-	***
-	Following the TTM18.0.2 Tariff data refresh, this scenario now attracts Definitive Anti-Dumping Duties (DADD) instead of Provisional Anti-Dumping Duties (PADD). As a result the Tax Type in the DMSTAX notifications will now show A80 instead of A85 and the duty calculations will be different. The sample will be updated to use a scenario that attracts PADD for TTM19.0.
-	***
-	-->
-	<MetaData>
+<MetaData>
     <WCODataModelVersionCode>3.6</WCODataModelVersionCode>
     <WCOTypeName>RES</WCOTypeName>
     <ResponsibleCountryCode/>
@@ -12,20 +7,20 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>13</FunctionCode>
-        <FunctionalReferenceID>6d252a035dcc4fb29f41808e62b3d418</FunctionalReferenceID>
+        <FunctionalReferenceID>c51c639882af45a3a303cb3b62a2db29</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20211213170501Z</DateTimeString>
+            <DateTimeString>20220718130936+01</DateTimeString>
         </IssueDateTime>
         <Bank>
-            <ReferenceID>CITIGB2LLON</ReferenceID>
-            <ID>GB25CITI08320011963155</ID>
+            <ReferenceID>BARCGB22</ReferenceID>
+            <ID>GB16BARC20051723372545</ID>
         </Bank>
         <Status>
             <NameCode>67</NameCode>
         </Status>
         <Declaration>
-            <FunctionalReferenceID>TT_IM33a_v1.5_1312_01</FunctionalReferenceID>
-            <ID>21GBDREYWQ4SK8DJR2</ID>
+            <FunctionalReferenceID>TT_IM33a_v1.5_1807_02</FunctionalReferenceID>
+            <ID>22GB7VN8X2CS2PXAR2</ID>
             <VersionID>1</VersionID>
             <GoodsShipment>
                 <GovernmentAgencyGoodsItem>
@@ -46,22 +41,22 @@
                             <AdValoremTaxBaseAmount currencyID="GBP">5000.00</AdValoremTaxBaseAmount>
                             <DeductAmount currencyID="GBP">0.00</DeductAmount>
                             <DutyRegimeCode>100</DutyRegimeCode>
-                            <TaxRateNumeric>50.60</TaxRateNumeric>
-                            <TypeCode>A85</TypeCode>
+                            <TaxRateNumeric>50.70</TaxRateNumeric>
+                            <TypeCode>A80</TypeCode>
                             <Payment>
-                                <TaxAssessedAmount currencyID="GBP">0.00</TaxAssessedAmount>
-                                <PaymentAmount currencyID="GBP">0.00</PaymentAmount>
+                                <TaxAssessedAmount currencyID="GBP">2535.00</TaxAssessedAmount>
+                                <PaymentAmount currencyID="GBP">2535.00</PaymentAmount>
                             </Payment>
                         </DutyTaxFee>
                         <DutyTaxFee>
-                            <AdValoremTaxBaseAmount currencyID="GBP">135.00</AdValoremTaxBaseAmount>
+                            <AdValoremTaxBaseAmount currencyID="GBP">2670.00</AdValoremTaxBaseAmount>
                             <DeductAmount currencyID="GBP">0.00</DeductAmount>
                             <DutyRegimeCode>100</DutyRegimeCode>
                             <TaxRateNumeric>20.00</TaxRateNumeric>
                             <TypeCode>B05</TypeCode>
                             <Payment>
-                                <TaxAssessedAmount currencyID="GBP">27.00</TaxAssessedAmount>
-                                <PaymentAmount currencyID="GBP">27.00</PaymentAmount>
+                                <TaxAssessedAmount currencyID="GBP">534.00</TaxAssessedAmount>
+                                <PaymentAmount currencyID="GBP">534.00</PaymentAmount>
                             </Payment>
                         </DutyTaxFee>
                         <DutyTaxFee>
@@ -75,18 +70,6 @@
                                 <PaymentAmount currencyID="GBP">1000.00</PaymentAmount>
                             </Payment>
                         </DutyTaxFee>
-                        <DutyTaxFee>
-                            <TypeCode>PDD</TypeCode>
-                            <Payment>
-                                <TaxAssessedAmount currencyID="GBP">506.00</TaxAssessedAmount>
-                            </Payment>
-                        </DutyTaxFee>
-                        <DutyTaxFee>
-                            <TypeCode>PDD</TypeCode>
-                            <Payment>
-                                <TaxAssessedAmount currencyID="GBP">2530.00</TaxAssessedAmount>
-                            </Payment>
-                        </DutyTaxFee>
                     </Commodity>
                 </GovernmentAgencyGoodsItem>
             </GoodsShipment>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/01._DMSACC.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/02_DMSACC.xml
similarity index 61%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/01._DMSACC.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/02_DMSACC.xml
index 8655bcbd..39b67b98 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/01._DMSACC.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/02_DMSACC.xml
@@ -7,16 +7,16 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>01</FunctionCode>
-        <FunctionalReferenceID>864f051d9d4043cc9b36472f4eb00a5d</FunctionalReferenceID>
+        <FunctionalReferenceID>5701e916d0914dc79601df8a4d8cfa07</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20211213170501Z</DateTimeString>
+            <DateTimeString>20220718130936+01</DateTimeString>
         </IssueDateTime>
         <Declaration>
             <AcceptanceDateTime>
-                <DateTimeString formatCode="304">20211213170500Z</DateTimeString>
+                <DateTimeString>20220718130934+01</DateTimeString>
             </AcceptanceDateTime>
-            <FunctionalReferenceID>TT_IM33a_v1.5_1312_01</FunctionalReferenceID>
-            <ID>21GBDREYWQ4SK8DJR2</ID>
+            <FunctionalReferenceID>TT_IM33a_v1.5_1807_02</FunctionalReferenceID>
+            <ID>22GB7VN8X2CS2PXAR2</ID>
             <VersionID>1</VersionID>
         </Declaration>
     </Response>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/04._DMSTAX.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/03_DMSTAX.xml
similarity index 66%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/04._DMSTAX.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/03_DMSTAX.xml
index 70aa8dff..fcf2ffa4 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/04._DMSTAX.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/03_DMSTAX.xml
@@ -1,9 +1,4 @@
-<!--
-	***
-	Following the TTM18.0.2 Tariff data refresh, this scenario now attracts Definitive Anti-Dumping Duties (DADD) instead of Provisional Anti-Dumping Duties (PADD). As a result the Tax Type in the DMSTAX notifications will now show A80 instead of A85 and the duty calculations will be different. The sample will be updated to use a scenario that attracts PADD for TTM19.0.
-	***
-	-->
-	<MetaData>
+<MetaData>
     <WCODataModelVersionCode>3.6</WCODataModelVersionCode>
     <WCOTypeName>RES</WCOTypeName>
     <ResponsibleCountryCode/>
@@ -12,20 +7,20 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>13</FunctionCode>
-        <FunctionalReferenceID>51b9f22b07f44523a8d258d0ac27b8ef</FunctionalReferenceID>
+        <FunctionalReferenceID>21aa7abd36ab4229beea521d98560014</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20211213170501Z</DateTimeString>
+            <DateTimeString>20220718130938+01</DateTimeString>
         </IssueDateTime>
         <Bank>
-            <ReferenceID>CITIGB2LLON</ReferenceID>
-            <ID>GB25CITI08320011963155</ID>
+            <ReferenceID>BARCGB22</ReferenceID>
+            <ID>GB16BARC20051723372545</ID>
         </Bank>
         <Status>
             <NameCode>4</NameCode>
         </Status>
         <Declaration>
-            <FunctionalReferenceID>TT_IM33a_v1.5_1312_01</FunctionalReferenceID>
-            <ID>21GBDREYWQ4SK8DJR2</ID>
+            <FunctionalReferenceID>TT_IM33a_v1.5_1807_02</FunctionalReferenceID>
+            <ID>22GB7VN8X2CS2PXAR2</ID>
             <VersionID>1</VersionID>
             <GoodsShipment>
                 <GovernmentAgencyGoodsItem>
@@ -46,22 +41,22 @@
                             <AdValoremTaxBaseAmount currencyID="GBP">5000.00</AdValoremTaxBaseAmount>
                             <DeductAmount currencyID="GBP">0.00</DeductAmount>
                             <DutyRegimeCode>100</DutyRegimeCode>
-                            <TaxRateNumeric>50.60</TaxRateNumeric>
-                            <TypeCode>A85</TypeCode>
+                            <TaxRateNumeric>50.70</TaxRateNumeric>
+                            <TypeCode>A80</TypeCode>
                             <Payment>
-                                <TaxAssessedAmount currencyID="GBP">0.00</TaxAssessedAmount>
-                                <PaymentAmount currencyID="GBP">0.00</PaymentAmount>
+                                <TaxAssessedAmount currencyID="GBP">2535.00</TaxAssessedAmount>
+                                <PaymentAmount currencyID="GBP">2535.00</PaymentAmount>
                             </Payment>
                         </DutyTaxFee>
                         <DutyTaxFee>
-                            <AdValoremTaxBaseAmount currencyID="GBP">135.00</AdValoremTaxBaseAmount>
+                            <AdValoremTaxBaseAmount currencyID="GBP">2670.00</AdValoremTaxBaseAmount>
                             <DeductAmount currencyID="GBP">0.00</DeductAmount>
                             <DutyRegimeCode>100</DutyRegimeCode>
                             <TaxRateNumeric>20.00</TaxRateNumeric>
                             <TypeCode>B05</TypeCode>
                             <Payment>
-                                <TaxAssessedAmount currencyID="GBP">27.00</TaxAssessedAmount>
-                                <PaymentAmount currencyID="GBP">27.00</PaymentAmount>
+                                <TaxAssessedAmount currencyID="GBP">534.00</TaxAssessedAmount>
+                                <PaymentAmount currencyID="GBP">534.00</PaymentAmount>
                             </Payment>
                         </DutyTaxFee>
                         <DutyTaxFee>
@@ -75,18 +70,6 @@
                                 <PaymentAmount currencyID="GBP">1000.00</PaymentAmount>
                             </Payment>
                         </DutyTaxFee>
-                        <DutyTaxFee>
-                            <TypeCode>PDD</TypeCode>
-                            <Payment>
-                                <TaxAssessedAmount currencyID="GBP">506.00</TaxAssessedAmount>
-                            </Payment>
-                        </DutyTaxFee>
-                        <DutyTaxFee>
-                            <TypeCode>PDD</TypeCode>
-                            <Payment>
-                                <TaxAssessedAmount currencyID="GBP">2530.00</TaxAssessedAmount>
-                            </Payment>
-                        </DutyTaxFee>
                     </Commodity>
                 </GovernmentAgencyGoodsItem>
             </GoodsShipment>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/03._DMSCLE.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/04_DMSCLE.xml
similarity index 71%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/03._DMSCLE.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/04_DMSCLE.xml
index 441d20d8..302ca5d7 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/03._DMSCLE.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/04_DMSCLE.xml
@@ -7,17 +7,17 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>09</FunctionCode>
-        <FunctionalReferenceID>f8f2484d74144ab4bd5ce48e456bafaf</FunctionalReferenceID>
+        <FunctionalReferenceID>9196a463d53f4e98916faedf3a96407b</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20211213170502Z</DateTimeString>
+            <DateTimeString>20220718130938+01</DateTimeString>
         </IssueDateTime>
         <AdditionalInformation>
             <StatementCode>A2</StatementCode>
             <StatementTypeCode>AFB</StatementTypeCode>
         </AdditionalInformation>
         <Declaration>
-            <FunctionalReferenceID>TT_IM33a_v1.5_1312_01</FunctionalReferenceID>
-            <ID>21GBDREYWQ4SK8DJR2</ID>
+            <FunctionalReferenceID>TT_IM33a_v1.5_1807_02</FunctionalReferenceID>
+            <ID>22GB7VN8X2CS2PXAR2</ID>
             <VersionID>1</VersionID>
         </Declaration>
     </Response>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/TT_IM033a_v1.6.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/TT_IM033a_v1.7.xml
similarity index 94%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/TT_IM033a_v1.6.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/TT_IM033a_v1.7.xml
index ecf09ed2..5a829f1a 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/TT_IM033a_v1.6.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM033a/TT_IM033a_v1.7.xml
@@ -21,11 +21,11 @@
 			
 		<!--
 			***
-			Following the TTM18.0.2 Tariff data refresh, this scenario now attracts Definitive Anti-Dumping Duties (DADD) instead of Provisional Anti-Dumping Duties (PADD). As a result the Tax Type in the DMSTAX notifications will now show A80 instead of A85 and the duty calculations will be different. The sample will be updated to use a scenario that attracts PADD for TTM19.0.
+			This scenario now attracts Definitive Anti-Dumping Duties (DADD) instead of Provisional Anti-Dumping Duties (PADD). As a result the Tax Type in the DMSTAX notifications will now show A80 instead of A85 and the duty calculations are different.
 			***
 			
 			SCENARIO 
-			Trader submits a Type A Frontier declaration for goods being imported from ROW (China)to NI "At Risk" that attracts Provisional Anti-Dumping Duties (PADD).
+			Trader submits a Type A Frontier declaration for goods being imported from ROW (China)to NI "At Risk" that attracts Definitive Anti-Dumping Duties (DADD).
 			Indicative duty is calculated and DMSTAX and DMSACC Trader Notifications are sent prior to the Dwell Timer. 
 			Goods: Calcium-silicon steel alloy. 7202998030
 			Category: H1 Declaration Category data set
@@ -37,7 +37,7 @@
 		<FunctionCode>9</FunctionCode>
 		<!-- DE 2/5: LRN.
 			Traders own reference number this must be unique to the transaction -->
-		<FunctionalReferenceID>TT_IM33a_v1.5_1312_01</FunctionalReferenceID>
+		<FunctionalReferenceID>TT_IM33a_v1.5_1807_02</FunctionalReferenceID>
 		<!--DE 1/1: Declaration Type.
 			IM to represent an import declaration.-->
 		<!--DE 1/2: Additional Declaration Tupe.
@@ -256,8 +256,8 @@
 					</DutyTaxFee>
 					<DutyTaxFee>
 						<!--DE 4/3: Tax Type.
-							A85 represents EU Provisional Anti-Dumping Dutiies PADD. -->
-						<TypeCode>A85</TypeCode>
+							A80 represents EU Definitive Anti-Dumping Duties (DADD). -->
+						<TypeCode>A80</TypeCode>
 						<!--DE 4/8: Method of Payment.
 							MethodCode of E to indicate Deferment used for import. -->
 						<Payment>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM037a/TT_IM037a_v1.5.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM037a/TT_IM037a_v1.6.xml
similarity index 100%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM037a/TT_IM037a_v1.5.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM037a/TT_IM037a_v1.6.xml
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM039b/TT_IM039b_v1.7.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM039b/TT_IM039b_v1.8.xml
similarity index 97%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM039b/TT_IM039b_v1.7.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM039b/TT_IM039b_v1.8.xml
index 358e5bd1..986c2e9f 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM039b/TT_IM039b_v1.7.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM039b/TT_IM039b_v1.8.xml
@@ -331,8 +331,7 @@
 				'0' or '1' must be declared in this data element.-->
 			<SecurityDetailsCode>0</SecurityDetailsCode>
 		</ObligationGuarantee>
-		<!--DE 5/27: Supervising customs office. The Supervising Office Code for the
-			HMRC Office overseeing the Customs Warehouse procedure. 
+		<!--DE 5/27: Supervising customs office.
 			In this scenario, this is Belfast, Dorchester House (NIRU).-->
 		<SupervisingOffice>
 			<ID>GBBEL004</ID>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM042a/TT_IM042a_v1.5.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM042a/TT_IM042a_v1.6.xml
similarity index 96%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM042a/TT_IM042a_v1.5.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM042a/TT_IM042a_v1.6.xml
index b5ea252e..81084f7a 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM042a/TT_IM042a_v1.5.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM042a/TT_IM042a_v1.6.xml
@@ -108,7 +108,7 @@
 						<GoodsLocation>
 							<!--DE 5/23: The location code for Port of Belfast. Goods moved via shipping container from GB to NI via port of Belfast -->
 							<Name>BELBELBEL</Name>
-							<!--DE 5/23: Type of Location - B is used to identify inland locations such as customs warehouses. -->
+							<!--DE 5/23: Type of Location - A is used to identify Frontier or Frontier linker locations such as Airports, ITSFs etc. -->
 							<TypeCode>A</TypeCode>
 							<Address>
 								<!--DE 5/23: Type of ID of the Location - Y is used where the goods location is 
@@ -304,8 +304,7 @@
 				</ObligationGuarantee>
 				<SupervisingOffice>
 					<!--DE 5/27: Supervising customs office. 
-				The Supervising Office Code for the HMRC Office overseeing the Customs Warehouse procedure. 
-				In this scenario, this is Belfast, Dorchester House (NIRU).-->
+						In this scenario, this is Belfast, Dorchester House (NIRU).-->
 					<ID>GBBEL004</ID>
 				</SupervisingOffice>
 			</Declaration>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM043a/TT_IM043a_v1.8.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM043a/TT_IM043a_v1.9.xml
similarity index 95%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM043a/TT_IM043a_v1.8.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM043a/TT_IM043a_v1.9.xml
index 1882c69c..9b9c7258 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM043a/TT_IM043a_v1.8.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM043a/TT_IM043a_v1.9.xml
@@ -17,6 +17,15 @@
 	             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	             xsi:schemaLocation="urn:wco:datamodel:WCO:DEC-DMS:2 ../WCO_DEC_2_DMS.xsd ">
 		<!--
+			***
+			This scenario is impacted by KEL 444: The adjustment in BC in DE 4/9 is not functioning correctly which thus results in an incorrect value for VAT for DDP Import declaration.
+
+			Workaround:
+			• Complete DE 4/1 as per Tariff Vol. 3 instructions with DDP entered and the UN Locode for the address.
+			• Do not enter an adjustment (BC) in DE 4/9
+			• Remove the duty amount from the goods item value in DE 4/14 (essentially remove the duty amount that would have been entered in DE 4/9 against BC).
+			***
+
 			SCENARIO
 			"ROW to NI, NIIMP, Goods 'De-Risked', Non-preferential UK FCFS quota claimed:
 			Type A declaration for goods imported to Northern Ireland from US. The goods are 'De-Risked' by the Trader using NIREM and a non-preferential 
@@ -38,7 +47,7 @@
 		<!--DE 2/5: LRN.
 			Traders own reference number – this must be unique to the transaction. -->
 		<FunctionalReferenceID>TT_IM43a_051021_001</FunctionalReferenceID>
-		<!--DE 1/1: DEclaration Type.
+		<!--DE 1/1: Declaration Type.
 			IM to represent an import declaration. -->
 		<!--DE 1/2: Additional Declaration Type.
 			A to represent a frontier/arrived standard declaration. -->
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM058a/TT_IM058a_v1.6.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM058a/TT_IM058a_v1.7.xml
similarity index 96%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM058a/TT_IM058a_v1.6.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM058a/TT_IM058a_v1.7.xml
index 79733072..d7a87ac6 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM058a/TT_IM058a_v1.6.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM058a/TT_IM058a_v1.7.xml
@@ -17,6 +17,10 @@
 	             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	             xsi:schemaLocation="urn:wco:datamodel:WCO:DEC-DMS:2 ../WCO_DEC_2_DMS.xsd ">
 		<!--
+			***
+			Following TTM19.0.1, the A20 Tax Type is not applied because the 695 and 696 measures have expired. A sample update to use a commodity where the measures are still in force is planned for TTM20.0. 
+			***
+			
 			SCENARIO
 			Importing Steel into GB from the US, which is subject to Retaliatory measures, but where no Quota claim is made, 
 			therefore also subject to UK Steel Safeguarding measures.
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/01._DMSACC.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/01_DMSACC.xml
similarity index 61%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/01._DMSACC.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/01_DMSACC.xml
index 8655bcbd..7c3b8a93 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/01._DMSACC.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/01_DMSACC.xml
@@ -7,16 +7,16 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>01</FunctionCode>
-        <FunctionalReferenceID>864f051d9d4043cc9b36472f4eb00a5d</FunctionalReferenceID>
+        <FunctionalReferenceID>6bed9704893c48d9a764ebd91299b4ab</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20211213170501Z</DateTimeString>
+            <DateTimeString>20220616121926+01</DateTimeString>
         </IssueDateTime>
         <Declaration>
             <AcceptanceDateTime>
-                <DateTimeString formatCode="304">20211213170500Z</DateTimeString>
+                <DateTimeString>20220606010000+01</DateTimeString>
             </AcceptanceDateTime>
-            <FunctionalReferenceID>TT_IM33a_v1.5_1312_01</FunctionalReferenceID>
-            <ID>21GBDREYWQ4SK8DJR2</ID>
+            <FunctionalReferenceID>TT_IM61b_v1.1_1606_04</FunctionalReferenceID>
+            <ID>22GB6LVD6063EORA02</ID>
             <VersionID>1</VersionID>
         </Declaration>
     </Response>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/05._DMSCLE.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/02_DMSCLE.xml
similarity index 71%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/05._DMSCLE.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/02_DMSCLE.xml
index 72ef5fc9..3fdf50b8 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/05._DMSCLE.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/02_DMSCLE.xml
@@ -7,17 +7,17 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>09</FunctionCode>
-        <FunctionalReferenceID>7fd913d5aa7d48e6b68cb2cb5ab8473a</FunctionalReferenceID>
+        <FunctionalReferenceID>e99f92e6a74d43d5afc9a92252897a30</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20210804141210Z</DateTimeString>
+            <DateTimeString>20220616122228+01</DateTimeString>
         </IssueDateTime>
         <AdditionalInformation>
             <StatementCode>A2</StatementCode>
             <StatementTypeCode>AFB</StatementTypeCode>
         </AdditionalInformation>
         <Declaration>
-            <FunctionalReferenceID>TT_IM61b_v1.1_0408_02</FunctionalReferenceID>
-            <ID>21GB8K1R53ATIBQV01</ID>
+            <FunctionalReferenceID>TT_IM61b_v1.1_1606_04</FunctionalReferenceID>
+            <ID>22GB6LVD6063EORA02</ID>
             <VersionID>2</VersionID>
         </Declaration>
     </Response>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/03_DMSRES.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/03_DMSRES.xml
new file mode 100644
index 00000000..e6d5f239
--- /dev/null
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/03_DMSRES.xml
@@ -0,0 +1,129 @@
+<MetaData>
+	<WCODataModelVersionCode>3.6</WCODataModelVersionCode>
+	<WCOTypeName>RES</WCOTypeName>
+	<ResponsibleCountryCode/>
+	<ResponsibleAgencyName/>
+	<AgencyAssignedCustomizationCode/>
+	<AgencyAssignedCustomizationVersionCode/>
+	<Response>
+		<FunctionCode>07</FunctionCode>
+		<FunctionalReferenceID>f870a44fe1db4b4e9b99826b0ff2606b</FunctionalReferenceID>
+		<IssueDateTime>
+			<DateTimeString>20220616122228+01</DateTimeString>
+		</IssueDateTime>
+		<AdditionalInformation>
+			<StatementDescription>This is changing AI FreeText for Type Y</StatementDescription>
+			<StatementTypeCode>AES</StatementTypeCode>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>07B</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>06A</DocumentSectionCode>
+			</Pointer>
+		</AdditionalInformation>
+		<AdditionalInformation>
+			<StatementDescription>AMENDMENT 2 - Changing AI Freetext for Type Z</StatementDescription>
+			<StatementTypeCode>AES</StatementTypeCode>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>07B</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>2</SequenceNumeric>
+				<DocumentSectionCode>06A</DocumentSectionCode>
+			</Pointer>
+		</AdditionalInformation>
+		<AdditionalInformation>
+			<StatementDescription>AMENDMENT 3 - Changing AI freetext for Late Supp</StatementDescription>
+			<StatementTypeCode>AES</StatementTypeCode>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>07B</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>3</SequenceNumeric>
+				<DocumentSectionCode>06A</DocumentSectionCode>
+			</Pointer>
+		</AdditionalInformation>
+		<Amendment>
+			<ChangeReasonCode>21</ChangeReasonCode>
+			<Pointer>
+				<DocumentSectionCode>42A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<DocumentSectionCode>67A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>68A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>03A</DocumentSectionCode>
+				<TagID>225</TagID>
+			</Pointer>
+		</Amendment>
+		<Amendment>
+			<ChangeReasonCode>21</ChangeReasonCode>
+			<Pointer>
+				<DocumentSectionCode>42A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<DocumentSectionCode>67A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>68A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>2</SequenceNumeric>
+				<DocumentSectionCode>03A</DocumentSectionCode>
+				<TagID>225</TagID>
+			</Pointer>
+		</Amendment>
+		<Amendment>
+			<ChangeReasonCode>21</ChangeReasonCode>
+			<Pointer>
+				<DocumentSectionCode>42A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<DocumentSectionCode>67A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>68A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>3</SequenceNumeric>
+				<DocumentSectionCode>03A</DocumentSectionCode>
+				<TagID>225</TagID>
+			</Pointer>
+		</Amendment>
+		<Declaration>
+			<FunctionalReferenceID>TT_IM61b_v1.1_1606_04</FunctionalReferenceID>
+			<ID>22GB6LVD6063EORA02</ID>
+			<VersionID>2</VersionID>
+		</Declaration>
+		<Declaration>
+			<FunctionCode>9</FunctionCode>
+			<GoodsShipment>
+				<GovernmentAgencyGoodsItem>
+					<SequenceNumeric>1</SequenceNumeric>
+					<AdditionalInformation>
+						<StatementDescription>SDY=9/10</StatementDescription>
+					</AdditionalInformation>
+					<AdditionalInformation>
+						<StatementDescription>02/21=Y 3 01/21=Z 2</StatementDescription>
+					</AdditionalInformation>
+					<AdditionalInformation>
+						<StatementDescription>SDZ=6/6</StatementDescription>
+					</AdditionalInformation>
+					<AdditionalInformation/>
+					<AdditionalInformation/>
+				</GovernmentAgencyGoodsItem>
+			</GoodsShipment>
+		</Declaration>
+	</Response>
+</MetaData>
\ No newline at end of file
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/04._DMSRES.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/04._DMSRES.xml
deleted file mode 100644
index 98f84c5e..00000000
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/04._DMSRES.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<MetaData>
-    <WCODataModelVersionCode>3.6</WCODataModelVersionCode>
-    <WCOTypeName>RES</WCOTypeName>
-    <ResponsibleCountryCode/>
-    <ResponsibleAgencyName/>
-    <AgencyAssignedCustomizationCode/>
-    <AgencyAssignedCustomizationVersionCode/>
-    <Response>
-        <FunctionCode>07</FunctionCode>
-        <FunctionalReferenceID>86e13d5175914d8dbcdd4b18b2e41bde</FunctionalReferenceID>
-        <IssueDateTime>
-            <DateTimeString formatCode="304">20210804141210Z</DateTimeString>
-        </IssueDateTime>
-        <AdditionalInformation>
-            <StatementDescription>This is changing AI FreeText for Type Y</StatementDescription>
-            <StatementTypeCode>AES</StatementTypeCode>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>07B</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>06A</DocumentSectionCode>
-            </Pointer>
-        </AdditionalInformation>
-        <AdditionalInformation>
-            <StatementDescription>AMENDMENT 3 - Changing AI freetext for Late Supp</StatementDescription>
-            <StatementTypeCode>AES</StatementTypeCode>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>07B</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>2</SequenceNumeric>
-                <DocumentSectionCode>06A</DocumentSectionCode>
-            </Pointer>
-        </AdditionalInformation>
-        <AdditionalInformation>
-            <StatementDescription>AMENDMENT 2 - Changing AI Freetext for Type Z</StatementDescription>
-            <StatementTypeCode>AES</StatementTypeCode>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>07B</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>3</SequenceNumeric>
-                <DocumentSectionCode>06A</DocumentSectionCode>
-            </Pointer>
-        </AdditionalInformation>
-        <Amendment>
-            <ChangeReasonCode>21</ChangeReasonCode>
-            <Pointer>
-                <DocumentSectionCode>42A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <DocumentSectionCode>67A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>68A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>03A</DocumentSectionCode>
-                <TagID>225</TagID>
-            </Pointer>
-        </Amendment>
-        <Amendment>
-            <ChangeReasonCode>21</ChangeReasonCode>
-            <Pointer>
-                <DocumentSectionCode>42A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <DocumentSectionCode>67A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>68A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>2</SequenceNumeric>
-                <DocumentSectionCode>03A</DocumentSectionCode>
-                <TagID>225</TagID>
-            </Pointer>
-        </Amendment>
-        <Amendment>
-            <ChangeReasonCode>21</ChangeReasonCode>
-            <Pointer>
-                <DocumentSectionCode>42A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <DocumentSectionCode>67A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>68A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>3</SequenceNumeric>
-                <DocumentSectionCode>03A</DocumentSectionCode>
-                <TagID>225</TagID>
-            </Pointer>
-        </Amendment>
-        <Declaration>
-            <FunctionalReferenceID>TT_IM61b_v1.1_0408_02</FunctionalReferenceID>
-            <ID>21GB8K1R53ATIBQV01</ID>
-            <VersionID>2</VersionID>
-        </Declaration>
-        <Declaration>
-            <FunctionCode>9</FunctionCode>
-            <GoodsShipment>
-                <GovernmentAgencyGoodsItem>
-                    <SequenceNumeric>1</SequenceNumeric>
-                    <AdditionalInformation>
-                        <StatementDescription>SDY=9/10</StatementDescription>
-                    </AdditionalInformation>
-                    <AdditionalInformation>
-                        <StatementDescription>02/21=Y 3 01/21=Z 2</StatementDescription>
-                    </AdditionalInformation>
-                    <AdditionalInformation>
-                        <StatementDescription>SDZ=6/6</StatementDescription>
-                    </AdditionalInformation>
-                    <AdditionalInformation/>
-                    <AdditionalInformation/>
-                </GovernmentAgencyGoodsItem>
-            </GoodsShipment>
-        </Declaration>
-    </Response>
-</MetaData>
\ No newline at end of file
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/02._DMSRCV.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/04_DMSRVC.xml
similarity index 60%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/02._DMSRCV.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/04_DMSRVC.xml
index da7d7b39..0fac54e7 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/02._DMSRCV.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/04_DMSRVC.xml
@@ -7,14 +7,13 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>02</FunctionCode>
-        <FunctionalReferenceID>98045a6ecef74a9a96222bd778025f97</FunctionalReferenceID>
+        <FunctionalReferenceID>648da8efa8304a02853c0c5a28a4733f</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20210804140455Z</DateTimeString>
+            <DateTimeString>20220616122106+01</DateTimeString>
         </IssueDateTime>
         <Declaration>
-            <FunctionalReferenceID>TT_IM61b_v1.1_0408_02</FunctionalReferenceID>
-            <ID>21GB8K1R53ATIBQV01</ID>
-            <VersionID>1</VersionID>
+            <FunctionalReferenceID>TT_IM61b_v1.1_1606_04</FunctionalReferenceID>
+            <ID>22GB6LVD6063EORA02</ID>
         </Declaration>
     </Response>
 </MetaData>
\ No newline at end of file
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/03._DMSREQ.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/05_DMSREQ.xml
similarity index 68%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/03._DMSREQ.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/05_DMSREQ.xml
index 4a357cfa..624831aa 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/03._DMSREQ.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/05_DMSREQ.xml
@@ -7,9 +7,9 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>11</FunctionCode>
-        <FunctionalReferenceID>f0db2cdbd5924d628c2e36861f4a2f8a</FunctionalReferenceID>
+        <FunctionalReferenceID>5f540abea92c4a368f5d035d258935da</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20210804140456Z</DateTimeString>
+            <DateTimeString>20220616122107+01</DateTimeString>
         </IssueDateTime>
         <AdditionalInformation>
             <StatementTypeCode>AFB</StatementTypeCode>
@@ -18,9 +18,8 @@
             <NameCode>39</NameCode>
         </Status>
         <Declaration>
-            <FunctionalReferenceID>TT_IM61b_v1.1_0408_02</FunctionalReferenceID>
-            <ID>21GB8K1R53ATIBQV01</ID>
-            <VersionID>1</VersionID>
+            <FunctionalReferenceID>TT_IM61b_v1.1_1606_04</FunctionalReferenceID>
+            <ID>22GB6LVD6063EORA02</ID>
         </Declaration>
     </Response>
 </MetaData>
\ No newline at end of file
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061a_v1.2.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061a_v1.2.xml
index e63af9ff..685463ec 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061a_v1.2.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061a_v1.2.xml
@@ -20,13 +20,13 @@
 			A CFSP Trader submits an Imports Type Q  non-excise Final Supplementary Declaration (FSD) to inform HMRC of how many Supplementary Declarations have been submitted and those due in the previous period, as well as any Supplementary Declarations that were submitted late. 
 			-->
 		<AcceptanceDateTime>
-			<p1:DateTimeString formatCode="304">20210301010000+01</p1:DateTimeString>
+			<p1:DateTimeString formatCode="304">20220606010000+01</p1:DateTimeString>
 		</AcceptanceDateTime>
 		<FunctionCode>9</FunctionCode>
 		<!--DE 2/5: LRN.
 			Mandatory.
 			Trader's own reference number - this must be unique to the transaction. -->
-		<FunctionalReferenceID>TT_IM61b_v1.1_0408_01</FunctionalReferenceID>
+		<FunctionalReferenceID>TT_IM61b_v1.1_1606_04</FunctionalReferenceID>
 		<!--DE 1/1: Declaration Type.
 			IM to represent an import declaration. -->
 		<!--DE 1/2: Additional Declaration Type.
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061b_Amendment_v1.1.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061b_Amendment_v1.2.xml
similarity index 95%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061b_Amendment_v1.1.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061b_Amendment_v1.2.xml
index d4423895..580e4dbe 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061b_Amendment_v1.1.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061b_Amendment_v1.2.xml
@@ -14,8 +14,8 @@
            		xmlns:p1="urn:wco:datamodel:WCO:Declaration_DS:DMS:2"
            		xmlns:clm5ISO42173A="urn:un:unece:uncefact:codelist:standard:ISO:ISO3AlphaCurrencyCode:2012-08-31">
 		<FunctionCode>13</FunctionCode>
-		<FunctionalReferenceID>TT_IM61b_v1.1_0408_01</FunctionalReferenceID>
-		<ID>21GB3SJO2SPBOOFW09</ID>
+		<FunctionalReferenceID>TT_IM61b_v1.1_1606_02</FunctionalReferenceID>
+		<ID>22GB6LSBPILA876A08</ID>
 		<TypeCode>COR</TypeCode>
 		<AdditionalInformation>
 			<StatementDescription>This is changing AI FreeText for Type Y</StatementDescription>
@@ -37,7 +37,7 @@
 				<DocumentSectionCode>42A</DocumentSectionCode>
 			</Pointer>
 			<Pointer>
-				<SequenceNumeric>3</SequenceNumeric>
+				<SequenceNumeric>2</SequenceNumeric>
 				<DocumentSectionCode>06A</DocumentSectionCode>
 			</Pointer>
 		</AdditionalInformation>
@@ -49,7 +49,7 @@
 				<DocumentSectionCode>42A</DocumentSectionCode>
 			</Pointer>
 			<Pointer>
-				<SequenceNumeric>2</SequenceNumeric>
+				<SequenceNumeric>3</SequenceNumeric>
 				<DocumentSectionCode>06A</DocumentSectionCode>
 			</Pointer>
 		</AdditionalInformation>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM064a/TT_IM064a_v1.2.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM064a/TT_IM064a_v1.3.xml
similarity index 96%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM064a/TT_IM064a_v1.2.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM064a/TT_IM064a_v1.3.xml
index c737f07f..c1028895 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM064a/TT_IM064a_v1.2.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM064a/TT_IM064a_v1.3.xml
@@ -17,6 +17,9 @@
 	             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	             xsi:schemaLocation="urn:wco:datamodel:WCO:DEC-DMS:2 ../WCO_DEC_2_DMS.xsd ">
 		<!--
+			***
+			The Commodity Code used in the sample is no longer valid. Work is ongoing to identify a new code that satisfies the scenario. Submitting the current version of the declaration will result in a DMSREJ notification being sent.
+			***
 			SCENARIO
 			Trader submits a Type A declaration to import steel from the ROW into NI.
 			Goods imported and declared to free-circulation and home use of non-union goods, with no previous procedure
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM069a/TT_IM069a_v1.3.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM069a/TT_IM069a_v1.5.xml
similarity index 94%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM069a/TT_IM069a_v1.3.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM069a/TT_IM069a_v1.5.xml
index b768b731..7c36dff0 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM069a/TT_IM069a_v1.3.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM069a/TT_IM069a_v1.5.xml
@@ -19,12 +19,6 @@
 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 			xsi:schemaLocation="urn:wco:datamodel:WCO:DEC-DMS:2 ../WCO_DEC_2_DMS.xsd " >
 		<!--
-			***
-			This scenario is impacted by KEL 456: For declarations which include AI codes NIIMP and NIAID, duty calculation should return a full subsidy reservation and should trigger collection of a Security for the difference in the Customs Duties between the EU (eg 4%) and UK (eg 0%). However the calculation response is not triggering security and so the A50 Customs Duty Amount is being charged outright. 
-			
-			Please note KEL 456 will be fixed as part of TTM19.0.1, scheduled for July 2022. Additional information can be found within the CDS_Trade_Test_KEL_20220616 (KEL) document.
-			***
-			
 			SCENARIO
 			ROW-NI at Risk - Suspension Procedure.
 			
@@ -375,7 +369,6 @@
 			<SecurityDetailsCode>1</SecurityDetailsCode>
 		</ObligationGuarantee>
 		<!--DE 5/27: Supervising Customs Office. 
-			The Supervising Office Code for the HMRC Office overseeing the Customs Warehouse procedure. 
 			In this scenario, this is Belfast, Custom House. -->
 		<SupervisingOffice>
 			<ID>GBBEL003</ID>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM072a/TT_IM072a_v1.0_.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM072a/TT_IM072a_v1.1_.xml
similarity index 64%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM072a/TT_IM072a_v1.0_.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM072a/TT_IM072a_v1.1_.xml
index 4cfbb2f5..6dd35b98 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM072a/TT_IM072a_v1.0_.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM072a/TT_IM072a_v1.1_.xml
@@ -24,22 +24,27 @@
 			C21i additional declaration type J
 			Expected Trader Notifications (4): DMSACC, DMSTAX(1), DMSTAX(2), DMSCLE
 		-->
-		<!--Function Code of 9 to represent an original declaration.-->
+		<!--Function Code of 9 to represent an original declaration. -->
 		<FunctionCode>9</FunctionCode>
-		<!--DE 2/5: Trader's own reference number - this must be unique to the transaction -->
+		<!--DE 2/5: Trader's own reference number - this must be unique to the transaction. -->
 		<FunctionalReferenceID>CDSP_9245_TC2_0811_01</FunctionalReferenceID>
-		<!--DE 1/1: CO to represent an Imports Special Fiscal Territories declaration.-->
-		<!--DE 1/2: J to represent Goods arrived C21 declaration-->
+		<!--DE 1/1: Declaration Type.
+			CO to represent an Imports Special Fiscal Territories declaration. -->
+		<!--DE 1/2: Additional Declaration Type.
+			J to represent Goods arrived C21 declaration. -->
 		<TypeCode>COJ</TypeCode>
-		<!--DE 1/9: Total number of goods items on the declaration.-->
+		<!--DE 1/9: Total number of Items. -->
 		<GoodsItemQuantity>1</GoodsItemQuantity>
-		<!--DE 6/18: Total packages - 200. Note that this matches DE 6/10 because this is a single item declaration.-->
+		<!--DE 6/18: Total Packages.
+			200.
+			Note that this matches DE 6/10 because this is a single item declaration. -->
 		<TotalPackageQuantity>200</TotalPackageQuantity>
 		<AuthorisationHolder>
 			<ID>GB553202734852</ID>
 			<CategoryCode>BRD</CategoryCode>
 		</AuthorisationHolder>
-		<!--DE 7/4: Mode of transport at the border. 1 represents maritime/sea transport. This is a mandatory data element -->
+		<!--DE 7/4: Mode of Transport at the Border. 
+			1 represents maritime/sea transport. This is a mandatory data element. -->
 		<BorderTransportMeans>
 			<ModeCode>1</ModeCode>
 		</BorderTransportMeans>
@@ -49,7 +54,7 @@
 			<ID>GB553202734852</ID>
 		</Declarant>
 		<!--DE 3/1: Exporter.
-			Exporter name and address is mandatory where no recognised EORI number has been entered into DE 3/2 -->
+			Exporter name and address is mandatory where no recognised EORI number has been entered into DE 3/2. -->
 		<Exporter>
 			<Name>Jersey Mail</Name>
 			<Address>
@@ -60,33 +65,35 @@
 			</Address>
 		</Exporter>
 		<GoodsShipment>
-			<!--DE 7/2: Container. Indicator to show if goods are packed in a container or not. 
+			<!--DE 7/2: Container. 
+				Indicator to show if goods are packed in a container or not. 
 				1 indicates that goods are transported in containers.
-				Note: Unlike CHIEF this must now be completed.-->
+				Note: Unlike CHIEF this must now be completed. -->
 			<Consignment>
 				<ContainerCode>1</ContainerCode>
-				<!--DE 7/9: Identity of the means of transport. 
-					Example number representing IMO ship identification number: '10', and 5 digits for the identification number: '12345'.-->
+				<!--DE 7/9: Identity of Means of Transport. 
+					Example number representing IMO ship identification number: '10', and 5 digits for the identification number: '12345'. -->
 				<ArrivalTransportMeans>
 					<ID>12345</ID>
 					<IdentificationTypeCode>10</IdentificationTypeCode>
 				</ArrivalTransportMeans>
-				<!--DE 5/23: Location of Goods.
+				<!--DE 5/23: Location of Goods - Identification of location.
 					The location code for Portsmouth - Flathouse Quay, a non-inventory linked location. -->
 				<GoodsLocation>
 					<Name>PMEPTMFHQ</Name>
-					<!--DE 5/23: Type of Location.
-						A in this scenario to represent that it is a designated location.-->
+					<!--DE 5/23: Location of Goods - Type of location.
+						A in this scenario to represent that it is a designated location. -->
 					<TypeCode>A</TypeCode>
 					<Address>
-						<!--DE 5/23: Type of ID of the Location - U in this scenario for UN/LOCODE. -->
+						<!--DE 5/23: Location of Goods - Qualifier of the identification.
+							Type of ID of the Location - U in this scenario for UN/LOCODE. -->
 						<TypeCode>U</TypeCode>
-						<!--DE 5/23: Country code.
-							Country where the goods may be examined, GB in this scenario.-->
+						<!--DE 5/23: Location of Goods - Country.
+							Country where the goods may be examined, GB in this scenario. -->
 						<CountryCode>GB</CountryCode>
 					</Address>
 				</GoodsLocation>
-				<!--DE 7/10: Container identification number. 
+				<!--DE 7/10: Container Identification Number. 
 					This is alpha-numeric with up to 17 characters.
 					For containers covered by the standard ISO 6346, the identifier (prefix) allocated by the International Bureau of in addition to the container identification number.
 					For swap bodies and semi-trailers the ILU (Intermodal Loading Units) code as introduced by the European EN 13044 shall be used. -->
@@ -102,76 +109,91 @@
 			</ExportCountry>
 			<GovernmentAgencyGoodsItem>
 				<SequenceNumeric>1</SequenceNumeric>
-				<!-- DE 2/3 Documents produced, certificates and authorisations, additional references -->
+				<!-- DE 2/3 Documents produced, certificates and authorisations, additional references. -->
 				<AdditionalDocument>
 					<CategoryCode>1</CategoryCode>
 					<ID>GBBIRDS55320273485220211018095959</ID>
 					<TypeCode>BRD</TypeCode>
 				</AdditionalDocument>
-				<!--DE 2/2: Additional information. 00500 IMPORTER, indicating Self representation by the importer -->
+				<!--DE 2/2: Additional information. 
+					00500 IMPORTER, indicating Self representation by the importer. -->
 				<AdditionalInformation>
 					<StatementCode>00500</StatementCode>
 					<StatementDescription>IMPORTER</StatementDescription>
 				</AdditionalInformation>
 				<Commodity>
-					<!--DE 6/8: Description of the goods.-->
+					<!--DE 6/8: Description of Goods. -->
 					<Description>Small items of negligible cost</Description>
-					<!--DE 6/5: Gross Mass (KG). Mandatory. Gross mass of the goods in kilograms including packaging.-->
-                    <!--N.B: There is no need to include a unitcode indicating KG -->
+					<!--DE 6/5: Gross Mass. 
+						Mandatory. 
+						Weight of the goods in kilograms including packaging. -->
+                    <!--N.B: There is no need to include a unitcode indicating KG. -->
 					<GoodsMeasure>
 						<GrossMassMeasure>5</GrossMassMeasure>
-					<!--DE 6/1: Net Mass (KG). Mandatory. Net mass of the goods in kilograms without any packaging.-->
+					<!--DE 6/1: Net Mass. 
+						Mandatory. 
+						Weight of the goods in kilograms without any packaging. -->
 						<NetNetWeightMeasure>4</NetNetWeightMeasure>
 					</GoodsMeasure>
-					<!--DE 4/14: ItemChargeAmount - Item price amount, the invoice was issued with a value of 2500 and the currency was in GBP.-->
+					<!--DE 4/14: Item Price/ Amount. 
+						The invoice was issued with a value of 135 and the currency was in GBP. -->
 					<InvoiceLine>
 						<ItemChargeAmount currencyID="GBP">135</ItemChargeAmount>
 					</InvoiceLine>
 				</Commodity>
-				<!--DE 1/10: 00 20 indicating Home use and free circulation, with no previous procedure
-					Customs Clearance Request (CCR) for release from customs control to free circulation on 
-					payment of customs duty and other charges, where required, for goods where a customs declaration is not required.-->
+				<!--DE 1/10: Procedure. 
+					00 20 indicating Home use and free circulation, with no previous procedure
+					Customs Clearance Request (CCR) for release from customs control to free circulation on payment of customs duty and other charges, where required, for goods where a customs declaration is not required. -->
 				<GovernmentProcedure>
 					<CurrentCode>00</CurrentCode>
 					<PreviousCode>20</PreviousCode>
 				</GovernmentProcedure>
 				<GovernmentProcedure>
-					<!--DE 1/11: 21V to indicate Bulk Import Reduced Dataset (BIRDS)-->
+					<!--DE 1/11: Additional Procedure Code. 
+						21V to indicate Bulk Import Reduced Dataset (BIRDS). -->
 					<CurrentCode>21V</CurrentCode>
 					</GovernmentProcedure>
-					<!--DE 1/11: 15F to indicate goods are moving from either Jersey (JE) or Guernsey (GG).-->
+					<!--DE 1/11: Additional Procedure Code. 
+						15F to indicate goods are moving from either Jersey (JE) or Guernsey (GG). -->
 					<GovernmentProcedure>
 					<CurrentCode>15F</CurrentCode>
 					</GovernmentProcedure>
 				<Packaging>
 					<SequenceNumeric>1</SequenceNumeric>
-					<!--DE 6/11: Shipping marks on the packages-->
+					<!--DE 6/11: Shipping marks. -->
 					<MarksNumbersID>ADR/PA/00001</MarksNumbersID>
-					<!--DE 6/10: Number of packages, in this case 200. Note that this matches DE 6/18 because this is a single item declaration. -->
+					<!--DE 6/10: Number of Packages. 
+						In this case 200. 
+						Note that this matches DE 6/18 because this is a single item declaration. -->
 					<QuantityQuantity>200</QuantityQuantity>
-					<!--DE 6/9: Type of packages - PA to represent a Packet-->
+					<!--DE 6/9: Type of Packages. 
+						PA to represent a Packet. -->
 					<TypeCode>PA</TypeCode>
 				</Packaging>
 			</GovernmentAgencyGoodsItem>
-			<!--DE 3/16: EORI number of the Importer.-->
+			<!--DE 3/16: Importer Identifcation Number. 
+				EORI number of the Importer. -->
 			<Importer>
 				<ID>GB553202734852</ID>
 			</Importer>
 			<PreviousDocument>
-				<!--DE 2/1: Previous document of Z355 to show the MRN for the entry summary declaration. 
+				<!--DE 2/1: Simplified Declaration/ Previous Documents. 
+					Z355 to show the MRN for the entry summary declaration. 
 					This is a mandatory field. -->
 				<CategoryCode>Z</CategoryCode>
 				<ID>21GB34F7Y1O2CX8PT4</ID>
 				<TypeCode>355</TypeCode>
 				<LineNumeric>1</LineNumeric>
 			</PreviousDocument>
-			<!--DE 2/4: Reference number which is optional for the declarant to complete.-->
+			<!--DE 2/4: Reference Number/ UCR. 
+				Optional for the declarant to complete. -->
 			<UCR>
 				<TraderAssignedReferenceID>1GB553202734852-12345</TraderAssignedReferenceID>
 			</UCR>
 		</GoodsShipment>
-		<!--DE 5/27: Supervising Customs Office. This is a mandatory field dependant on the Procedure code.
-				The ID GBSAA001 represents Southend on Sea, Alexander House -->
+		<!--DE 5/27: Supervising Customs Office.
+			This is a mandatory field dependant on the Procedure code.
+			The ID GBSAA001 represents Southend on Sea, Alexander House. -->
 				<SupervisingOffice>
 					<ID>GBSAA001</ID>
 				</SupervisingOffice>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM073a/TT_IM073a_v1.0.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM073a/TT_IM073a_v1.1.xml
similarity index 89%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM073a/TT_IM073a_v1.0.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM073a/TT_IM073a_v1.1.xml
index 8156fc77..8bd1778f 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM073a/TT_IM073a_v1.0.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM073a/TT_IM073a_v1.1.xml
@@ -28,17 +28,17 @@
 		<!--Function Code of 9 to represent an original declaration.-->
 		<FunctionCode>9</FunctionCode>
 		<!--DE 2/5: LRN.
-			Trader's own reference number - this must be unique to the transaction -->
+			Trader's own reference number - this must be unique to the transaction. -->
 		<FunctionalReferenceID>CDSP_9245_TC3_2710_01</FunctionalReferenceID>
 		<!--DE 1/1: Declaration Type.
-			IM to represent an import declaration.-->
+			IM to represent an import declaration. -->
 		<!--DE 1/2: Additional Declaration Type.
-			J to represent Goods arrived C21 declaration-->
+			J to represent Goods arrived C21 declaration. -->
 		<TypeCode>IMJ</TypeCode>
 		<!--DE 1/9: Total Number of Items.
 			Total number of goods items on the declaration. -->
 		<GoodsItemQuantity>1</GoodsItemQuantity>
-		<!--DE 6/18: Total packages.
+		<!--DE 6/18: Total Packages.
 			In this declaration, 150.
 			Note that this matches DE 6/10 because this is a single item declaration. -->
 		<TotalPackageQuantity>150</TotalPackageQuantity>
@@ -48,7 +48,7 @@
 		<Agent>
 			<FunctionCode>2</FunctionCode>
 		</Agent>
-		<!--DE 3/39: Holder of the authorisation ID Number.
+		<!--DE 3/39: Holder of the Authorisation Identification Number.
 			BRD to indicate BIRDS. -->
 		<AuthorisationHolder>
 			<ID>GB553202734852</ID>
@@ -85,30 +85,30 @@
 				Note: Unlike CHIEF this must now be completed. -->
 			<Consignment>
 				<ContainerCode>1</ContainerCode>
-				<!--DE 7/9: Identity of the Means of Transport on Arrival. 
+				<!--DE 7/9: Identity of Means of Transport on Arrival. 
 					Example number representing IATA flight number and date of flight. -->
 				<ArrivalTransportMeans>
 					<ID>NYC00120102021</ID>
 					<IdentificationTypeCode>40</IdentificationTypeCode>
 				</ArrivalTransportMeans>
-				<!--DE 5/23: Location of Goods. 
+				<!--DE 5/23: Location of Goods - Identification of location.
 					The location code for London Heathrow Airport (an IVL airport) an Inventory Linked location. -->
 				<GoodsLocation>
 					<Name>LHRLHRLHR</Name>
-					<!--DE 5/23: Type of Location.
+					<!--DE 5/23: Location of Goods - Type of location.
 						A in this scenario to represent that it is a designated location.-->
 					<TypeCode>A</TypeCode>
 					<Address>
-						<!--DE 5/23: Type of ID of the Location.
+						<!--DE 5/23: Location of Goods - Qualifier of the identification.
 							U in this scenario for UN/LOCODE. -->
 						<TypeCode>U</TypeCode>
-						<!--DE 5/23: Country code.
+						<!--DE 5/23: Location of Goods - Country.
 							Country where the goods may be examined.
 								GB in this scenario. -->
 						<CountryCode>GB</CountryCode>
 					</Address>
 				</GoodsLocation>
-				<!--DE 7/10: Container identification number. 
+				<!--DE 7/10: Container Identification Number. 
 					This is alpha-numeric with up to 17 characters.
 					For containers covered by the standard ISO 6346, the identifier (prefix) allocated by the International Bureau of in addition to the container identification number.
 					For swap bodies and semi-trailers the ILU (Intermodal Loading Units) code as introduced by the European EN 13044 shall be used. -->
@@ -133,7 +133,7 @@
 					<ID>GBBIRDS55320273485220211018095959</ID>
 					<TypeCode>BRD</TypeCode>
 				</AdditionalDocument>
-				<!--DE 2/2: Additional information. 
+				<!--DE 2/2: Additional Information. 
 					Code '00200' and description 'Various' are declared, to indicate multiple parties where the BIRDS declaration contains more than one exporter. -->
 				<AdditionalInformation>
 					<StatementCode>00200</StatementCode>
@@ -143,14 +143,14 @@
 				<Commodity>
 					<Description>Packets of Stickers</Description>
 					<!--DE 6/1: Net Mass.
-						Mass of the goods in kilograms without any packaging.
+						Weight of the goods in kilograms without any packaging.
                         N.B: There is no need to include a unitcode indicating KG. -->
 					<GoodsMeasure>
 						<GrossMassMeasure>4</GrossMassMeasure>
 						<NetNetWeightMeasure>3</NetNetWeightMeasure>
 					</GoodsMeasure>
-					<!--DE 4/14: Item Price/Amount.
-						The invoice was issued with a value of 2500 and the currency was in GBP. -->
+					<!--DE 4/14: Item Price/ Amount.
+						The invoice was issued with a value of 125 and the currency was in GBP. -->
 					<InvoiceLine>
 						<ItemChargeAmount currencyID="GBP">125</ItemChargeAmount>
 					</InvoiceLine>
@@ -204,7 +204,7 @@
 				<TypeCode>355</TypeCode>
 				<LineNumeric>1</LineNumeric>
 			</PreviousDocument>
-			<!--DE 2/4: Reference Number/UCR.
+			<!--DE 2/4: Reference Number/ UCR.
 				Reference number which is optional for the declarant to complete. -->
 			<UCR>
 				<TraderAssignedReferenceID>1GB553202734852-12345</TraderAssignedReferenceID>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM086a/TT_IM086a_v1.1.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM086a/TT_IM086a_v1.2.xml
similarity index 97%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM086a/TT_IM086a_v1.1.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM086a/TT_IM086a_v1.2.xml
index 133cf698..9b602cfa 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM086a/TT_IM086a_v1.1.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM086a/TT_IM086a_v1.2.xml
@@ -208,7 +208,6 @@
 			</UCR>
 		</GoodsShipment>
 			<!--DE 5/27: Supervising Customs Office. 
-				The Supervising Office Code for the HMRC Office overseeing the Customs Warehouse procedure. 
 				In this scenario, GBSFY001 for Salford, Ralli Quays (NTAS). -->
 		<SupervisingOffice>
 			<ID>GBSFY001</ID>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM099a/TT_IM099a_v1.0.xml b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM099a/TT_IM099a_v1.1.xml
similarity index 94%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM099a/TT_IM099a_v1.0.xml
rename to public/api/conf/1.0/examples/annotated_XML_samples/TT_IM099a/TT_IM099a_v1.1.xml
index 03c85bdb..c40676a7 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM099a/TT_IM099a_v1.0.xml
+++ b/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM099a/TT_IM099a_v1.1.xml
@@ -109,7 +109,7 @@
 			</Address>
 		</Exporter>
 		<GoodsShipment>
-			<!--DE 8/5: Nature of transaction. 
+			<!--DE 8/5: Nature of Transaction. 
 				Mandatory.
 				1 to indicate transactions involving actual or intended transfer of ownership from residents to non-residents against financial or other compensation.
 				Note: The second digit is not mandatory. -->
@@ -120,7 +120,7 @@
 					1 indicates that goods are transported in containers.
 					Note: Unlike CHIEF this must now be completed. -->
 				<ContainerCode>1</ContainerCode>
-				<!--DE 7/9: Identity of the means of transport on arrival. 
+				<!--DE 7/9: Identity of Means of Transport on Arrival. 
 					Mandatory unless postal or fixed energy installation.
 					Example number representing IMO ship identification number: '10', and 5 digits for the identification number: '12345'. -->
 				<ArrivalTransportMeans>
@@ -156,13 +156,13 @@
 					<ID>AD12345</ID>
 				</TransportEquipment>
 			</Consignment>
-			<!--DE 5/8: Country of destination code. 
+			<!--DE 5/8: Country of Destination Code. 
 				Mandatory. 
 				Destination country is Great Britain. -->
 			<Destination>
 				<CountryCode>GB</CountryCode>
 			</Destination>
-			<!--DE 5/14: Country of dispatch/export code. 
+			<!--DE 5/14: Country of Dispatch/Export Code. 
 				Mandatory. 
 				Export country is France. -->
 			<ExportCountry>
@@ -231,7 +231,7 @@
 					<LPCOExemptionCode>JP</LPCOExemptionCode>
 				</AdditionalDocument>
 				<Commodity>
-					<!--DE 6/8: Description of goods. 
+					<!--DE 6/8: Description of Goods. 
 						Mandatory.
 						Description of the goods specific enough to enable classification - without repeating the CN code description in the Tariff. -->
 					<Description>Prepared foodstuffs: Beverages,Spirits and Vinegar,Tobacco and manufactured Tobacco substitutes</Description>
@@ -243,7 +243,7 @@
 						<IdentificationTypeCode>TSP</IdentificationTypeCode>
 					</Classification>
 					<Classification>
-						<!--DE 6/15: Commodity Code - TARIC code.
+						<!--DE 6/15: Commodity Code: TARIC code.
 							Two characters for the application of specific Union measures in respect of formalities to be completed at destination.
 							Identification Type Code TRC indicates TARIC Code. -->
 						<ID>90</ID>
@@ -261,8 +261,7 @@
 							100 represents no preference being claimed. -->
 						<DutyRegimeCode>100</DutyRegimeCode>
 						<!--DE 4/4: Calculation of Taxes - Tax Base. 
-							Code GBP used as a manual duty calculation is being made.
-							Note where 'OVR01' is declared in D.E. 2/2 (Additional Information) on a Type C or Type F declaration, DE 4/4 (Tax Base) must be declared. -->
+							Code GBP used as a manual duty calculation is being made. -->
 						<SpecificTaxBaseQuantity unitCode="GBP">2500</SpecificTaxBaseQuantity>
 						<!--DE 4/3: Tax Type.
 							A00 represents UK Customs Duty -->
@@ -309,7 +308,7 @@
 							Litre Pure (100%) Alcohol (LPA). -->
 						<TariffQuantity>100</TariffQuantity>
 					</GoodsMeasure>
-					<!--DE 4/14: Item price amount. 
+					<!--DE 4/14: Item Price/ Amount. 
 						Mandatory.
 						The invoice was issued with a value of 5000 and the currency was in GBP. -->
 					<InvoiceLine>
@@ -330,7 +329,7 @@
 					<CurrentCode>40</CurrentCode>
 					<PreviousCode>00</PreviousCode>
 				</GovernmentProcedure>
-				<!--DE 1/11: Additional Procedure. 
+				<!--DE 1/11: Additional Procedure Code. 
 					Mandatory
 					000 to indicate no additional procedure. -->
 				<GovernmentProcedure>
@@ -351,11 +350,11 @@
 						Mandatory.
 						Marks on the packages. -->
 					<MarksNumbersID>BX-1234228/34</MarksNumbersID>
-					<!--DE 6/10: Number of packages. 
+					<!--DE 6/10: Number of Packages. 
 						Mandatory.
 						There are 50 packages of the commodity for this goods item. -->
 					<QuantityQuantity>50</QuantityQuantity>
-					<!--DE 6/9: Type of packages. 
+					<!--DE 6/9: Type of Packages. 
 						Mandatory.
 						BX to represent Box. -->
 					<TypeCode>BX</TypeCode>
@@ -377,7 +376,7 @@
 			<Importer>
 				<ID>GB553202734852</ID>
 			</Importer>
-			<!--DE 2/1: Simplified Declarations/Previous documents.
+			<!--DE 2/1: Simplified Declaration/ Previous Documents.
 				Previous document to show the DUCR assigned to the consignment.
 				Note: The DUCR is not mandatory for ‘normal’ declarations, only if CFSP or where the business process mandates a DUCR for validation (such as for validating a PEACH record via ALVS etc). -->
 			<PreviousDocument>
@@ -385,7 +384,7 @@
 				<ID>1GB553202734852-12345</ID>
 				<TypeCode>DCR</TypeCode>
 			</PreviousDocument>
-			<!--DE 2/1: Simplified Declarations/Previous documents.
+			<!--DE 2/1: Simplified Declaration/ Previous documents.
 				Previous document of Z355 to show the MRN for the entry summary declaration. 
 				Note: As this is for a single item declaration, this should all be declared at header level. -->
 			<PreviousDocument>
@@ -409,7 +408,7 @@
 				Where document code C505 is declared in DE 2/3 (Document Codes) and authorisation type code is declared in DE 3/39 (Holder of the Authorisation), then this data element is mandatory.
 				ID indicates that the guarantee is not required, as stated in DE 8/2. -->
 			<ID>Guaranteenotrequired</ID>
-			<!--DE 8/2: Guarantee Type. 
+			<!--DE 8/2: Guarantee Type and Cash Accounts. 
 				Mandatory for certain procedure codes/MOP.
 				0 to represent that a customs comprehensive Guarantee is being waived for the deferment of customs duty.
 				Where document code C505 is declared in DE 2/3 (Document Codes) and authorisation type code CGU is declared in DE 3/39 (Holder of the Authorisation), then code '0' or '1' must be declared in this data element. -->
diff --git a/public/api/conf/2.0/docs/schema.md b/public/api/conf/2.0/docs/schema.md
index 11b6cf73..9b4bdead 100644
--- a/public/api/conf/2.0/docs/schema.md
+++ b/public/api/conf/2.0/docs/schema.md
@@ -4,6 +4,6 @@ Schema definitions for all the API endpoints request and response payloads can b
   <a href="/api-documentation/docs/api/download/customs-inventory-linking-exports/2.0/inventory-linking-exports-schemas.zip" class="govuk-link">Schemas and example messages</a>
 </p>
 
-<p class="govuk-body-s" style="font-size: 16px;margin-bottom: 15px;">ZIP, 2.0MB last updated 17/06/2022</p>
+<p class="govuk-body-s" style="font-size: 16px;margin-bottom: 15px;">ZIP, 2.0MB last updated 20/07/2022</p>
 
 <p class="govuk-body-s" style="font-size: 16px;margin-bottom: 15px;">The ZIP file contains XML files. Open in your preferred file viewer.</p>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/Annotated_Scenario_Descriptions_TTM19.0.1_20220719.xlsx b/public/api/conf/2.0/examples/annotated_XML_samples/Annotated_Scenario_Descriptions_TTM19.0.1_20220719.xlsx
new file mode 100644
index 00000000..627d80c5
Binary files /dev/null and b/public/api/conf/2.0/examples/annotated_XML_samples/Annotated_Scenario_Descriptions_TTM19.0.1_20220719.xlsx differ
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/Annotated_Scenario_Descriptions_TTM19.0_20220616.xlsx b/public/api/conf/2.0/examples/annotated_XML_samples/Annotated_Scenario_Descriptions_TTM19.0_20220616.xlsx
deleted file mode 100644
index b91f5acd..00000000
Binary files a/public/api/conf/2.0/examples/annotated_XML_samples/Annotated_Scenario_Descriptions_TTM19.0_20220616.xlsx and /dev/null differ
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_EX002a/TT_EX002a_v2.0.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_EX002a/TT_EX002a_v2.0.xml
index 8b4f7fbe..d9a1c133 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_EX002a/TT_EX002a_v2.0.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_EX002a/TT_EX002a_v2.0.xml
@@ -242,11 +242,11 @@
 				<LineNumeric>1</LineNumeric>
 			</PreviousDocument>
 		</GoodsShipment>
-		<!--DE 5/27: Supervising customs office. The Supervising Office Code for the
-			   HMRC Office overseeing the Customs Warehouse procedure. In this scenario, this
-			   is Nottingham Customs Office.-->
+		<!--DE 5/27: Supervising Customs Office.
+			In this scenario, this is Nottingham Customs Office. -->
 		<SupervisingOffice>
 			<ID>GBNTG004</ID>
 		</SupervisingOffice>
 	</Declaration>
 </md:MetaData>
+ 
\ No newline at end of file
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_EX002b/TT_EX002a_v2.0.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_EX002b/TT_EX002a_v2.1.xml
similarity index 96%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_EX002b/TT_EX002a_v2.0.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_EX002b/TT_EX002a_v2.1.xml
index 8b4f7fbe..44780345 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_EX002b/TT_EX002a_v2.0.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_EX002b/TT_EX002a_v2.1.xml
@@ -242,9 +242,8 @@
 				<LineNumeric>1</LineNumeric>
 			</PreviousDocument>
 		</GoodsShipment>
-		<!--DE 5/27: Supervising customs office. The Supervising Office Code for the
-			   HMRC Office overseeing the Customs Warehouse procedure. In this scenario, this
-			   is Nottingham Customs Office.-->
+		<!--DE 5/27: Supervising customs office. 
+			In this scenario, this is Nottingham Customs Office. -->
 		<SupervisingOffice>
 			<ID>GBNTG004</ID>
 		</SupervisingOffice>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_EX023a/TT_EX023a_v1.3.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_EX023a/TT_EX023a_v1.4.xml
similarity index 83%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_EX023a/TT_EX023a_v1.3.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_EX023a/TT_EX023a_v1.4.xml
index e88c17eb..810d428e 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_EX023a/TT_EX023a_v1.3.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_EX023a/TT_EX023a_v1.4.xml
@@ -43,19 +43,20 @@
 		<IssueDateTime>
 			<p1:DateTimeString formatCode="304">20210923080000+01</p1:DateTimeString>
 		</IssueDateTime>
-		<!--DE 1/1: EX to represent an Export declaration.-->
-		<!--DE 1/2: A to represent a standard frontier declaration.-->
+		<!--DE 1/1: Declaration Type. 
+			EX to represent an Export declaration. -->
+		<!--DE 1/2: Additional Declaration Type. 
+			A to represent a standard frontier declaration. -->
 		<TypeCode>EXA</TypeCode>
-		<!--DE 1/9: Total number of goods items on the declaration.-->
+		<!--DE 1/9: Total Number of Items. -->
 		<GoodsItemQuantity>1</GoodsItemQuantity>
 		<!--DE 5/26: Customs Office of Presentation. 
-			Note 1: This information is only required when centralised clearance/SASP is being used, and
-			may be removed in the next version of this sample.
+			Note 1: This information is only required when centralised clearance/SASP is being used, and may be removed in the next version of this sample.
 			Note 2: 'DeclarationOfficeID' and 'Declaration/PresentationOffice/ID' are two different fields. DeclarationOfficeID is unassigned from any UCC/Data Element number so this can apply to any Data Element number: in this case 5/26. -->
 		<DeclarationOfficeID>GBLBA001</DeclarationOfficeID>
-		<!--DE 4/11: Total invoice amount. -->
+		<!--DE 4/11: Total Amount Invoiced. -->
 		<InvoiceAmount currencyID="JPY">15000</InvoiceAmount>
-		<!--DE 6/18: Total packages. -->
+		<!--DE 6/18: Total Packages. -->
 		<TotalPackageQuantity>50</TotalPackageQuantity>
 		<!--DE 3/39: Holder of the authorisation identification number. 
 			OPO indicates authorisation for the use of outward processing procedure. -->
@@ -63,7 +64,7 @@
 			<ID>GB896458895023</ID>
 			<CategoryCode>OPO</CategoryCode>
 		</AuthorisationHolder>
-		<!--DE 3/39: Holder of the authorisation identification number.
+		<!--DE 3/39: Holder of the Authorisation Identification Number.
 			An authorisation type code of CSE indicates Customs Supervised Exports authorisation issued by the competent authorities of the Member States. -->
 		<AuthorisationHolder>
 			<ID>GB896458895023</ID>
@@ -89,11 +90,12 @@
 					<PostcodeID>SE1 7PB</PostcodeID>
 				</Address>
 			</Carrier>
-			<!-- DE 4/2: Transport charges method of payment. C indicating payment by cheque. -->
+			<!--DE 4/2: Transport charges method of payment. 
+				C indicating payment by cheque. -->
 			<Freight>
 				<PaymentMethodCode>C</PaymentMethodCode>
 			</Freight>
-			<!-- DE 5/18: Countries of routing codes. 
+			<!--DE 5/18: Countries of Routing Codes. 
 				GBJP Routing from GB to JP. 
 				This is Security and Safety Data. -->
 			<Itinerary>
@@ -105,20 +107,22 @@
 				<RoutingCountryCode>JP</RoutingCountryCode>
 			</Itinerary>
 		</Consignment>
-		<!--DE 3/18: EORI number of the Declarant. -->
+		<!--DE 3/18: Declarant Identification Number.  
+			EORI number of the Declarant. -->
 		<Declarant>
 			<ID>GB896458895023</ID>
 		</Declarant>
-		<!--DE 5/12 Customs office of exit. -->
+		<!--DE 5/12: Customs Office of Exit. -->
 		<ExitOffice>
 			<ID>GB000051</ID>
 		</ExitOffice>
-		<!--DE 3/2: EORI number of the Exporter, the same as 3/18. -->
+		<!--DE 3/2: Exporter Identification Number. 
+			EORI number of the Exporter, the same as 3/18. -->
 		<Exporter>
 			<ID>GB896458895023</ID>
 		</Exporter>
 		<GoodsShipment>
-			<!-- DE 3/9: Consignee name and address details. -->
+			<!--DE 3/9: Consignee Name and Address. -->
 			<Consignee>
 				<Name>Tokyo Export</Name>
 				<Address>
@@ -129,16 +133,19 @@
 				</Address>
 			</Consignee>
 			<Consignment>
-				<!--DE 7/2: 1 to indicate that the goods are transported in containers. -->
+				<!--DE 7/2: Container. 
+					1 to indicate that the goods are transported in containers. -->
 				<ContainerCode>1</ContainerCode>
-				<!--DE 7/7: ID of the means of transport. -->
-				<!--DE 7/5: '3' indicating lorry from CSE location to the ship/boat. -->
+				<!--DE 7/7: Identity of the means of transport at departure. -->
+				<!--DE 7/5: Inland Mode of Transport. 
+					'3' indicating lorry from CSE location to the ship/boat. -->
 				<DepartureTransportMeans>
 					<ID>123</ID>
 					<IdentificationTypeCode>10</IdentificationTypeCode>
 					<ModeCode>3</ModeCode>
 				</DepartureTransportMeans>
-				<!--DE 5/23: ID to give a unique position of the location.
+				<!--DE 5/23: Location of Goods. 
+					ID to give a unique position of the location.
 					FXTFXTFXT Indicating Felixstowe. -->
 				<GoodsLocation>
 					<Name>FXTFXTFXT</Name>
@@ -153,19 +160,19 @@
 						Sequence number and ID of the container. -->
 					<SequenceNumeric>1</SequenceNumeric>
 					<ID>Container123</ID>
-					<!--DE 7/18: Seal sequence number 1, then seal number. -->
+					<!--DE 7/18: Seal number. -->
 					<Seal>
 						<SequenceNumeric>1</SequenceNumeric>
 						<ID>12345</ID>
 					</Seal>
 				</TransportEquipment>
 			</Consignment>
-			<!--DE 5/8: Country code of the destination country.
+			<!--DE 5/8: Country of Destination Code.
 				JP Indicating Indicating Japan. -->
 			<Destination>
 				<CountryCode>JP</CountryCode>
 			</Destination>
-			<!--DE 5/14: Country of Destination Code.
+			<!--DE 5/14: Country of Dispatch/Export Code. 
 				In this case GB. -->
 			<ExportCountry>
 				<ID>GB</ID>
@@ -196,7 +203,7 @@
 					<ID>GBCSE896458895023E</ID>
 					<TypeCode>019</TypeCode>
 				</AdditionalDocument>
-				<!--DE 2/2: Additional information. 
+				<!--DE 2/2: Additional Information. 
 					00400 Indicating Self representation i.e. the declarant and the exporter are the same party. -->
 				<AdditionalInformation>
 					<StatementCode>00400</StatementCode>
@@ -204,23 +211,23 @@
 					<StatementTypeCode>ACB</StatementTypeCode>
 				</AdditionalInformation>
 				<Commodity>
-					<!--DE 6/8: Description of the goods. -->
+					<!--DE 6/8: Description of Goods. -->
 					<Description>Straw envelopes for bottles</Description>
-					<!--DE 6/14: Commodity code - combined nomenclature code. -->
+					<!--DE 6/14: Commodity Code - Combined Nomenclature Code. -->
 					<Classification>
 						<ID>46021910</ID>
 						<IdentificationTypeCode>TSP</IdentificationTypeCode>
 					</Classification>
 					<GoodsMeasure>
 						<!--DE 6/5: Gross Mass.
-							Mass of the goods in kilograms including packaging. -->
+							Weight of the goods in kilograms including packaging. -->
 						<GrossMassMeasure unitCode="KGM">700</GrossMassMeasure>
 						<!--DE 6/1: Net Mass. 
-							Mass of the goods in kilograms without any packaging. -->
+							Weight of the goods in kilograms without any packaging. -->
 						<NetNetWeightMeasure unitCode="KGM">500</NetNetWeightMeasure>
 					</GoodsMeasure>
 				</Commodity>
-				<!--DE 1/10: Procedure Code.
+				<!--DE 1/10: Procedure.
 					Requested procedure of 2100 indicating temporary export under outward processing where the goods have not been subject to any previous procedure. -->
 				<GovernmentProcedure>
 					<CurrentCode>21</CurrentCode>
@@ -244,7 +251,7 @@
 					<TypeCode>BX</TypeCode>
 				</Packaging>
 			</GovernmentAgencyGoodsItem>
-			<!--DE 2/1: Simplified Declaration/ Previous Documents .
+			<!--DE 2/1: Simplified Declaration/ Previous Documents.
 				Previous document to show the DUCR assigned to the consignment. -->
 			<PreviousDocument>
 				<CategoryCode>Z</CategoryCode>
@@ -254,7 +261,6 @@
 			</PreviousDocument>
 		</GoodsShipment>
 		<!--DE 5/27: Supervising Customs Office. 
-			The Supervising Office Code for the HMRC Office overseeing the Customs Warehouse procedure. 
 			ID GBBEL004 is Belfast, Dorchester House (NIRU). -->
 		<SupervisingOffice>
 			<ID>GBBEL004</ID>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI001a/TT_FI001a_v1.6.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI001a/TT_FI001a_v1.7.xml
similarity index 96%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_FI001a/TT_FI001a_v1.6.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_FI001a/TT_FI001a_v1.7.xml
index 7346ea57..e8f5e92d 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI001a/TT_FI001a_v1.6.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI001a/TT_FI001a_v1.7.xml
@@ -192,9 +192,9 @@
 					<MethodCode>1</MethodCode>
 				</CustomsValuation>
 				<GovernmentProcedure>
-					<!--DE 1/10: Requested Procedure of 40 indicating Release to free circulation where goods are released from a customs warehouse.-->
+					<!--DE 1/10: Requested Procedure of 40 indicating there is no previous procedure. -->
 					<CurrentCode>40</CurrentCode>
-					<!--DE 1/10: Previous Procedure of 00 indicating there is no previous procedure-->
+					<!--DE 1/10: Previous Procedure of 00 indicating there is no previous procedure. -->
 					<PreviousCode>00</PreviousCode>
 				</GovernmentProcedure>
 				<!--DE 1/11: Additional Procedure.
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI001b/TT_FI001b_v1.5.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI001b/TT_FI001b_v1.6.xml
similarity index 96%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_FI001b/TT_FI001b_v1.5.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_FI001b/TT_FI001b_v1.6.xml
index 2738f769..9ab267a4 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI001b/TT_FI001b_v1.5.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI001b/TT_FI001b_v1.6.xml
@@ -189,9 +189,9 @@
 					<MethodCode>1</MethodCode>
 				</CustomsValuation>
 				<GovernmentProcedure>
-					<!--DE 1/10: Requested Procedure of 40 indicating Release to free circulation where goods are released from a customs warehouse. -->
+					<!--DE 1/10: Requested Procedure of 40 indicating there is no previous procedure. -->
 					<CurrentCode>40</CurrentCode>
-					<!--DE 1/10: Previous Procedure of 00 indicating placing of goods under the customs warehousing procedure. -->
+					<!--DE 1/10: Previous Procedure of 00 indicating there is no previous procedure. -->
 					<PreviousCode>00</PreviousCode>
 				</GovernmentProcedure>
 				<!--DE 1/11: C28 to indicate simultaneous release for free circulation and home use of goods imported. -->
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI002a/TT_FI002a_v1.6.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI002a/TT_FI002a_v1.7.xml
similarity index 96%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_FI002a/TT_FI002a_v1.6.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_FI002a/TT_FI002a_v1.7.xml
index 44ce1c4e..e0ca508d 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI002a/TT_FI002a_v1.6.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI002a/TT_FI002a_v1.7.xml
@@ -96,8 +96,7 @@
 					<IdentificationTypeCode>10</IdentificationTypeCode>
 				</ArrivalTransportMeans>
 				<GoodsLocation>
-					<!--DE 5/23: Location of Goods - Identification of location.
-						The location code for the Customs Warehouse. 
+					<!--DE 5/23: Location of Goods - Identification of location. 
 						Note that this declaration uses a frontier declaration at Wallasea Island, Baltic Wharf (NILP) for test purposes only: for business use a pre-lodged declaration must be submitted because Baltic Wharf is listed as an 'Other listed location'. -->
 					<Name>WLALONBTW</Name>
 					<!--DE 5/23: Location of Goods - Type of location.
@@ -278,8 +277,7 @@
 					<!--DE 1/10: Requested Procedure of 44 indicating Release to free circulation with duty 
 						relief granted under the End Use Special Procedure.-->
 					<CurrentCode>44</CurrentCode>
-					<!--DE 1/10: Previous Procedure of 00 indicating there is no Previous Procedure a 
-						customs warehouse.-->
+					<!--DE 1/10: Previous Procedure of 00 indicating there is no Previous Procedure. -->
 					<PreviousCode>00</PreviousCode>
 				</GovernmentProcedure>
 				<!--DE 1/11: Goods imported under the shipwork end-use procedure.-->
@@ -353,9 +351,9 @@
 			<SecurityDetailsCode>3</SecurityDetailsCode>
 		</ObligationGuarantee>
 		<SupervisingOffice>
-			<!--DE 5/27: Supervising customs office. The Supervising Office Code for the HMRC Office 
-				overseeing the Customs Warehouse procedure. 
-				In this scenario, this is Belfast, Dorchester House (NIRU).-->
+			<!--DE 5/27: Supervising customs office. 
+				The Supervising Office Code for the HMRC Office. 
+				In this scenario, this is Belfast, Dorchester House (NIRU). -->
 			<ID>GBBEL004</ID>
 		</SupervisingOffice>
 	</Declaration>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI005a/TT_FI005a_v1.5.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI005a/TT_FI005a_v1.6.xml
similarity index 96%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_FI005a/TT_FI005a_v1.5.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_FI005a/TT_FI005a_v1.6.xml
index 33065157..d80816ba 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_FI005a/TT_FI005a_v1.5.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI005a/TT_FI005a_v1.6.xml
@@ -112,9 +112,7 @@
 						linked location.
 						Note that this declaration uses a frontier declaration at Wallasea Island, Baltic Wharf (NILP) for test purposes only: for business use a pre-lodged declaration must be submitted because Baltic Wharf is listed as an 'Other listed location'. -->
 					<Name>WLALONBTW</Name>
-					<!--DE 5/23: Location of Goods - Type of location.
-						Type of Location - B is used to identify inland locations such as 
-						customs warehouses.-->
+					<!--DE 5/23: Location of Goods - Type of location.-->
 					<TypeCode>A</TypeCode>
 					<Address>
 						<!--DE 5/23: Location of Goods - Qualifier of the identification.
@@ -235,8 +233,7 @@
 					<!--DE 1/10: Requested Procedure of 44 indicating Release to free circulation with 
 						duty relief granted under the End Use Special Procedure. -->
 					<CurrentCode>44</CurrentCode>
-					<!--DE 1/10: Previous Procedure of 00 indicating there is no Previous Procedure a 
-						customs warehouse.-->
+					<!--DE 1/10: Previous Procedure of 00 indicating there is no Previous Procedure. -->
 					<PreviousCode>00</PreviousCode>
 				</GovernmentProcedure>
 				<!--DE 1/11: 000 to indicate no additional procedure.-->
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI005b/TT_FI005b_v1.4.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI005b/TT_FI005b_v1.5.xml
similarity index 95%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_FI005b/TT_FI005b_v1.4.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_FI005b/TT_FI005b_v1.5.xml
index 5ebae08a..d1156508 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI005b/TT_FI005b_v1.4.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_FI005b/TT_FI005b_v1.5.xml
@@ -96,11 +96,9 @@
 				</ArrivalTransportMeans>
 				<GoodsLocation>
 					<!--DE 5/23: Location of Goods - Identification of location.
-						The location code for the Customs Warehouse.
 						Note that this declaration uses a frontier declaration at Wallasea Island, Baltic Wharf (NILP) for test purposes only: for business use a pre-lodged declaration must be submitted because Baltic Wharf is listed as an 'Other listed location'. -->
 					<Name>WLALONBTW</Name>
-					<!--DE 5/23: Location of Goods - Type of location.
-						B is used to identify inland locations such as customs warehouses. -->
+					<!--DE 5/23: Location of Goods - Type of location. -->
 					<TypeCode>A</TypeCode>
 					<Address>
 						<!--DE 5/23: Location of Goods - Qualifier of the identification.
@@ -210,8 +208,7 @@
 					<!--DE 1/10: Procedure.
 						Requested Procedure of 44 indicating Release to free circulation with duty relief granted under the End Use Special Procedure. -->
 					<CurrentCode>44</CurrentCode>
-					<!--DE 1/10: Procedure.
-						Previous Procedure of 00 indicating there is no Previous Procedure a customs warehouse. -->
+					<!--DE 1/10: Procedure. -->
 					<PreviousCode>00</PreviousCode>
 				</GovernmentProcedure>
 				<!--DE 1/11: Additional Procedure Code.
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM002c/TT_IM002c_Complex_Multi_Amendment_v1.3.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM002c/TT_IM002c_Complex_Multi_Amendment_v1.3.xml
new file mode 100644
index 00000000..a43ec8ae
--- /dev/null
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM002c/TT_IM002c_Complex_Multi_Amendment_v1.3.xml
@@ -0,0 +1,270 @@
+<md:MetaData
+      xmlns="urn:wco:datamodel:WCO:DEC-DMS:2"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xmlns:clm63055="urn:un:unece:uncefact:codelist:standard:UNECE:AgencyIdentificationCode:D12B"
+      xmlns:ds="urn:wco:datamodel:WCO:MetaData_DS-DMS:2"
+      xmlns:md="urn:wco:datamodel:WCO:DocumentMetaData-DMS:2"
+      xsi:schemaLocation="urn:wco:datamodel:WCO:DocumentMetaData-DMS:2 ../DocumentMetaData_2_DMS.xsd "    >
+			<md:WCODataModelVersionCode>3.6</md:WCODataModelVersionCode>
+			<md:WCOTypeName>DEC</md:WCOTypeName>
+			<md:ResponsibleCountryCode>GB</md:ResponsibleCountryCode>
+			<md:ResponsibleAgencyName>HMRC</md:ResponsibleAgencyName>
+			<md:AgencyAssignedCustomizationVersionCode>v2.1</md:AgencyAssignedCustomizationVersionCode>
+			<Declaration
+        xmlns="urn:wco:datamodel:WCO:DEC-DMS:2"
+        xmlns:clm5ISO42173A="urn:un:unece:uncefact:codelist:standard:ISO:ISO3AlphaCurrencyCode:2012-08-31"
+        xmlns:clm63055="urn:un:unece:uncefact:codelist:standard:UNECE:AgencyIdentificationCode:D12B"
+        xmlns:p1="urn:wco:datamodel:WCO:Declaration_DS:DMS:2"
+        xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:6"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="urn:wco:datamodel:WCO:DEC-DMS:2 ../WCO_DEC_2_DMS.xsd " >
+				<!--Function Code of 13 to represent Request (Additional Message). -->
+				<FunctionCode>13</FunctionCode>
+				<!--The trader assigned reference to the additional message. 
+					Note that this reference is independent of the declaration. -->
+				<FunctionalReferenceID>TT_IM02c_0307_886</FunctionalReferenceID>
+				<!--Declaration ID of the corresponding Declaration to be amended. -->
+				<ID>20GB7BKUHU20XX8PR5</ID>
+				<!--Defines the type of additional message.
+					In this scenario, COR to indicate that this additional message is an amendment. -->
+				<TypeCode>COR</TypeCode>
+				<TotalPackageQuantity>53</TotalPackageQuantity>						<!-- 146 -->
+				<AdditionalInformation>
+					<StatementDescription>Amend TotalPackageQuantity DE 6/18 - Tag 146</StatementDescription>
+					<!--TotalPackageQuantity -->
+					<StatementTypeCode>AES</StatementTypeCode>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>06A</DocumentSectionCode>
+					</Pointer>
+				</AdditionalInformation>    
+				<AdditionalInformation>
+					<!--Textual description of the reason for amendment. -->
+					<StatementDescription>Amend Exporter Name Tag R031</StatementDescription>
+					<!--Exporter/Name -->
+					<!--The type of Additional Information. 
+						'AES' should always be used or Cancellations and Amendments to indicate a free text reason is being provided. -->
+					<StatementTypeCode>AES</StatementTypeCode>
+					<!--The two pointer elements below point to the Declaration (42A) and the Amendment (06A) in the Declaration (which can be seen below).
+                        This is so that the textual description can be linked to its corresponding amendment reason code. -->
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>2</SequenceNumeric>
+						<DocumentSectionCode>06A</DocumentSectionCode>
+					</Pointer>
+				</AdditionalInformation>
+				<AdditionalInformation>
+					<!--Textual description of the reason for amendment. -->
+					<StatementDescription>Amend Exporter CityName Tag 241</StatementDescription>
+					<!--CityName -->
+					<!--The type of Additional Information. 
+						'AES' should always be used for Cancellations and Amendments to indicate a free text reason is being provided. -->
+					<StatementTypeCode>AES</StatementTypeCode>
+					<!--The two pointer elements below point to the Declaration (42A) and the Amendment (06A) in the Declaration (which can be seen below).
+                        This is so that the textual description can be linked to its corresponding amendment reason code. -->
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>3</SequenceNumeric>
+						<DocumentSectionCode>06A</DocumentSectionCode>
+					</Pointer>
+				</AdditionalInformation>
+				<AdditionalInformation>
+					<!--Textual description of the reason for amendment. -->
+					<StatementDescription>Amend Exporter Address Line Tag 239</StatementDescription>
+					<!--Line -->
+					<!--The type of Additional Information. 
+						'AES' should always be used for Cancellations and Amendments to indicate a free text reason is being provided.-->
+					<StatementTypeCode>AES</StatementTypeCode>
+					<!--The two pointer elements below point to the Declaration (42A) and the Amendment (06A) in the Declaration (which can be seen below).
+                        This is so that the textual description can be linked to its corresponding amendment reason code. -->
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>4</SequenceNumeric>
+						<DocumentSectionCode>06A</DocumentSectionCode>
+					</Pointer>
+				</AdditionalInformation>
+				<AdditionalInformation>
+					<!--Textual description of the reason for amendment-->
+					<StatementDescription>Amend Exporter Postal Code Tag 245</StatementDescription>
+					<!--PostcodeID-->
+					<!--The type of Additional Information. 
+						'AES' should always be used for Cancellations and Amendments to indicate a free text reason is being provided. -->
+					<StatementTypeCode>AES</StatementTypeCode>
+					<!--The two pointer elements below point to the Declaration (42A) and the Amendment (06A) in the Declaration (which can be seen below).
+                        This is so that the textual description can be linked to its corresponding amendment reason code. -->
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>5</SequenceNumeric>
+						<DocumentSectionCode>06A</DocumentSectionCode>
+					</Pointer>
+				</AdditionalInformation>
+				<AdditionalInformation>
+					<StatementDescription>Amend QuantityQuantity DE 6/10 - Tag 144</StatementDescription>
+					<!--QtyQty-->
+					<StatementTypeCode>AES</StatementTypeCode>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>6</SequenceNumeric>
+						<DocumentSectionCode>06A</DocumentSectionCode>
+					</Pointer>
+				</AdditionalInformation>                            
+				<!-- *********************************************************************************************** -->
+				<Amendment>
+					<!--Change Reason Code.
+						Used to indicate the reason for the amendment. 
+						In this scenario, a code of 28 to indicate reason for amendment in this case 'Amend weight or quantity'. -->
+					<ChangeReasonCode>28</ChangeReasonCode>
+					<!--Pointers describe the declaration tree down to the part of the Declaration which needs to be amended as follows: 
+                        Declaration (42A) -> Tag 146 for TotalPackageQuantityQuantity. -->
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+						<TagID>146</TagID>
+						<!--TotalPackageQuantity -->
+					</Pointer>
+				</Amendment>
+				<!--Details of the amendment to be made to the Declaration. -->
+				<Amendment>
+					<!--Used to indicate the reason for the amendment - in this scenario, a code of 29 to indicate that consignee/consignor is being amended. -->
+					<ChangeReasonCode>29</ChangeReasonCode>
+					<!--Pointers describe the declaration tree down to the part of the Declaration which needs to be amended as follows:
+						Declaration (42A) ->
+							Exporter (57A) ->  
+								Exporter/Address (04A) -->              
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>2</SequenceNumeric>
+						<DocumentSectionCode>57A</DocumentSectionCode>
+						<TagID>R031</TagID>
+						<!--Exporter/Name -->
+					</Pointer>
+				</Amendment>
+				<Amendment>
+					<ChangeReasonCode>29</ChangeReasonCode>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>57A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>3</SequenceNumeric>
+						<DocumentSectionCode>04A</DocumentSectionCode>                 
+						<TagID>241</TagID>
+						<!--CityName -->
+					</Pointer>
+				</Amendment>
+				<Amendment>
+					<ChangeReasonCode>29</ChangeReasonCode>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>57A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>4</SequenceNumeric>
+						<DocumentSectionCode>04A</DocumentSectionCode>                 
+						<TagID>239</TagID>
+						<!--Address Line -->
+					</Pointer>
+				</Amendment>
+				<Amendment>
+					<ChangeReasonCode>29</ChangeReasonCode>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>57A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>5</SequenceNumeric>
+						<DocumentSectionCode>04A</DocumentSectionCode>                 
+						<TagID>245</TagID>
+						<!--PostcodeID -->
+					</Pointer>
+				</Amendment>
+				<!--End of Exporter Name and Address. -->
+				<!--Details of the QuantityQuantity amendment to be made to the Declaration. -->
+				<Amendment>
+					<!--Change Reason Code - Used to indicate the reason for the amendment. 
+                        In this scenario, a code of 28 to indicate reason for amendment in this case 'Amend weight or quantity'. -->
+					<ChangeReasonCode>28</ChangeReasonCode>
+					<!--Pointers describe the declaration tree down to the part of the Declaration which needs to be amended as follows: 
+							Declaration (42A) -> 
+								GoodsShipment (67A) -> 
+									GovernmentAgencyGoodsItem (68A) -> 
+										Packaging (93A) -> 
+										   Tag 144 for QuantityQuantity -->
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>42A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>67A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>68A</DocumentSectionCode>
+					</Pointer>
+					<Pointer>
+						<SequenceNumeric>1</SequenceNumeric>
+						<DocumentSectionCode>93A</DocumentSectionCode>
+						<TagID>144</TagID>
+						<!--QuantityQuantity -->
+					</Pointer>
+				</Amendment>
+				<!--***********************************************************************************-->
+				<!--The details below refer to the Declaration data that is being amended. 
+                    As described by the pointer structure above, the information below maps to the element being amended. -->
+				<Exporter>
+					<Name>Detroit Cocoa Company</Name>								<!--R031 -->       
+					<Address>														<!--04A -->
+						<CityName>Detroit</CityName>								<!--241 -->
+						<CountryCode>US</CountryCode>	
+						<Line>101 Peterboro Avenue</Line>							<!--239 -->
+						<PostcodeID>48201</PostcodeID>								<!--245 -->
+					</Address>
+				</Exporter>
+				<GoodsShipment>		
+					<GovernmentAgencyGoodsItem>
+						<SequenceNumeric>1</SequenceNumeric>
+						<Packaging>
+							<SequenceNumeric>1</SequenceNumeric>
+							<MarksNumbersID>PK12345</MarksNumbersID>
+							<QuantityQuantity>53</QuantityQuantity>					<!--144 -->
+							<TypeCode>IG</TypeCode>
+						</Packaging>
+					</GovernmentAgencyGoodsItem>
+				</GoodsShipment>
+			</Declaration>
+		</md:MetaData>
\ No newline at end of file
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM009a/TT_IM009a_v2.5.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM009a/TT_IM009a_v2.6.xml
similarity index 97%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM009a/TT_IM009a_v2.5.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM009a/TT_IM009a_v2.6.xml
index 10daabbb..38503083 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM009a/TT_IM009a_v2.5.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM009a/TT_IM009a_v2.6.xml
@@ -336,9 +336,8 @@
 			<SecurityDetailsCode>1</SecurityDetailsCode>
 		</ObligationGuarantee>
 		<SupervisingOffice>
-			<!--DE 5/27: Supervising customs office. The Supervising Office Code for the
-			  HMRC Office overseeing the Customs Warehouse procedure. In this scenario, this
-			  is Belfast, Dorchester House (NIRU).-->
+			<!--DE 5/27: Supervising Customs Office. 
+				In this scenario, this is Belfast, Dorchester House (NIRU). -->
 			<ID>GBBEL004</ID>
 		</SupervisingOffice>
 	</Declaration>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM009b/TT_IM009b_v2.2.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM009b/TT_IM009b_v2.3.xml
similarity index 95%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM009b/TT_IM009b_v2.2.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM009b/TT_IM009b_v2.3.xml
index 3f398dbb..058e80b0 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM009b/TT_IM009b_v2.2.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM009b/TT_IM009b_v2.3.xml
@@ -88,15 +88,14 @@
 				</ArrivalTransportMeans>
 				<GoodsLocation>
 					<!--DE 5/23: Location of Goods - Identification of location. 
-						The location code for the Customs Warehouse. 
 						Note that this declaration uses a frontier declaration at Wallasea Island, Baltic Wharf (NILP) for test purposes only: for business use a pre-lodged declaration must be submitted because Baltic Wharf is listed as an 'Other listed location'. -->
 					<Name>WLALONBTW</Name>
 					<!--DE 5/23: Location of Goods - Type of location.
-						B is used to identify inland locations such as customs warehouses. -->
+						A is used to identify Frontier or Frontier linker locations such as Airports, ITSFs etc. -->
 					<TypeCode>A</TypeCode>
 					<Address>
 						<!--DE 5/23: Location of Goods - Qualifier of the identification.
-							Type of ID of the Location - Y is used where the goods location is identified by an authorisation number. -->
+							Type of ID of the Location - U is used where the goods location is identified by an authorisation number. -->
 						<TypeCode>U</TypeCode>
 						<!--DE 5/23: Location of Goods - Country.
 							Country code of the country where the goods may be examined, GB in this scenario. -->
@@ -204,7 +203,7 @@
 				<GovernmentProcedure>
 					<!--DE 1/10: Requested Procedure of 44 indicating Release to free circulation with duty relief granted under the End Use Special Procedure.-->
 					<CurrentCode>44</CurrentCode>
-					<!--DE 1/10: Previous Procedure of 00 indicating there is no Previous Procedure a customs warehouse.-->
+					<!--DE 1/10: Previous Procedure of 00 indicating there is no Previous Procedure. -->
 					<PreviousCode>00</PreviousCode>
 				</GovernmentProcedure>
 				<!--DE 1/11: 000 to indicate no additional procedure.-->
@@ -255,7 +254,8 @@
 			<SecurityDetailsCode>1</SecurityDetailsCode>
 		</ObligationGuarantee>
 		<SupervisingOffice>
-			<!--DE 5/27: Supervising customs office. The Supervising Office Code for the HMRC Office overseeing the Customs Warehouse procedure. In this scenario, this is Belfast, Dorchester House (NIRU).-->
+			<!--DE 5/27: Supervising customs office.
+				In this scenario, this is Belfast, Dorchester House (NIRU). -->
 			<ID>GBBEL004</ID>
 		</SupervisingOffice>
 	</Declaration>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM026a/TT_IM026a_v1.8.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM026a/TT_IM026a_v1.9.xml
similarity index 96%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM026a/TT_IM026a_v1.8.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM026a/TT_IM026a_v1.9.xml
index c37886d4..ba1c5817 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM026a/TT_IM026a_v1.8.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM026a/TT_IM026a_v1.9.xml
@@ -19,6 +19,10 @@
 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 			xsi:schemaLocation="urn:wco:datamodel:WCO:DEC-DMS:2 ../WCO_DEC_2_DMS.xsd " >
 		<!--
+			***
+			Following TTM19.0.1, the A50 and A70 Tax Types have altered due to exchange rate variances. However, a security amount is expected for the CAP Safeguard duty, which is not being applied. This is because the item value is now less than the representative price. Therefore, no security is charged, just CAP Safeguarding and third country duty. A sample update so that the security amount is charged is planned for TTM20.0.
+			***
+			
 			SCENARIO
 			GB-NI 'At Risk' - CAP Safeguarding Duties
 
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM029a/TT_IM029a_v1.3.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM029a/TT_IM029a_v1.4.xml
similarity index 97%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM029a/TT_IM029a_v1.3.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM029a/TT_IM029a_v1.4.xml
index 0a84b519..b513d1cd 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM029a/TT_IM029a_v1.3.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM029a/TT_IM029a_v1.4.xml
@@ -418,8 +418,7 @@
 			<SecurityDetailsCode>0</SecurityDetailsCode>
 		</ObligationGuarantee>
 		<!--DE 5/27: Supervising customs office. 
-				The Supervising Office Code for the HMRC Office overseeing the Customs Warehouse procedure. 
-				In this scenario, this is Belfast, Erskine House (NIRU)-->
+			In this scenario, this is Belfast, Erskine House (NIRU)-->
 		<SupervisingOffice>
 			<ID>GBBEL004</ID>
 		</SupervisingOffice>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/02._DMSTAX.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/01_DMSTAX.xml
similarity index 66%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/02._DMSTAX.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/01_DMSTAX.xml
index 7689ff27..769f77b4 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/02._DMSTAX.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/01_DMSTAX.xml
@@ -1,9 +1,4 @@
-<!--
-	***
-	Following the TTM18.0.2 Tariff data refresh, this scenario now attracts Definitive Anti-Dumping Duties (DADD) instead of Provisional Anti-Dumping Duties (PADD). As a result the Tax Type in the DMSTAX notifications will now show A80 instead of A85 and the duty calculations will be different. The sample will be updated to use a scenario that attracts PADD for TTM19.0.
-	***
-	-->
-	<MetaData>
+<MetaData>
     <WCODataModelVersionCode>3.6</WCODataModelVersionCode>
     <WCOTypeName>RES</WCOTypeName>
     <ResponsibleCountryCode/>
@@ -12,20 +7,20 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>13</FunctionCode>
-        <FunctionalReferenceID>6d252a035dcc4fb29f41808e62b3d418</FunctionalReferenceID>
+        <FunctionalReferenceID>c51c639882af45a3a303cb3b62a2db29</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20211213170501Z</DateTimeString>
+            <DateTimeString>20220718130936+01</DateTimeString>
         </IssueDateTime>
         <Bank>
-            <ReferenceID>CITIGB2LLON</ReferenceID>
-            <ID>GB25CITI08320011963155</ID>
+            <ReferenceID>BARCGB22</ReferenceID>
+            <ID>GB16BARC20051723372545</ID>
         </Bank>
         <Status>
             <NameCode>67</NameCode>
         </Status>
         <Declaration>
-            <FunctionalReferenceID>TT_IM33a_v1.5_1312_01</FunctionalReferenceID>
-            <ID>21GBDREYWQ4SK8DJR2</ID>
+            <FunctionalReferenceID>TT_IM33a_v1.5_1807_02</FunctionalReferenceID>
+            <ID>22GB7VN8X2CS2PXAR2</ID>
             <VersionID>1</VersionID>
             <GoodsShipment>
                 <GovernmentAgencyGoodsItem>
@@ -46,22 +41,22 @@
                             <AdValoremTaxBaseAmount currencyID="GBP">5000.00</AdValoremTaxBaseAmount>
                             <DeductAmount currencyID="GBP">0.00</DeductAmount>
                             <DutyRegimeCode>100</DutyRegimeCode>
-                            <TaxRateNumeric>50.60</TaxRateNumeric>
-                            <TypeCode>A85</TypeCode>
+                            <TaxRateNumeric>50.70</TaxRateNumeric>
+                            <TypeCode>A80</TypeCode>
                             <Payment>
-                                <TaxAssessedAmount currencyID="GBP">0.00</TaxAssessedAmount>
-                                <PaymentAmount currencyID="GBP">0.00</PaymentAmount>
+                                <TaxAssessedAmount currencyID="GBP">2535.00</TaxAssessedAmount>
+                                <PaymentAmount currencyID="GBP">2535.00</PaymentAmount>
                             </Payment>
                         </DutyTaxFee>
                         <DutyTaxFee>
-                            <AdValoremTaxBaseAmount currencyID="GBP">135.00</AdValoremTaxBaseAmount>
+                            <AdValoremTaxBaseAmount currencyID="GBP">2670.00</AdValoremTaxBaseAmount>
                             <DeductAmount currencyID="GBP">0.00</DeductAmount>
                             <DutyRegimeCode>100</DutyRegimeCode>
                             <TaxRateNumeric>20.00</TaxRateNumeric>
                             <TypeCode>B05</TypeCode>
                             <Payment>
-                                <TaxAssessedAmount currencyID="GBP">27.00</TaxAssessedAmount>
-                                <PaymentAmount currencyID="GBP">27.00</PaymentAmount>
+                                <TaxAssessedAmount currencyID="GBP">534.00</TaxAssessedAmount>
+                                <PaymentAmount currencyID="GBP">534.00</PaymentAmount>
                             </Payment>
                         </DutyTaxFee>
                         <DutyTaxFee>
@@ -75,18 +70,6 @@
                                 <PaymentAmount currencyID="GBP">1000.00</PaymentAmount>
                             </Payment>
                         </DutyTaxFee>
-                        <DutyTaxFee>
-                            <TypeCode>PDD</TypeCode>
-                            <Payment>
-                                <TaxAssessedAmount currencyID="GBP">506.00</TaxAssessedAmount>
-                            </Payment>
-                        </DutyTaxFee>
-                        <DutyTaxFee>
-                            <TypeCode>PDD</TypeCode>
-                            <Payment>
-                                <TaxAssessedAmount currencyID="GBP">2530.00</TaxAssessedAmount>
-                            </Payment>
-                        </DutyTaxFee>
                     </Commodity>
                 </GovernmentAgencyGoodsItem>
             </GoodsShipment>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/01._DMSACC.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/02_DMSACC.xml
similarity index 61%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/01._DMSACC.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/02_DMSACC.xml
index a446e542..39b67b98 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/01._DMSACC.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/02_DMSACC.xml
@@ -7,16 +7,16 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>01</FunctionCode>
-        <FunctionalReferenceID>2e2b90c0ca064fc9a2f609dcd646577f</FunctionalReferenceID>
+        <FunctionalReferenceID>5701e916d0914dc79601df8a4d8cfa07</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20210804140209Z</DateTimeString>
+            <DateTimeString>20220718130936+01</DateTimeString>
         </IssueDateTime>
         <Declaration>
             <AcceptanceDateTime>
-                <DateTimeString formatCode="304">20210301000000Z</DateTimeString>
+                <DateTimeString>20220718130934+01</DateTimeString>
             </AcceptanceDateTime>
-            <FunctionalReferenceID>TT_IM61b_v1.1_0408_02</FunctionalReferenceID>
-            <ID>21GB8K1R53ATIBQV01</ID>
+            <FunctionalReferenceID>TT_IM33a_v1.5_1807_02</FunctionalReferenceID>
+            <ID>22GB7VN8X2CS2PXAR2</ID>
             <VersionID>1</VersionID>
         </Declaration>
     </Response>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/04._DMSTAX.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/03_DMSTAX.xml
similarity index 66%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/04._DMSTAX.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/03_DMSTAX.xml
index 70aa8dff..fcf2ffa4 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/04._DMSTAX.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/03_DMSTAX.xml
@@ -1,9 +1,4 @@
-<!--
-	***
-	Following the TTM18.0.2 Tariff data refresh, this scenario now attracts Definitive Anti-Dumping Duties (DADD) instead of Provisional Anti-Dumping Duties (PADD). As a result the Tax Type in the DMSTAX notifications will now show A80 instead of A85 and the duty calculations will be different. The sample will be updated to use a scenario that attracts PADD for TTM19.0.
-	***
-	-->
-	<MetaData>
+<MetaData>
     <WCODataModelVersionCode>3.6</WCODataModelVersionCode>
     <WCOTypeName>RES</WCOTypeName>
     <ResponsibleCountryCode/>
@@ -12,20 +7,20 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>13</FunctionCode>
-        <FunctionalReferenceID>51b9f22b07f44523a8d258d0ac27b8ef</FunctionalReferenceID>
+        <FunctionalReferenceID>21aa7abd36ab4229beea521d98560014</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20211213170501Z</DateTimeString>
+            <DateTimeString>20220718130938+01</DateTimeString>
         </IssueDateTime>
         <Bank>
-            <ReferenceID>CITIGB2LLON</ReferenceID>
-            <ID>GB25CITI08320011963155</ID>
+            <ReferenceID>BARCGB22</ReferenceID>
+            <ID>GB16BARC20051723372545</ID>
         </Bank>
         <Status>
             <NameCode>4</NameCode>
         </Status>
         <Declaration>
-            <FunctionalReferenceID>TT_IM33a_v1.5_1312_01</FunctionalReferenceID>
-            <ID>21GBDREYWQ4SK8DJR2</ID>
+            <FunctionalReferenceID>TT_IM33a_v1.5_1807_02</FunctionalReferenceID>
+            <ID>22GB7VN8X2CS2PXAR2</ID>
             <VersionID>1</VersionID>
             <GoodsShipment>
                 <GovernmentAgencyGoodsItem>
@@ -46,22 +41,22 @@
                             <AdValoremTaxBaseAmount currencyID="GBP">5000.00</AdValoremTaxBaseAmount>
                             <DeductAmount currencyID="GBP">0.00</DeductAmount>
                             <DutyRegimeCode>100</DutyRegimeCode>
-                            <TaxRateNumeric>50.60</TaxRateNumeric>
-                            <TypeCode>A85</TypeCode>
+                            <TaxRateNumeric>50.70</TaxRateNumeric>
+                            <TypeCode>A80</TypeCode>
                             <Payment>
-                                <TaxAssessedAmount currencyID="GBP">0.00</TaxAssessedAmount>
-                                <PaymentAmount currencyID="GBP">0.00</PaymentAmount>
+                                <TaxAssessedAmount currencyID="GBP">2535.00</TaxAssessedAmount>
+                                <PaymentAmount currencyID="GBP">2535.00</PaymentAmount>
                             </Payment>
                         </DutyTaxFee>
                         <DutyTaxFee>
-                            <AdValoremTaxBaseAmount currencyID="GBP">135.00</AdValoremTaxBaseAmount>
+                            <AdValoremTaxBaseAmount currencyID="GBP">2670.00</AdValoremTaxBaseAmount>
                             <DeductAmount currencyID="GBP">0.00</DeductAmount>
                             <DutyRegimeCode>100</DutyRegimeCode>
                             <TaxRateNumeric>20.00</TaxRateNumeric>
                             <TypeCode>B05</TypeCode>
                             <Payment>
-                                <TaxAssessedAmount currencyID="GBP">27.00</TaxAssessedAmount>
-                                <PaymentAmount currencyID="GBP">27.00</PaymentAmount>
+                                <TaxAssessedAmount currencyID="GBP">534.00</TaxAssessedAmount>
+                                <PaymentAmount currencyID="GBP">534.00</PaymentAmount>
                             </Payment>
                         </DutyTaxFee>
                         <DutyTaxFee>
@@ -75,18 +70,6 @@
                                 <PaymentAmount currencyID="GBP">1000.00</PaymentAmount>
                             </Payment>
                         </DutyTaxFee>
-                        <DutyTaxFee>
-                            <TypeCode>PDD</TypeCode>
-                            <Payment>
-                                <TaxAssessedAmount currencyID="GBP">506.00</TaxAssessedAmount>
-                            </Payment>
-                        </DutyTaxFee>
-                        <DutyTaxFee>
-                            <TypeCode>PDD</TypeCode>
-                            <Payment>
-                                <TaxAssessedAmount currencyID="GBP">2530.00</TaxAssessedAmount>
-                            </Payment>
-                        </DutyTaxFee>
                     </Commodity>
                 </GovernmentAgencyGoodsItem>
             </GoodsShipment>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/03._DMSCLE.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/04_DMSCLE.xml
similarity index 71%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/03._DMSCLE.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/04_DMSCLE.xml
index 441d20d8..302ca5d7 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/03._DMSCLE.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/Example_Notifications/04_DMSCLE.xml
@@ -7,17 +7,17 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>09</FunctionCode>
-        <FunctionalReferenceID>f8f2484d74144ab4bd5ce48e456bafaf</FunctionalReferenceID>
+        <FunctionalReferenceID>9196a463d53f4e98916faedf3a96407b</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20211213170502Z</DateTimeString>
+            <DateTimeString>20220718130938+01</DateTimeString>
         </IssueDateTime>
         <AdditionalInformation>
             <StatementCode>A2</StatementCode>
             <StatementTypeCode>AFB</StatementTypeCode>
         </AdditionalInformation>
         <Declaration>
-            <FunctionalReferenceID>TT_IM33a_v1.5_1312_01</FunctionalReferenceID>
-            <ID>21GBDREYWQ4SK8DJR2</ID>
+            <FunctionalReferenceID>TT_IM33a_v1.5_1807_02</FunctionalReferenceID>
+            <ID>22GB7VN8X2CS2PXAR2</ID>
             <VersionID>1</VersionID>
         </Declaration>
     </Response>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/TT_IM033a_v1.6.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/TT_IM033a_v1.7.xml
similarity index 94%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/TT_IM033a_v1.6.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/TT_IM033a_v1.7.xml
index ecf09ed2..5a829f1a 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/TT_IM033a_v1.6.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM033a/TT_IM033a_v1.7.xml
@@ -21,11 +21,11 @@
 			
 		<!--
 			***
-			Following the TTM18.0.2 Tariff data refresh, this scenario now attracts Definitive Anti-Dumping Duties (DADD) instead of Provisional Anti-Dumping Duties (PADD). As a result the Tax Type in the DMSTAX notifications will now show A80 instead of A85 and the duty calculations will be different. The sample will be updated to use a scenario that attracts PADD for TTM19.0.
+			This scenario now attracts Definitive Anti-Dumping Duties (DADD) instead of Provisional Anti-Dumping Duties (PADD). As a result the Tax Type in the DMSTAX notifications will now show A80 instead of A85 and the duty calculations are different.
 			***
 			
 			SCENARIO 
-			Trader submits a Type A Frontier declaration for goods being imported from ROW (China)to NI "At Risk" that attracts Provisional Anti-Dumping Duties (PADD).
+			Trader submits a Type A Frontier declaration for goods being imported from ROW (China)to NI "At Risk" that attracts Definitive Anti-Dumping Duties (DADD).
 			Indicative duty is calculated and DMSTAX and DMSACC Trader Notifications are sent prior to the Dwell Timer. 
 			Goods: Calcium-silicon steel alloy. 7202998030
 			Category: H1 Declaration Category data set
@@ -37,7 +37,7 @@
 		<FunctionCode>9</FunctionCode>
 		<!-- DE 2/5: LRN.
 			Traders own reference number this must be unique to the transaction -->
-		<FunctionalReferenceID>TT_IM33a_v1.5_1312_01</FunctionalReferenceID>
+		<FunctionalReferenceID>TT_IM33a_v1.5_1807_02</FunctionalReferenceID>
 		<!--DE 1/1: Declaration Type.
 			IM to represent an import declaration.-->
 		<!--DE 1/2: Additional Declaration Tupe.
@@ -256,8 +256,8 @@
 					</DutyTaxFee>
 					<DutyTaxFee>
 						<!--DE 4/3: Tax Type.
-							A85 represents EU Provisional Anti-Dumping Dutiies PADD. -->
-						<TypeCode>A85</TypeCode>
+							A80 represents EU Definitive Anti-Dumping Duties (DADD). -->
+						<TypeCode>A80</TypeCode>
 						<!--DE 4/8: Method of Payment.
 							MethodCode of E to indicate Deferment used for import. -->
 						<Payment>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM037a/TT_IM037a_v1.5.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM037a/TT_IM037a_v1.6.xml
similarity index 100%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM037a/TT_IM037a_v1.5.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM037a/TT_IM037a_v1.6.xml
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM039b/TT_IM039b_v1.7.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM039b/TT_IM039b_v1.8.xml
similarity index 97%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM039b/TT_IM039b_v1.7.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM039b/TT_IM039b_v1.8.xml
index 358e5bd1..986c2e9f 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM039b/TT_IM039b_v1.7.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM039b/TT_IM039b_v1.8.xml
@@ -331,8 +331,7 @@
 				'0' or '1' must be declared in this data element.-->
 			<SecurityDetailsCode>0</SecurityDetailsCode>
 		</ObligationGuarantee>
-		<!--DE 5/27: Supervising customs office. The Supervising Office Code for the
-			HMRC Office overseeing the Customs Warehouse procedure. 
+		<!--DE 5/27: Supervising customs office.
 			In this scenario, this is Belfast, Dorchester House (NIRU).-->
 		<SupervisingOffice>
 			<ID>GBBEL004</ID>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM042a/TT_IM042a_v1.5.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM042a/TT_IM042a_v1.6.xml
similarity index 96%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM042a/TT_IM042a_v1.5.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM042a/TT_IM042a_v1.6.xml
index b5ea252e..81084f7a 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM042a/TT_IM042a_v1.5.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM042a/TT_IM042a_v1.6.xml
@@ -108,7 +108,7 @@
 						<GoodsLocation>
 							<!--DE 5/23: The location code for Port of Belfast. Goods moved via shipping container from GB to NI via port of Belfast -->
 							<Name>BELBELBEL</Name>
-							<!--DE 5/23: Type of Location - B is used to identify inland locations such as customs warehouses. -->
+							<!--DE 5/23: Type of Location - A is used to identify Frontier or Frontier linker locations such as Airports, ITSFs etc. -->
 							<TypeCode>A</TypeCode>
 							<Address>
 								<!--DE 5/23: Type of ID of the Location - Y is used where the goods location is 
@@ -304,8 +304,7 @@
 				</ObligationGuarantee>
 				<SupervisingOffice>
 					<!--DE 5/27: Supervising customs office. 
-				The Supervising Office Code for the HMRC Office overseeing the Customs Warehouse procedure. 
-				In this scenario, this is Belfast, Dorchester House (NIRU).-->
+						In this scenario, this is Belfast, Dorchester House (NIRU).-->
 					<ID>GBBEL004</ID>
 				</SupervisingOffice>
 			</Declaration>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM043a/TT_IM043a_v1.8.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM043a/TT_IM043a_v1.9.xml
similarity index 95%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM043a/TT_IM043a_v1.8.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM043a/TT_IM043a_v1.9.xml
index 1882c69c..9b9c7258 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM043a/TT_IM043a_v1.8.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM043a/TT_IM043a_v1.9.xml
@@ -17,6 +17,15 @@
 	             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	             xsi:schemaLocation="urn:wco:datamodel:WCO:DEC-DMS:2 ../WCO_DEC_2_DMS.xsd ">
 		<!--
+			***
+			This scenario is impacted by KEL 444: The adjustment in BC in DE 4/9 is not functioning correctly which thus results in an incorrect value for VAT for DDP Import declaration.
+
+			Workaround:
+			• Complete DE 4/1 as per Tariff Vol. 3 instructions with DDP entered and the UN Locode for the address.
+			• Do not enter an adjustment (BC) in DE 4/9
+			• Remove the duty amount from the goods item value in DE 4/14 (essentially remove the duty amount that would have been entered in DE 4/9 against BC).
+			***
+
 			SCENARIO
 			"ROW to NI, NIIMP, Goods 'De-Risked', Non-preferential UK FCFS quota claimed:
 			Type A declaration for goods imported to Northern Ireland from US. The goods are 'De-Risked' by the Trader using NIREM and a non-preferential 
@@ -38,7 +47,7 @@
 		<!--DE 2/5: LRN.
 			Traders own reference number – this must be unique to the transaction. -->
 		<FunctionalReferenceID>TT_IM43a_051021_001</FunctionalReferenceID>
-		<!--DE 1/1: DEclaration Type.
+		<!--DE 1/1: Declaration Type.
 			IM to represent an import declaration. -->
 		<!--DE 1/2: Additional Declaration Type.
 			A to represent a frontier/arrived standard declaration. -->
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM058a/TT_IM058a_v1.6.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM058a/TT_IM058a_v1.7.xml
similarity index 96%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM058a/TT_IM058a_v1.6.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM058a/TT_IM058a_v1.7.xml
index 79733072..d7a87ac6 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM058a/TT_IM058a_v1.6.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM058a/TT_IM058a_v1.7.xml
@@ -17,6 +17,10 @@
 	             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	             xsi:schemaLocation="urn:wco:datamodel:WCO:DEC-DMS:2 ../WCO_DEC_2_DMS.xsd ">
 		<!--
+			***
+			Following TTM19.0.1, the A20 Tax Type is not applied because the 695 and 696 measures have expired. A sample update to use a commodity where the measures are still in force is planned for TTM20.0. 
+			***
+			
 			SCENARIO
 			Importing Steel into GB from the US, which is subject to Retaliatory measures, but where no Quota claim is made, 
 			therefore also subject to UK Steel Safeguarding measures.
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/01._DMSACC.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/01_DMSACC.xml
similarity index 61%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/01._DMSACC.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/01_DMSACC.xml
index a446e542..7c3b8a93 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/01._DMSACC.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/01_DMSACC.xml
@@ -7,16 +7,16 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>01</FunctionCode>
-        <FunctionalReferenceID>2e2b90c0ca064fc9a2f609dcd646577f</FunctionalReferenceID>
+        <FunctionalReferenceID>6bed9704893c48d9a764ebd91299b4ab</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20210804140209Z</DateTimeString>
+            <DateTimeString>20220616121926+01</DateTimeString>
         </IssueDateTime>
         <Declaration>
             <AcceptanceDateTime>
-                <DateTimeString formatCode="304">20210301000000Z</DateTimeString>
+                <DateTimeString>20220606010000+01</DateTimeString>
             </AcceptanceDateTime>
-            <FunctionalReferenceID>TT_IM61b_v1.1_0408_02</FunctionalReferenceID>
-            <ID>21GB8K1R53ATIBQV01</ID>
+            <FunctionalReferenceID>TT_IM61b_v1.1_1606_04</FunctionalReferenceID>
+            <ID>22GB6LVD6063EORA02</ID>
             <VersionID>1</VersionID>
         </Declaration>
     </Response>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/05._DMSCLE.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/02_DMSCLE.xml
similarity index 71%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/05._DMSCLE.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/02_DMSCLE.xml
index 72ef5fc9..3fdf50b8 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/05._DMSCLE.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/02_DMSCLE.xml
@@ -7,17 +7,17 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>09</FunctionCode>
-        <FunctionalReferenceID>7fd913d5aa7d48e6b68cb2cb5ab8473a</FunctionalReferenceID>
+        <FunctionalReferenceID>e99f92e6a74d43d5afc9a92252897a30</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20210804141210Z</DateTimeString>
+            <DateTimeString>20220616122228+01</DateTimeString>
         </IssueDateTime>
         <AdditionalInformation>
             <StatementCode>A2</StatementCode>
             <StatementTypeCode>AFB</StatementTypeCode>
         </AdditionalInformation>
         <Declaration>
-            <FunctionalReferenceID>TT_IM61b_v1.1_0408_02</FunctionalReferenceID>
-            <ID>21GB8K1R53ATIBQV01</ID>
+            <FunctionalReferenceID>TT_IM61b_v1.1_1606_04</FunctionalReferenceID>
+            <ID>22GB6LVD6063EORA02</ID>
             <VersionID>2</VersionID>
         </Declaration>
     </Response>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/03_DMSRES.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/03_DMSRES.xml
new file mode 100644
index 00000000..e6d5f239
--- /dev/null
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/03_DMSRES.xml
@@ -0,0 +1,129 @@
+<MetaData>
+	<WCODataModelVersionCode>3.6</WCODataModelVersionCode>
+	<WCOTypeName>RES</WCOTypeName>
+	<ResponsibleCountryCode/>
+	<ResponsibleAgencyName/>
+	<AgencyAssignedCustomizationCode/>
+	<AgencyAssignedCustomizationVersionCode/>
+	<Response>
+		<FunctionCode>07</FunctionCode>
+		<FunctionalReferenceID>f870a44fe1db4b4e9b99826b0ff2606b</FunctionalReferenceID>
+		<IssueDateTime>
+			<DateTimeString>20220616122228+01</DateTimeString>
+		</IssueDateTime>
+		<AdditionalInformation>
+			<StatementDescription>This is changing AI FreeText for Type Y</StatementDescription>
+			<StatementTypeCode>AES</StatementTypeCode>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>07B</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>06A</DocumentSectionCode>
+			</Pointer>
+		</AdditionalInformation>
+		<AdditionalInformation>
+			<StatementDescription>AMENDMENT 2 - Changing AI Freetext for Type Z</StatementDescription>
+			<StatementTypeCode>AES</StatementTypeCode>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>07B</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>2</SequenceNumeric>
+				<DocumentSectionCode>06A</DocumentSectionCode>
+			</Pointer>
+		</AdditionalInformation>
+		<AdditionalInformation>
+			<StatementDescription>AMENDMENT 3 - Changing AI freetext for Late Supp</StatementDescription>
+			<StatementTypeCode>AES</StatementTypeCode>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>07B</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>3</SequenceNumeric>
+				<DocumentSectionCode>06A</DocumentSectionCode>
+			</Pointer>
+		</AdditionalInformation>
+		<Amendment>
+			<ChangeReasonCode>21</ChangeReasonCode>
+			<Pointer>
+				<DocumentSectionCode>42A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<DocumentSectionCode>67A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>68A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>03A</DocumentSectionCode>
+				<TagID>225</TagID>
+			</Pointer>
+		</Amendment>
+		<Amendment>
+			<ChangeReasonCode>21</ChangeReasonCode>
+			<Pointer>
+				<DocumentSectionCode>42A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<DocumentSectionCode>67A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>68A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>2</SequenceNumeric>
+				<DocumentSectionCode>03A</DocumentSectionCode>
+				<TagID>225</TagID>
+			</Pointer>
+		</Amendment>
+		<Amendment>
+			<ChangeReasonCode>21</ChangeReasonCode>
+			<Pointer>
+				<DocumentSectionCode>42A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<DocumentSectionCode>67A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>1</SequenceNumeric>
+				<DocumentSectionCode>68A</DocumentSectionCode>
+			</Pointer>
+			<Pointer>
+				<SequenceNumeric>3</SequenceNumeric>
+				<DocumentSectionCode>03A</DocumentSectionCode>
+				<TagID>225</TagID>
+			</Pointer>
+		</Amendment>
+		<Declaration>
+			<FunctionalReferenceID>TT_IM61b_v1.1_1606_04</FunctionalReferenceID>
+			<ID>22GB6LVD6063EORA02</ID>
+			<VersionID>2</VersionID>
+		</Declaration>
+		<Declaration>
+			<FunctionCode>9</FunctionCode>
+			<GoodsShipment>
+				<GovernmentAgencyGoodsItem>
+					<SequenceNumeric>1</SequenceNumeric>
+					<AdditionalInformation>
+						<StatementDescription>SDY=9/10</StatementDescription>
+					</AdditionalInformation>
+					<AdditionalInformation>
+						<StatementDescription>02/21=Y 3 01/21=Z 2</StatementDescription>
+					</AdditionalInformation>
+					<AdditionalInformation>
+						<StatementDescription>SDZ=6/6</StatementDescription>
+					</AdditionalInformation>
+					<AdditionalInformation/>
+					<AdditionalInformation/>
+				</GovernmentAgencyGoodsItem>
+			</GoodsShipment>
+		</Declaration>
+	</Response>
+</MetaData>
\ No newline at end of file
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/04._DMSRES.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/04._DMSRES.xml
deleted file mode 100644
index 98f84c5e..00000000
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/04._DMSRES.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<MetaData>
-    <WCODataModelVersionCode>3.6</WCODataModelVersionCode>
-    <WCOTypeName>RES</WCOTypeName>
-    <ResponsibleCountryCode/>
-    <ResponsibleAgencyName/>
-    <AgencyAssignedCustomizationCode/>
-    <AgencyAssignedCustomizationVersionCode/>
-    <Response>
-        <FunctionCode>07</FunctionCode>
-        <FunctionalReferenceID>86e13d5175914d8dbcdd4b18b2e41bde</FunctionalReferenceID>
-        <IssueDateTime>
-            <DateTimeString formatCode="304">20210804141210Z</DateTimeString>
-        </IssueDateTime>
-        <AdditionalInformation>
-            <StatementDescription>This is changing AI FreeText for Type Y</StatementDescription>
-            <StatementTypeCode>AES</StatementTypeCode>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>07B</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>06A</DocumentSectionCode>
-            </Pointer>
-        </AdditionalInformation>
-        <AdditionalInformation>
-            <StatementDescription>AMENDMENT 3 - Changing AI freetext for Late Supp</StatementDescription>
-            <StatementTypeCode>AES</StatementTypeCode>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>07B</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>2</SequenceNumeric>
-                <DocumentSectionCode>06A</DocumentSectionCode>
-            </Pointer>
-        </AdditionalInformation>
-        <AdditionalInformation>
-            <StatementDescription>AMENDMENT 2 - Changing AI Freetext for Type Z</StatementDescription>
-            <StatementTypeCode>AES</StatementTypeCode>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>07B</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>3</SequenceNumeric>
-                <DocumentSectionCode>06A</DocumentSectionCode>
-            </Pointer>
-        </AdditionalInformation>
-        <Amendment>
-            <ChangeReasonCode>21</ChangeReasonCode>
-            <Pointer>
-                <DocumentSectionCode>42A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <DocumentSectionCode>67A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>68A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>03A</DocumentSectionCode>
-                <TagID>225</TagID>
-            </Pointer>
-        </Amendment>
-        <Amendment>
-            <ChangeReasonCode>21</ChangeReasonCode>
-            <Pointer>
-                <DocumentSectionCode>42A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <DocumentSectionCode>67A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>68A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>2</SequenceNumeric>
-                <DocumentSectionCode>03A</DocumentSectionCode>
-                <TagID>225</TagID>
-            </Pointer>
-        </Amendment>
-        <Amendment>
-            <ChangeReasonCode>21</ChangeReasonCode>
-            <Pointer>
-                <DocumentSectionCode>42A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <DocumentSectionCode>67A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>1</SequenceNumeric>
-                <DocumentSectionCode>68A</DocumentSectionCode>
-            </Pointer>
-            <Pointer>
-                <SequenceNumeric>3</SequenceNumeric>
-                <DocumentSectionCode>03A</DocumentSectionCode>
-                <TagID>225</TagID>
-            </Pointer>
-        </Amendment>
-        <Declaration>
-            <FunctionalReferenceID>TT_IM61b_v1.1_0408_02</FunctionalReferenceID>
-            <ID>21GB8K1R53ATIBQV01</ID>
-            <VersionID>2</VersionID>
-        </Declaration>
-        <Declaration>
-            <FunctionCode>9</FunctionCode>
-            <GoodsShipment>
-                <GovernmentAgencyGoodsItem>
-                    <SequenceNumeric>1</SequenceNumeric>
-                    <AdditionalInformation>
-                        <StatementDescription>SDY=9/10</StatementDescription>
-                    </AdditionalInformation>
-                    <AdditionalInformation>
-                        <StatementDescription>02/21=Y 3 01/21=Z 2</StatementDescription>
-                    </AdditionalInformation>
-                    <AdditionalInformation>
-                        <StatementDescription>SDZ=6/6</StatementDescription>
-                    </AdditionalInformation>
-                    <AdditionalInformation/>
-                    <AdditionalInformation/>
-                </GovernmentAgencyGoodsItem>
-            </GoodsShipment>
-        </Declaration>
-    </Response>
-</MetaData>
\ No newline at end of file
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/02._DMSRCV.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/04_DMSRVC.xml
similarity index 60%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/02._DMSRCV.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/04_DMSRVC.xml
index da7d7b39..0fac54e7 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/02._DMSRCV.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/04_DMSRVC.xml
@@ -7,14 +7,13 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>02</FunctionCode>
-        <FunctionalReferenceID>98045a6ecef74a9a96222bd778025f97</FunctionalReferenceID>
+        <FunctionalReferenceID>648da8efa8304a02853c0c5a28a4733f</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20210804140455Z</DateTimeString>
+            <DateTimeString>20220616122106+01</DateTimeString>
         </IssueDateTime>
         <Declaration>
-            <FunctionalReferenceID>TT_IM61b_v1.1_0408_02</FunctionalReferenceID>
-            <ID>21GB8K1R53ATIBQV01</ID>
-            <VersionID>1</VersionID>
+            <FunctionalReferenceID>TT_IM61b_v1.1_1606_04</FunctionalReferenceID>
+            <ID>22GB6LVD6063EORA02</ID>
         </Declaration>
     </Response>
 </MetaData>
\ No newline at end of file
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/03._DMSREQ.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/05_DMSREQ.xml
similarity index 68%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/03._DMSREQ.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/05_DMSREQ.xml
index 4a357cfa..624831aa 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/03._DMSREQ.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/Example_Notifications/05_DMSREQ.xml
@@ -7,9 +7,9 @@
     <AgencyAssignedCustomizationVersionCode/>
     <Response>
         <FunctionCode>11</FunctionCode>
-        <FunctionalReferenceID>f0db2cdbd5924d628c2e36861f4a2f8a</FunctionalReferenceID>
+        <FunctionalReferenceID>5f540abea92c4a368f5d035d258935da</FunctionalReferenceID>
         <IssueDateTime>
-            <DateTimeString formatCode="304">20210804140456Z</DateTimeString>
+            <DateTimeString>20220616122107+01</DateTimeString>
         </IssueDateTime>
         <AdditionalInformation>
             <StatementTypeCode>AFB</StatementTypeCode>
@@ -18,9 +18,8 @@
             <NameCode>39</NameCode>
         </Status>
         <Declaration>
-            <FunctionalReferenceID>TT_IM61b_v1.1_0408_02</FunctionalReferenceID>
-            <ID>21GB8K1R53ATIBQV01</ID>
-            <VersionID>1</VersionID>
+            <FunctionalReferenceID>TT_IM61b_v1.1_1606_04</FunctionalReferenceID>
+            <ID>22GB6LVD6063EORA02</ID>
         </Declaration>
     </Response>
 </MetaData>
\ No newline at end of file
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061a_v1.2.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061a_v1.2.xml
index e63af9ff..685463ec 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061a_v1.2.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061a_v1.2.xml
@@ -20,13 +20,13 @@
 			A CFSP Trader submits an Imports Type Q  non-excise Final Supplementary Declaration (FSD) to inform HMRC of how many Supplementary Declarations have been submitted and those due in the previous period, as well as any Supplementary Declarations that were submitted late. 
 			-->
 		<AcceptanceDateTime>
-			<p1:DateTimeString formatCode="304">20210301010000+01</p1:DateTimeString>
+			<p1:DateTimeString formatCode="304">20220606010000+01</p1:DateTimeString>
 		</AcceptanceDateTime>
 		<FunctionCode>9</FunctionCode>
 		<!--DE 2/5: LRN.
 			Mandatory.
 			Trader's own reference number - this must be unique to the transaction. -->
-		<FunctionalReferenceID>TT_IM61b_v1.1_0408_01</FunctionalReferenceID>
+		<FunctionalReferenceID>TT_IM61b_v1.1_1606_04</FunctionalReferenceID>
 		<!--DE 1/1: Declaration Type.
 			IM to represent an import declaration. -->
 		<!--DE 1/2: Additional Declaration Type.
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061b_Amendment_v1.1.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061b_Amendment_v1.2.xml
similarity index 95%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061b_Amendment_v1.1.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061b_Amendment_v1.2.xml
index d4423895..580e4dbe 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061b_Amendment_v1.1.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM061b/TT_IM061b_Amendment_v1.2.xml
@@ -14,8 +14,8 @@
            		xmlns:p1="urn:wco:datamodel:WCO:Declaration_DS:DMS:2"
            		xmlns:clm5ISO42173A="urn:un:unece:uncefact:codelist:standard:ISO:ISO3AlphaCurrencyCode:2012-08-31">
 		<FunctionCode>13</FunctionCode>
-		<FunctionalReferenceID>TT_IM61b_v1.1_0408_01</FunctionalReferenceID>
-		<ID>21GB3SJO2SPBOOFW09</ID>
+		<FunctionalReferenceID>TT_IM61b_v1.1_1606_02</FunctionalReferenceID>
+		<ID>22GB6LSBPILA876A08</ID>
 		<TypeCode>COR</TypeCode>
 		<AdditionalInformation>
 			<StatementDescription>This is changing AI FreeText for Type Y</StatementDescription>
@@ -37,7 +37,7 @@
 				<DocumentSectionCode>42A</DocumentSectionCode>
 			</Pointer>
 			<Pointer>
-				<SequenceNumeric>3</SequenceNumeric>
+				<SequenceNumeric>2</SequenceNumeric>
 				<DocumentSectionCode>06A</DocumentSectionCode>
 			</Pointer>
 		</AdditionalInformation>
@@ -49,7 +49,7 @@
 				<DocumentSectionCode>42A</DocumentSectionCode>
 			</Pointer>
 			<Pointer>
-				<SequenceNumeric>2</SequenceNumeric>
+				<SequenceNumeric>3</SequenceNumeric>
 				<DocumentSectionCode>06A</DocumentSectionCode>
 			</Pointer>
 		</AdditionalInformation>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM064a/TT_IM064a_v1.2.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM064a/TT_IM064a_v1.3.xml
similarity index 96%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM064a/TT_IM064a_v1.2.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM064a/TT_IM064a_v1.3.xml
index c737f07f..c1028895 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM064a/TT_IM064a_v1.2.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM064a/TT_IM064a_v1.3.xml
@@ -17,6 +17,9 @@
 	             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	             xsi:schemaLocation="urn:wco:datamodel:WCO:DEC-DMS:2 ../WCO_DEC_2_DMS.xsd ">
 		<!--
+			***
+			The Commodity Code used in the sample is no longer valid. Work is ongoing to identify a new code that satisfies the scenario. Submitting the current version of the declaration will result in a DMSREJ notification being sent.
+			***
 			SCENARIO
 			Trader submits a Type A declaration to import steel from the ROW into NI.
 			Goods imported and declared to free-circulation and home use of non-union goods, with no previous procedure
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM069a/TT_IM069a_v1.3.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM069a/TT_IM069a_v1.5.xml
similarity index 94%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM069a/TT_IM069a_v1.3.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM069a/TT_IM069a_v1.5.xml
index b768b731..7c36dff0 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM069a/TT_IM069a_v1.3.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM069a/TT_IM069a_v1.5.xml
@@ -19,12 +19,6 @@
 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 			xsi:schemaLocation="urn:wco:datamodel:WCO:DEC-DMS:2 ../WCO_DEC_2_DMS.xsd " >
 		<!--
-			***
-			This scenario is impacted by KEL 456: For declarations which include AI codes NIIMP and NIAID, duty calculation should return a full subsidy reservation and should trigger collection of a Security for the difference in the Customs Duties between the EU (eg 4%) and UK (eg 0%). However the calculation response is not triggering security and so the A50 Customs Duty Amount is being charged outright. 
-			
-			Please note KEL 456 will be fixed as part of TTM19.0.1, scheduled for July 2022. Additional information can be found within the CDS_Trade_Test_KEL_20220616 (KEL) document.
-			***
-			
 			SCENARIO
 			ROW-NI at Risk - Suspension Procedure.
 			
@@ -375,7 +369,6 @@
 			<SecurityDetailsCode>1</SecurityDetailsCode>
 		</ObligationGuarantee>
 		<!--DE 5/27: Supervising Customs Office. 
-			The Supervising Office Code for the HMRC Office overseeing the Customs Warehouse procedure. 
 			In this scenario, this is Belfast, Custom House. -->
 		<SupervisingOffice>
 			<ID>GBBEL003</ID>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM072a/TT_IM072a_v1.0_.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM072a/TT_IM072a_v1.1_.xml
similarity index 64%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM072a/TT_IM072a_v1.0_.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM072a/TT_IM072a_v1.1_.xml
index 4cfbb2f5..6dd35b98 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM072a/TT_IM072a_v1.0_.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM072a/TT_IM072a_v1.1_.xml
@@ -24,22 +24,27 @@
 			C21i additional declaration type J
 			Expected Trader Notifications (4): DMSACC, DMSTAX(1), DMSTAX(2), DMSCLE
 		-->
-		<!--Function Code of 9 to represent an original declaration.-->
+		<!--Function Code of 9 to represent an original declaration. -->
 		<FunctionCode>9</FunctionCode>
-		<!--DE 2/5: Trader's own reference number - this must be unique to the transaction -->
+		<!--DE 2/5: Trader's own reference number - this must be unique to the transaction. -->
 		<FunctionalReferenceID>CDSP_9245_TC2_0811_01</FunctionalReferenceID>
-		<!--DE 1/1: CO to represent an Imports Special Fiscal Territories declaration.-->
-		<!--DE 1/2: J to represent Goods arrived C21 declaration-->
+		<!--DE 1/1: Declaration Type.
+			CO to represent an Imports Special Fiscal Territories declaration. -->
+		<!--DE 1/2: Additional Declaration Type.
+			J to represent Goods arrived C21 declaration. -->
 		<TypeCode>COJ</TypeCode>
-		<!--DE 1/9: Total number of goods items on the declaration.-->
+		<!--DE 1/9: Total number of Items. -->
 		<GoodsItemQuantity>1</GoodsItemQuantity>
-		<!--DE 6/18: Total packages - 200. Note that this matches DE 6/10 because this is a single item declaration.-->
+		<!--DE 6/18: Total Packages.
+			200.
+			Note that this matches DE 6/10 because this is a single item declaration. -->
 		<TotalPackageQuantity>200</TotalPackageQuantity>
 		<AuthorisationHolder>
 			<ID>GB553202734852</ID>
 			<CategoryCode>BRD</CategoryCode>
 		</AuthorisationHolder>
-		<!--DE 7/4: Mode of transport at the border. 1 represents maritime/sea transport. This is a mandatory data element -->
+		<!--DE 7/4: Mode of Transport at the Border. 
+			1 represents maritime/sea transport. This is a mandatory data element. -->
 		<BorderTransportMeans>
 			<ModeCode>1</ModeCode>
 		</BorderTransportMeans>
@@ -49,7 +54,7 @@
 			<ID>GB553202734852</ID>
 		</Declarant>
 		<!--DE 3/1: Exporter.
-			Exporter name and address is mandatory where no recognised EORI number has been entered into DE 3/2 -->
+			Exporter name and address is mandatory where no recognised EORI number has been entered into DE 3/2. -->
 		<Exporter>
 			<Name>Jersey Mail</Name>
 			<Address>
@@ -60,33 +65,35 @@
 			</Address>
 		</Exporter>
 		<GoodsShipment>
-			<!--DE 7/2: Container. Indicator to show if goods are packed in a container or not. 
+			<!--DE 7/2: Container. 
+				Indicator to show if goods are packed in a container or not. 
 				1 indicates that goods are transported in containers.
-				Note: Unlike CHIEF this must now be completed.-->
+				Note: Unlike CHIEF this must now be completed. -->
 			<Consignment>
 				<ContainerCode>1</ContainerCode>
-				<!--DE 7/9: Identity of the means of transport. 
-					Example number representing IMO ship identification number: '10', and 5 digits for the identification number: '12345'.-->
+				<!--DE 7/9: Identity of Means of Transport. 
+					Example number representing IMO ship identification number: '10', and 5 digits for the identification number: '12345'. -->
 				<ArrivalTransportMeans>
 					<ID>12345</ID>
 					<IdentificationTypeCode>10</IdentificationTypeCode>
 				</ArrivalTransportMeans>
-				<!--DE 5/23: Location of Goods.
+				<!--DE 5/23: Location of Goods - Identification of location.
 					The location code for Portsmouth - Flathouse Quay, a non-inventory linked location. -->
 				<GoodsLocation>
 					<Name>PMEPTMFHQ</Name>
-					<!--DE 5/23: Type of Location.
-						A in this scenario to represent that it is a designated location.-->
+					<!--DE 5/23: Location of Goods - Type of location.
+						A in this scenario to represent that it is a designated location. -->
 					<TypeCode>A</TypeCode>
 					<Address>
-						<!--DE 5/23: Type of ID of the Location - U in this scenario for UN/LOCODE. -->
+						<!--DE 5/23: Location of Goods - Qualifier of the identification.
+							Type of ID of the Location - U in this scenario for UN/LOCODE. -->
 						<TypeCode>U</TypeCode>
-						<!--DE 5/23: Country code.
-							Country where the goods may be examined, GB in this scenario.-->
+						<!--DE 5/23: Location of Goods - Country.
+							Country where the goods may be examined, GB in this scenario. -->
 						<CountryCode>GB</CountryCode>
 					</Address>
 				</GoodsLocation>
-				<!--DE 7/10: Container identification number. 
+				<!--DE 7/10: Container Identification Number. 
 					This is alpha-numeric with up to 17 characters.
 					For containers covered by the standard ISO 6346, the identifier (prefix) allocated by the International Bureau of in addition to the container identification number.
 					For swap bodies and semi-trailers the ILU (Intermodal Loading Units) code as introduced by the European EN 13044 shall be used. -->
@@ -102,76 +109,91 @@
 			</ExportCountry>
 			<GovernmentAgencyGoodsItem>
 				<SequenceNumeric>1</SequenceNumeric>
-				<!-- DE 2/3 Documents produced, certificates and authorisations, additional references -->
+				<!-- DE 2/3 Documents produced, certificates and authorisations, additional references. -->
 				<AdditionalDocument>
 					<CategoryCode>1</CategoryCode>
 					<ID>GBBIRDS55320273485220211018095959</ID>
 					<TypeCode>BRD</TypeCode>
 				</AdditionalDocument>
-				<!--DE 2/2: Additional information. 00500 IMPORTER, indicating Self representation by the importer -->
+				<!--DE 2/2: Additional information. 
+					00500 IMPORTER, indicating Self representation by the importer. -->
 				<AdditionalInformation>
 					<StatementCode>00500</StatementCode>
 					<StatementDescription>IMPORTER</StatementDescription>
 				</AdditionalInformation>
 				<Commodity>
-					<!--DE 6/8: Description of the goods.-->
+					<!--DE 6/8: Description of Goods. -->
 					<Description>Small items of negligible cost</Description>
-					<!--DE 6/5: Gross Mass (KG). Mandatory. Gross mass of the goods in kilograms including packaging.-->
-                    <!--N.B: There is no need to include a unitcode indicating KG -->
+					<!--DE 6/5: Gross Mass. 
+						Mandatory. 
+						Weight of the goods in kilograms including packaging. -->
+                    <!--N.B: There is no need to include a unitcode indicating KG. -->
 					<GoodsMeasure>
 						<GrossMassMeasure>5</GrossMassMeasure>
-					<!--DE 6/1: Net Mass (KG). Mandatory. Net mass of the goods in kilograms without any packaging.-->
+					<!--DE 6/1: Net Mass. 
+						Mandatory. 
+						Weight of the goods in kilograms without any packaging. -->
 						<NetNetWeightMeasure>4</NetNetWeightMeasure>
 					</GoodsMeasure>
-					<!--DE 4/14: ItemChargeAmount - Item price amount, the invoice was issued with a value of 2500 and the currency was in GBP.-->
+					<!--DE 4/14: Item Price/ Amount. 
+						The invoice was issued with a value of 135 and the currency was in GBP. -->
 					<InvoiceLine>
 						<ItemChargeAmount currencyID="GBP">135</ItemChargeAmount>
 					</InvoiceLine>
 				</Commodity>
-				<!--DE 1/10: 00 20 indicating Home use and free circulation, with no previous procedure
-					Customs Clearance Request (CCR) for release from customs control to free circulation on 
-					payment of customs duty and other charges, where required, for goods where a customs declaration is not required.-->
+				<!--DE 1/10: Procedure. 
+					00 20 indicating Home use and free circulation, with no previous procedure
+					Customs Clearance Request (CCR) for release from customs control to free circulation on payment of customs duty and other charges, where required, for goods where a customs declaration is not required. -->
 				<GovernmentProcedure>
 					<CurrentCode>00</CurrentCode>
 					<PreviousCode>20</PreviousCode>
 				</GovernmentProcedure>
 				<GovernmentProcedure>
-					<!--DE 1/11: 21V to indicate Bulk Import Reduced Dataset (BIRDS)-->
+					<!--DE 1/11: Additional Procedure Code. 
+						21V to indicate Bulk Import Reduced Dataset (BIRDS). -->
 					<CurrentCode>21V</CurrentCode>
 					</GovernmentProcedure>
-					<!--DE 1/11: 15F to indicate goods are moving from either Jersey (JE) or Guernsey (GG).-->
+					<!--DE 1/11: Additional Procedure Code. 
+						15F to indicate goods are moving from either Jersey (JE) or Guernsey (GG). -->
 					<GovernmentProcedure>
 					<CurrentCode>15F</CurrentCode>
 					</GovernmentProcedure>
 				<Packaging>
 					<SequenceNumeric>1</SequenceNumeric>
-					<!--DE 6/11: Shipping marks on the packages-->
+					<!--DE 6/11: Shipping marks. -->
 					<MarksNumbersID>ADR/PA/00001</MarksNumbersID>
-					<!--DE 6/10: Number of packages, in this case 200. Note that this matches DE 6/18 because this is a single item declaration. -->
+					<!--DE 6/10: Number of Packages. 
+						In this case 200. 
+						Note that this matches DE 6/18 because this is a single item declaration. -->
 					<QuantityQuantity>200</QuantityQuantity>
-					<!--DE 6/9: Type of packages - PA to represent a Packet-->
+					<!--DE 6/9: Type of Packages. 
+						PA to represent a Packet. -->
 					<TypeCode>PA</TypeCode>
 				</Packaging>
 			</GovernmentAgencyGoodsItem>
-			<!--DE 3/16: EORI number of the Importer.-->
+			<!--DE 3/16: Importer Identifcation Number. 
+				EORI number of the Importer. -->
 			<Importer>
 				<ID>GB553202734852</ID>
 			</Importer>
 			<PreviousDocument>
-				<!--DE 2/1: Previous document of Z355 to show the MRN for the entry summary declaration. 
+				<!--DE 2/1: Simplified Declaration/ Previous Documents. 
+					Z355 to show the MRN for the entry summary declaration. 
 					This is a mandatory field. -->
 				<CategoryCode>Z</CategoryCode>
 				<ID>21GB34F7Y1O2CX8PT4</ID>
 				<TypeCode>355</TypeCode>
 				<LineNumeric>1</LineNumeric>
 			</PreviousDocument>
-			<!--DE 2/4: Reference number which is optional for the declarant to complete.-->
+			<!--DE 2/4: Reference Number/ UCR. 
+				Optional for the declarant to complete. -->
 			<UCR>
 				<TraderAssignedReferenceID>1GB553202734852-12345</TraderAssignedReferenceID>
 			</UCR>
 		</GoodsShipment>
-		<!--DE 5/27: Supervising Customs Office. This is a mandatory field dependant on the Procedure code.
-				The ID GBSAA001 represents Southend on Sea, Alexander House -->
+		<!--DE 5/27: Supervising Customs Office.
+			This is a mandatory field dependant on the Procedure code.
+			The ID GBSAA001 represents Southend on Sea, Alexander House. -->
 				<SupervisingOffice>
 					<ID>GBSAA001</ID>
 				</SupervisingOffice>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM073a/TT_IM073a_v1.0.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM073a/TT_IM073a_v1.1.xml
similarity index 89%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM073a/TT_IM073a_v1.0.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM073a/TT_IM073a_v1.1.xml
index 8156fc77..8bd1778f 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM073a/TT_IM073a_v1.0.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM073a/TT_IM073a_v1.1.xml
@@ -28,17 +28,17 @@
 		<!--Function Code of 9 to represent an original declaration.-->
 		<FunctionCode>9</FunctionCode>
 		<!--DE 2/5: LRN.
-			Trader's own reference number - this must be unique to the transaction -->
+			Trader's own reference number - this must be unique to the transaction. -->
 		<FunctionalReferenceID>CDSP_9245_TC3_2710_01</FunctionalReferenceID>
 		<!--DE 1/1: Declaration Type.
-			IM to represent an import declaration.-->
+			IM to represent an import declaration. -->
 		<!--DE 1/2: Additional Declaration Type.
-			J to represent Goods arrived C21 declaration-->
+			J to represent Goods arrived C21 declaration. -->
 		<TypeCode>IMJ</TypeCode>
 		<!--DE 1/9: Total Number of Items.
 			Total number of goods items on the declaration. -->
 		<GoodsItemQuantity>1</GoodsItemQuantity>
-		<!--DE 6/18: Total packages.
+		<!--DE 6/18: Total Packages.
 			In this declaration, 150.
 			Note that this matches DE 6/10 because this is a single item declaration. -->
 		<TotalPackageQuantity>150</TotalPackageQuantity>
@@ -48,7 +48,7 @@
 		<Agent>
 			<FunctionCode>2</FunctionCode>
 		</Agent>
-		<!--DE 3/39: Holder of the authorisation ID Number.
+		<!--DE 3/39: Holder of the Authorisation Identification Number.
 			BRD to indicate BIRDS. -->
 		<AuthorisationHolder>
 			<ID>GB553202734852</ID>
@@ -85,30 +85,30 @@
 				Note: Unlike CHIEF this must now be completed. -->
 			<Consignment>
 				<ContainerCode>1</ContainerCode>
-				<!--DE 7/9: Identity of the Means of Transport on Arrival. 
+				<!--DE 7/9: Identity of Means of Transport on Arrival. 
 					Example number representing IATA flight number and date of flight. -->
 				<ArrivalTransportMeans>
 					<ID>NYC00120102021</ID>
 					<IdentificationTypeCode>40</IdentificationTypeCode>
 				</ArrivalTransportMeans>
-				<!--DE 5/23: Location of Goods. 
+				<!--DE 5/23: Location of Goods - Identification of location.
 					The location code for London Heathrow Airport (an IVL airport) an Inventory Linked location. -->
 				<GoodsLocation>
 					<Name>LHRLHRLHR</Name>
-					<!--DE 5/23: Type of Location.
+					<!--DE 5/23: Location of Goods - Type of location.
 						A in this scenario to represent that it is a designated location.-->
 					<TypeCode>A</TypeCode>
 					<Address>
-						<!--DE 5/23: Type of ID of the Location.
+						<!--DE 5/23: Location of Goods - Qualifier of the identification.
 							U in this scenario for UN/LOCODE. -->
 						<TypeCode>U</TypeCode>
-						<!--DE 5/23: Country code.
+						<!--DE 5/23: Location of Goods - Country.
 							Country where the goods may be examined.
 								GB in this scenario. -->
 						<CountryCode>GB</CountryCode>
 					</Address>
 				</GoodsLocation>
-				<!--DE 7/10: Container identification number. 
+				<!--DE 7/10: Container Identification Number. 
 					This is alpha-numeric with up to 17 characters.
 					For containers covered by the standard ISO 6346, the identifier (prefix) allocated by the International Bureau of in addition to the container identification number.
 					For swap bodies and semi-trailers the ILU (Intermodal Loading Units) code as introduced by the European EN 13044 shall be used. -->
@@ -133,7 +133,7 @@
 					<ID>GBBIRDS55320273485220211018095959</ID>
 					<TypeCode>BRD</TypeCode>
 				</AdditionalDocument>
-				<!--DE 2/2: Additional information. 
+				<!--DE 2/2: Additional Information. 
 					Code '00200' and description 'Various' are declared, to indicate multiple parties where the BIRDS declaration contains more than one exporter. -->
 				<AdditionalInformation>
 					<StatementCode>00200</StatementCode>
@@ -143,14 +143,14 @@
 				<Commodity>
 					<Description>Packets of Stickers</Description>
 					<!--DE 6/1: Net Mass.
-						Mass of the goods in kilograms without any packaging.
+						Weight of the goods in kilograms without any packaging.
                         N.B: There is no need to include a unitcode indicating KG. -->
 					<GoodsMeasure>
 						<GrossMassMeasure>4</GrossMassMeasure>
 						<NetNetWeightMeasure>3</NetNetWeightMeasure>
 					</GoodsMeasure>
-					<!--DE 4/14: Item Price/Amount.
-						The invoice was issued with a value of 2500 and the currency was in GBP. -->
+					<!--DE 4/14: Item Price/ Amount.
+						The invoice was issued with a value of 125 and the currency was in GBP. -->
 					<InvoiceLine>
 						<ItemChargeAmount currencyID="GBP">125</ItemChargeAmount>
 					</InvoiceLine>
@@ -204,7 +204,7 @@
 				<TypeCode>355</TypeCode>
 				<LineNumeric>1</LineNumeric>
 			</PreviousDocument>
-			<!--DE 2/4: Reference Number/UCR.
+			<!--DE 2/4: Reference Number/ UCR.
 				Reference number which is optional for the declarant to complete. -->
 			<UCR>
 				<TraderAssignedReferenceID>1GB553202734852-12345</TraderAssignedReferenceID>
diff --git a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM086a/TT_IM086a_v1.1.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM086a/TT_IM086a_v1.2.xml
similarity index 97%
rename from public/api/conf/2.0/examples/annotated_XML_samples/TT_IM086a/TT_IM086a_v1.1.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM086a/TT_IM086a_v1.2.xml
index 133cf698..9b602cfa 100644
--- a/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM086a/TT_IM086a_v1.1.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM086a/TT_IM086a_v1.2.xml
@@ -208,7 +208,6 @@
 			</UCR>
 		</GoodsShipment>
 			<!--DE 5/27: Supervising Customs Office. 
-				The Supervising Office Code for the HMRC Office overseeing the Customs Warehouse procedure. 
 				In this scenario, GBSFY001 for Salford, Ralli Quays (NTAS). -->
 		<SupervisingOffice>
 			<ID>GBSFY001</ID>
diff --git a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM099a/TT_IM099a_v1.0.xml b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM099a/TT_IM099a_v1.1.xml
similarity index 94%
rename from public/api/conf/1.0/examples/annotated_XML_samples/TT_IM099a/TT_IM099a_v1.0.xml
rename to public/api/conf/2.0/examples/annotated_XML_samples/TT_IM099a/TT_IM099a_v1.1.xml
index 03c85bdb..c40676a7 100644
--- a/public/api/conf/1.0/examples/annotated_XML_samples/TT_IM099a/TT_IM099a_v1.0.xml
+++ b/public/api/conf/2.0/examples/annotated_XML_samples/TT_IM099a/TT_IM099a_v1.1.xml
@@ -109,7 +109,7 @@
 			</Address>
 		</Exporter>
 		<GoodsShipment>
-			<!--DE 8/5: Nature of transaction. 
+			<!--DE 8/5: Nature of Transaction. 
 				Mandatory.
 				1 to indicate transactions involving actual or intended transfer of ownership from residents to non-residents against financial or other compensation.
 				Note: The second digit is not mandatory. -->
@@ -120,7 +120,7 @@
 					1 indicates that goods are transported in containers.
 					Note: Unlike CHIEF this must now be completed. -->
 				<ContainerCode>1</ContainerCode>
-				<!--DE 7/9: Identity of the means of transport on arrival. 
+				<!--DE 7/9: Identity of Means of Transport on Arrival. 
 					Mandatory unless postal or fixed energy installation.
 					Example number representing IMO ship identification number: '10', and 5 digits for the identification number: '12345'. -->
 				<ArrivalTransportMeans>
@@ -156,13 +156,13 @@
 					<ID>AD12345</ID>
 				</TransportEquipment>
 			</Consignment>
-			<!--DE 5/8: Country of destination code. 
+			<!--DE 5/8: Country of Destination Code. 
 				Mandatory. 
 				Destination country is Great Britain. -->
 			<Destination>
 				<CountryCode>GB</CountryCode>
 			</Destination>
-			<!--DE 5/14: Country of dispatch/export code. 
+			<!--DE 5/14: Country of Dispatch/Export Code. 
 				Mandatory. 
 				Export country is France. -->
 			<ExportCountry>
@@ -231,7 +231,7 @@
 					<LPCOExemptionCode>JP</LPCOExemptionCode>
 				</AdditionalDocument>
 				<Commodity>
-					<!--DE 6/8: Description of goods. 
+					<!--DE 6/8: Description of Goods. 
 						Mandatory.
 						Description of the goods specific enough to enable classification - without repeating the CN code description in the Tariff. -->
 					<Description>Prepared foodstuffs: Beverages,Spirits and Vinegar,Tobacco and manufactured Tobacco substitutes</Description>
@@ -243,7 +243,7 @@
 						<IdentificationTypeCode>TSP</IdentificationTypeCode>
 					</Classification>
 					<Classification>
-						<!--DE 6/15: Commodity Code - TARIC code.
+						<!--DE 6/15: Commodity Code: TARIC code.
 							Two characters for the application of specific Union measures in respect of formalities to be completed at destination.
 							Identification Type Code TRC indicates TARIC Code. -->
 						<ID>90</ID>
@@ -261,8 +261,7 @@
 							100 represents no preference being claimed. -->
 						<DutyRegimeCode>100</DutyRegimeCode>
 						<!--DE 4/4: Calculation of Taxes - Tax Base. 
-							Code GBP used as a manual duty calculation is being made.
-							Note where 'OVR01' is declared in D.E. 2/2 (Additional Information) on a Type C or Type F declaration, DE 4/4 (Tax Base) must be declared. -->
+							Code GBP used as a manual duty calculation is being made. -->
 						<SpecificTaxBaseQuantity unitCode="GBP">2500</SpecificTaxBaseQuantity>
 						<!--DE 4/3: Tax Type.
 							A00 represents UK Customs Duty -->
@@ -309,7 +308,7 @@
 							Litre Pure (100%) Alcohol (LPA). -->
 						<TariffQuantity>100</TariffQuantity>
 					</GoodsMeasure>
-					<!--DE 4/14: Item price amount. 
+					<!--DE 4/14: Item Price/ Amount. 
 						Mandatory.
 						The invoice was issued with a value of 5000 and the currency was in GBP. -->
 					<InvoiceLine>
@@ -330,7 +329,7 @@
 					<CurrentCode>40</CurrentCode>
 					<PreviousCode>00</PreviousCode>
 				</GovernmentProcedure>
-				<!--DE 1/11: Additional Procedure. 
+				<!--DE 1/11: Additional Procedure Code. 
 					Mandatory
 					000 to indicate no additional procedure. -->
 				<GovernmentProcedure>
@@ -351,11 +350,11 @@
 						Mandatory.
 						Marks on the packages. -->
 					<MarksNumbersID>BX-1234228/34</MarksNumbersID>
-					<!--DE 6/10: Number of packages. 
+					<!--DE 6/10: Number of Packages. 
 						Mandatory.
 						There are 50 packages of the commodity for this goods item. -->
 					<QuantityQuantity>50</QuantityQuantity>
-					<!--DE 6/9: Type of packages. 
+					<!--DE 6/9: Type of Packages. 
 						Mandatory.
 						BX to represent Box. -->
 					<TypeCode>BX</TypeCode>
@@ -377,7 +376,7 @@
 			<Importer>
 				<ID>GB553202734852</ID>
 			</Importer>
-			<!--DE 2/1: Simplified Declarations/Previous documents.
+			<!--DE 2/1: Simplified Declaration/ Previous Documents.
 				Previous document to show the DUCR assigned to the consignment.
 				Note: The DUCR is not mandatory for ‘normal’ declarations, only if CFSP or where the business process mandates a DUCR for validation (such as for validating a PEACH record via ALVS etc). -->
 			<PreviousDocument>
@@ -385,7 +384,7 @@
 				<ID>1GB553202734852-12345</ID>
 				<TypeCode>DCR</TypeCode>
 			</PreviousDocument>
-			<!--DE 2/1: Simplified Declarations/Previous documents.
+			<!--DE 2/1: Simplified Declaration/ Previous documents.
 				Previous document of Z355 to show the MRN for the entry summary declaration. 
 				Note: As this is for a single item declaration, this should all be declared at header level. -->
 			<PreviousDocument>
@@ -409,7 +408,7 @@
 				Where document code C505 is declared in DE 2/3 (Document Codes) and authorisation type code is declared in DE 3/39 (Holder of the Authorisation), then this data element is mandatory.
 				ID indicates that the guarantee is not required, as stated in DE 8/2. -->
 			<ID>Guaranteenotrequired</ID>
-			<!--DE 8/2: Guarantee Type. 
+			<!--DE 8/2: Guarantee Type and Cash Accounts. 
 				Mandatory for certain procedure codes/MOP.
 				0 to represent that a customs comprehensive Guarantee is being waived for the deferment of customs duty.
 				Where document code C505 is declared in DE 2/3 (Document Codes) and authorisation type code CGU is declared in DE 3/39 (Holder of the Authorisation), then code '0' or '1' must be declared in this data element. -->