diff --git a/project.xml b/project.xml
index 9b94f881..6ffc0cd6 100644
--- a/project.xml
+++ b/project.xml
@@ -256,8 +256,20 @@
 		<Type>CodeList-1</Type>
 		<Path>structure/codelist/WeightStatementTypeCode.xml</Path>
 	</Resource>
+	<Resource>
+		<Type>CodeList-1</Type>
+		<Path>structure/codelist/ShipmentIdType.xml</Path>
+	</Resource>
+	<Resource>
+		<Type>CodeList-1</Type>
+		<Path>structure/codelist/ConsignmentIdType.xml</Path>
+	</Resource>
+	<Resource>
+		<Type>CodeList-1</Type>
+		<Path>structure/codelist/TransportHandlingUnitIDType.xml</Path>
+	</Resource>
 
-    <!-- Files -->
+	<!-- Files -->
     <Resource>
         <Type>native:File</Type>
         <Path>project.xml</Path>
diff --git a/structure/source/ubl-advanced-despatch-advice.xml b/structure/source/ubl-advanced-despatch-advice.xml
index 48f5e488..ce884125 100644
--- a/structure/source/ubl-advanced-despatch-advice.xml
+++ b/structure/source/ubl-advanced-despatch-advice.xml
@@ -578,12 +578,10 @@
 	
 	<cac:Shipment>
 		<?Cardinality 1..1?>
-		<?Description A contractual arrangement whereby an identifiable collection of goods items is to be transported from one party 
-		(usually a Supplier) to another party (usually a Customer)?>
+		<?Description A contractual arrangement whereby an identifiable collection of goods items is to be transported from one party (usually a Supplier) to another party (usually a Customer)?>
 		<cbc:ID schemeID="GSIN">73500538500000019
-			<?Description Identifies a shipment. Freight forwarders reference number. If this ID is in the GSIN format, it should be 
-			indicated in the attribute @schemeID. Use NA as a dummy value if the ID is unknown.?>
-			<?schemeID-Usage optional?>
+			<?Description Identifies a shipment. Freight forwarders reference number. If this ID is in the GSIN format, it should be indicated in the attribute @schemeID. Use NA as a dummy value if the ID is unknown.?>
+			<?schemeID-usage optional?>
 			<?schemeID-CodeList ShipmentIDType?>
 			<?schemeID-Description Used to indicate that the ID is in the GSIN format. The Global Shipment Identification Number (GSIN) is a number that 
 			identifies a shipment and is assigned by the seller of goods. The goods shipper collects one or more logistic units for transportation to 
@@ -618,7 +616,7 @@
 			<?Description An identifiable collection of goods items sent from one party (the Despatch Party) to another party (the Consignee) via one or more modes of transport.?>
 			<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001
 				<?Description If this ID is in the GINC format, it should be indicated in the attribute @schemeID. Use NA as a dummy value if the ID is unknown.?>
-				<?schemeID-Usage optional?>
+				<?schemeID-usage optional?>
 				<?schemeID-CodeList ConsignmentIDType?>
 				<?schemeID-Description Used to indicate that the ID is in the GINC (Global Identification Number for Consignment) format. This number 
 				identifies a consignment, which is a logical grouping of goods (one or more logistics units) transferred to a freight forwarder to be