diff --git a/guides/profiles/69-transportexecutionplan_w_request/description/consignment.adoc b/guides/profiles/69-transportexecutionplan_w_request/description/consignment.adoc
index 3e08a552..2cd0f212 100644
--- a/guides/profiles/69-transportexecutionplan_w_request/description/consignment.adoc
+++ b/guides/profiles/69-transportexecutionplan_w_request/description/consignment.adoc
@@ -1,4 +1,11 @@
 [[consignment]]
 = Consignment
 
-A consignment is the transportation of an identifiable collection of goods items from one party (the consignor) to another (the consignee) via one or more modes of transport. There are often conflicts between the terms "Shipment" and "Consignment", but in this model the Shipment is focused on the contract and the movement of the goods (what is being shipped), while the Consignment is focused on the service of moving the goods (how it will be done). The consignment can consist of a number of transport handling units, the shipment stages relate to how they are transported and the events during the transport. 
\ No newline at end of file
+A consignment is the transportation of an identifiable collection of goods items from one party (the consignor) to another (the consignee) via one or more 
+modes of transport. There are often conflicts between the terms "Shipment" and "Consignment", but in this model the Shipment is focused on the contract and 
+the movement of the goods (what is being shipped), while the Consignment is focused on the service of moving the goods (how it will be done). The consignment 
+can consist of a number of transport handling units, the shipment stages relate to how they are transported and the events during the transport. 
+If the ID is a GS1 GINC (Global Identification Number for Consignment), it should be indicated by the attribute @schemeID. If it is not,
+the attribute can be omitted. This number identifies a consignment, which is a logical grouping of goods (one or more logistics units) transferred to a 
+freight forwarder to be transported for a specific journey. The consignment number must be allocated by a freight forwarder (or a carrier acting as a freight 
+forwarder) or a consignor, but only if prior agreement of the freight forwarder is given.
\ No newline at end of file
diff --git a/guides/profiles/69-transportexecutionplan_w_request/description/transportHandlingUnit.adoc b/guides/profiles/69-transportexecutionplan_w_request/description/transportHandlingUnit.adoc
index dfbdf245..018f60c1 100644
--- a/guides/profiles/69-transportexecutionplan_w_request/description/transportHandlingUnit.adoc
+++ b/guides/profiles/69-transportexecutionplan_w_request/description/transportHandlingUnit.adoc
@@ -1,8 +1,10 @@
 [[transport-handling-unit]]
 = Transport handling unit
 
-Transport handling units are the units dealt with under transport. It describes a uniquely identifiable unit consisting of one or more packages, goods items, or pieces of transport equipment. A consignment must have at least one Transport handling unit. 
-Includes the description of the transport equipment related to the transport handling unit and the measrument information with the length, width or height of the goods item. 
+Transport handling units are the units dealt with under transport. It describes a uniquely identifiable unit consisting of one or more packages, goods items, or pieces of transport equipment. 
+If the ID has the format of an SSCC, the attribute @schemeID should be included to indicate it.
+A consignment must have at least one Transport handling unit. 
+Includes the description of the transport equipment related to the transport handling unit and the measurment information with the length, width or height of the goods item. 
 
 See also description of Goods item in the next chapter.
 
diff --git a/guides/profiles/69-transportexecutionplan_w_request/principles/otherconcepts.adoc b/guides/profiles/69-transportexecutionplan_w_request/principles/otherconcepts.adoc
index 128590fb..4e30f411 100644
--- a/guides/profiles/69-transportexecutionplan_w_request/principles/otherconcepts.adoc
+++ b/guides/profiles/69-transportexecutionplan_w_request/principles/otherconcepts.adoc
@@ -12,11 +12,12 @@ A contractual arrangement whereby an identifiable collection of goods items is t
 
 |*Consignment* |
 
-The transportation of an identifiable collection of goods items from one party (the Despatch Party) to another party (the Consignee) via one or more modes of transport.
+The transportation of an identifiable collection of goods items from one party (the Despatch Party) to another party (the Consignee) via one or more modes of 
+transport. Can be identified by a GS1 GINC (Global Identification Number for Consignments) or an identity in any other format.
 
 |*Transport Handling Unit* |
 
-A description of individual handling units in which the line items are packed.
+A description of individual handling units in which the line items are packed. The Transport Handling Unit is identified by a GS1 SSCC.
 
 |*Master Data* |
 
diff --git a/guides/profiles/70-transportexecutionplan/description/consignment.adoc b/guides/profiles/70-transportexecutionplan/description/consignment.adoc
index 3e08a552..cfb4210e 100644
--- a/guides/profiles/70-transportexecutionplan/description/consignment.adoc
+++ b/guides/profiles/70-transportexecutionplan/description/consignment.adoc
@@ -1,4 +1,11 @@
 [[consignment]]
 = Consignment
 
-A consignment is the transportation of an identifiable collection of goods items from one party (the consignor) to another (the consignee) via one or more modes of transport. There are often conflicts between the terms "Shipment" and "Consignment", but in this model the Shipment is focused on the contract and the movement of the goods (what is being shipped), while the Consignment is focused on the service of moving the goods (how it will be done). The consignment can consist of a number of transport handling units, the shipment stages relate to how they are transported and the events during the transport. 
\ No newline at end of file
+A consignment is the transportation of an identifiable collection of goods items from one party (the consignor) to another (the consignee) via one or more 
+modes of transport. There are often conflicts between the terms "Shipment" and "Consignment", but in this model the Shipment is focused on the contract and 
+the movement of the goods (what is being shipped), while the Consignment is focused on the service of moving the goods (how it will be done). The consignment 
+can consist of a number of transport handling units, the shipment stages relate to how they are transported and the events during the transport. 
+If the ID is a GS1 GINC (Global Identification Number for Consignment), it should be indicated by the attribute @schemeID. If it is not, the attribute can be 
+omitted. This number identifies a consignment, which is a logical grouping of goods (one or more logistics units) transferred to a freight forwarder to be
+transported for a specific journey. The consignment number must be allocated by a freight forwarder (or a carrier acting as a freight forwarder) or a
+consignor, but only if prior agreement of the freight forwarder is given.
\ No newline at end of file
diff --git a/guides/profiles/70-transportexecutionplan/description/transportHandlingUnit.adoc b/guides/profiles/70-transportexecutionplan/description/transportHandlingUnit.adoc
index dfbdf245..dfafac42 100644
--- a/guides/profiles/70-transportexecutionplan/description/transportHandlingUnit.adoc
+++ b/guides/profiles/70-transportexecutionplan/description/transportHandlingUnit.adoc
@@ -1,7 +1,8 @@
 [[transport-handling-unit]]
 = Transport handling unit
 
-Transport handling units are the units dealt with under transport. It describes a uniquely identifiable unit consisting of one or more packages, goods items, or pieces of transport equipment. A consignment must have at least one Transport handling unit. 
+Transport handling units are the units dealt with under transport. It describes a uniquely identifiable unit consisting of one or more packages, goods items, 
+or pieces of transport equipment. A consignment must have at least one Transport handling unit. If the Transport Handling Unit ID has the format of an SSCC, the attribute @schemeID should be included to indicate it.
 Includes the description of the transport equipment related to the transport handling unit and the measrument information with the length, width or height of the goods item. 
 
 See also description of Goods item in the next chapter.
diff --git a/guides/profiles/70-transportexecutionplan/principles/otherconcepts.adoc b/guides/profiles/70-transportexecutionplan/principles/otherconcepts.adoc
index 128590fb..dfd2a33c 100644
--- a/guides/profiles/70-transportexecutionplan/principles/otherconcepts.adoc
+++ b/guides/profiles/70-transportexecutionplan/principles/otherconcepts.adoc
@@ -12,11 +12,12 @@ A contractual arrangement whereby an identifiable collection of goods items is t
 
 |*Consignment* |
 
-The transportation of an identifiable collection of goods items from one party (the Despatch Party) to another party (the Consignee) via one or more modes of transport.
+The transportation of an identifiable collection of goods items from one party (the Despatch Party) to another party (the Consignee) via one or more modes of 
+transport. Can be identified by a GS1 GINC (Global Identification Number for Consignments) or an identity in any other
 
 |*Transport Handling Unit* |
 
-A description of individual handling units in which the line items are packed.
+A description of individual handling units in which the line items are packed. The Transport Handling Unit is identified by a GS1 SSCC.
 
 |*Master Data* |
 
diff --git a/guides/profiles/72-transportationstatus_w_request/description/consignment.adoc b/guides/profiles/72-transportationstatus_w_request/description/consignment.adoc
index 7c1c58e3..b7021201 100644
--- a/guides/profiles/72-transportationstatus_w_request/description/consignment.adoc
+++ b/guides/profiles/72-transportationstatus_w_request/description/consignment.adoc
@@ -1,7 +1,11 @@
 [[consignment]]
 = Consignment
 
-In this profile consignment is used to identify any transport events or transport handling units that it is requested status on.
+In this profile consignment is used to identify any transport events or transport handling units that it is requested status on. If the ID is a GS1 GINC 
+(Global Identification Number for Consignment), it should be indicated by the attribute @schemeID. If it is not, the attribute can be omitted.
+This number identifies a consignment, which is a logical grouping of goods (one or more logistics units) transferred to a freight forwarder to be
+transported for a specific journey. The consignment number must be allocated by a freight forwarder (or a carrier acting as a freight forwarder) or a
+consignor, but only if prior agreement of the freight forwarder is given.
 
 Example:
 [source, xml, indent=0]
diff --git a/guides/profiles/72-transportationstatus_w_request/principles/otherconcepts.adoc b/guides/profiles/72-transportationstatus_w_request/principles/otherconcepts.adoc
index 128590fb..c309a3b9 100644
--- a/guides/profiles/72-transportationstatus_w_request/principles/otherconcepts.adoc
+++ b/guides/profiles/72-transportationstatus_w_request/principles/otherconcepts.adoc
@@ -16,7 +16,7 @@ The transportation of an identifiable collection of goods items from one party (
 
 |*Transport Handling Unit* |
 
-A description of individual handling units in which the line items are packed.
+A description of individual handling units in which the line items are packed. The Transport Handling Unit is identified by a GS1 SSCC.
 
 |*Master Data* |
 
diff --git a/guides/profiles/73-transportationstatus/description/consignment.adoc b/guides/profiles/73-transportationstatus/description/consignment.adoc
index 7c1c58e3..b7021201 100644
--- a/guides/profiles/73-transportationstatus/description/consignment.adoc
+++ b/guides/profiles/73-transportationstatus/description/consignment.adoc
@@ -1,7 +1,11 @@
 [[consignment]]
 = Consignment
 
-In this profile consignment is used to identify any transport events or transport handling units that it is requested status on.
+In this profile consignment is used to identify any transport events or transport handling units that it is requested status on. If the ID is a GS1 GINC 
+(Global Identification Number for Consignment), it should be indicated by the attribute @schemeID. If it is not, the attribute can be omitted.
+This number identifies a consignment, which is a logical grouping of goods (one or more logistics units) transferred to a freight forwarder to be
+transported for a specific journey. The consignment number must be allocated by a freight forwarder (or a carrier acting as a freight forwarder) or a
+consignor, but only if prior agreement of the freight forwarder is given.
 
 Example:
 [source, xml, indent=0]
diff --git a/rules/examples/Transport Execution Plan Only use cases/TransportExecutionPlan_Example_UseCase1.xml b/rules/examples/Transport Execution Plan Only use cases/TransportExecutionPlan_Example_UseCase1.xml
index 6b7141cc..628ea2e1 100644
--- a/rules/examples/Transport Execution Plan Only use cases/TransportExecutionPlan_Example_UseCase1.xml	
+++ b/rules/examples/Transport Execution Plan Only use cases/TransportExecutionPlan_Example_UseCase1.xml	
@@ -8,6 +8,7 @@
 	<cbc:DocumentStatusCode>9</cbc:DocumentStatusCode>
 	<cbc:TransportUserRemarks>Some remarks</cbc:TransportUserRemarks>
 	<cbc:TransportServiceProviderRemarks>Some remarks</cbc:TransportServiceProviderRemarks>
+	
 	<cac:SenderParty>
 		<cbc:EndpointID schemeID="0184">33572190</cbc:EndpointID>
 		<cac:PartyIdentification>
@@ -34,6 +35,7 @@
 			<cbc:ElectronicMail>kh@ntgnordic.dk</cbc:ElectronicMail>
 		</cac:Contact>
 	</cac:SenderParty>
+	
 	<cac:ReceiverParty>
 		<cbc:EndpointID schemeID="0007">5560125220</cbc:EndpointID>
 		<cac:PartyIdentification>
@@ -56,6 +58,7 @@
 			<cbc:ElectronicMail>info.bromma@beijerbygg.se</cbc:ElectronicMail>
 		</cac:Contact>
 	</cac:ReceiverParty>
+	
 	<cac:TransportUserParty>
 		<cac:PartyIdentification>
 			<cbc:ID schemeID="0007">5560125220</cbc:ID>
@@ -77,6 +80,7 @@
 			<cbc:ElectronicMail>info.bromma@beijerbygg.se</cbc:ElectronicMail>
 		</cac:Contact>
 	</cac:TransportUserParty>
+	
 	<cac:TransportServiceProviderParty>
 		<cac:PartyIdentification>
 			<cbc:ID schemeID="0088">7300010000001</cbc:ID>
@@ -102,6 +106,7 @@
 			<cbc:ElectronicMail>kh@ntgnordic.dk</cbc:ElectronicMail>
 		</cac:Contact>
 	</cac:TransportServiceProviderParty>
+	
 	<cac:BillToParty>
 		<cac:PartyIdentification>
 			<cbc:ID schemeID="0007">5560339086</cbc:ID>
@@ -118,20 +123,24 @@
 			<cbc:RegistrationName>Skanska Sverige AB</cbc:RegistrationName>
 		</cac:PartyLegalEntity>
 	</cac:BillToParty>
+	
 	<cac:MainTransportationService>
 		<cbc:TransportServiceCode>3</cbc:TransportServiceCode>
 		<cbc:TransportationServiceDescription>Transport from door to door</cbc:TransportationServiceDescription>
 	</cac:MainTransportationService>
+	
 	<cac:AdditionalTransportationService>
 		<cbc:TransportServiceCode>12</cbc:TransportServiceCode>
 		<cbc:TransportationServiceDescription>Insurance</cbc:TransportationServiceDescription>
 	</cac:AdditionalTransportationService>
+	
 	<cac:Consignment>
-		<cbc:ID>12535157654567654</cbc:ID>
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
 		<cbc:GrossWeightMeasure unitCode="KGM">2460</cbc:GrossWeightMeasure>
 		<cbc:GrossVolumeMeasure unitCode="MTQ">3.10</cbc:GrossVolumeMeasure>
 		<cbc:HazardousRiskIndicator>false</cbc:HazardousRiskIndicator>
 		<cbc:TotalTransportHandlingUnitQuantity unitCode="EA">2</cbc:TotalTransportHandlingUnitQuantity>
+		
 		<cac:RequestedPickupTransportEvent>
 			<cbc:IdentificationID>21412312412</cbc:IdentificationID>
 			<cac:Location>
@@ -152,6 +161,7 @@
 				<cbc:EndTime>13:00:00+02:00</cbc:EndTime>
 			</cac:Period>
 		</cac:RequestedPickupTransportEvent>
+		
 		<cac:RequestedDeliveryTransportEvent>
 			<cbc:IdentificationID>625435485674654132</cbc:IdentificationID>
 			<cac:Location>
@@ -176,6 +186,7 @@
 				<cbc:EndTime>11:00:00+01:00</cbc:EndTime>
 			</cac:Period>
 		</cac:RequestedDeliveryTransportEvent>
+		
 		<cac:PlannedPickupTransportEvent>
 			<cbc:IdentificationID>21412312412</cbc:IdentificationID>
 			<cac:Location>
@@ -221,6 +232,7 @@
 				<cbc:EndTime>11:00:00+01:00</cbc:EndTime>
 			</cac:Period>
 		</cac:PlannedDeliveryTransportEvent>
+		
 		<cac:ConsigneeParty>
 			<cac:PartyIdentification>
 				<cbc:ID schemeID="0007">5560339086</cbc:ID>
@@ -242,6 +254,7 @@
 				<cbc:ElectronicMail>some.email@skanska.se</cbc:ElectronicMail>
 			</cac:Contact>
 		</cac:ConsigneeParty>
+		
 		<cac:ConsignorParty>
 			<cac:PartyIdentification>
 				<cbc:ID schemeID="0007">5560125220</cbc:ID>
@@ -263,18 +276,21 @@
 				<cbc:ElectronicMail>info.bromma@beijerbygg.se</cbc:ElectronicMail>
 			</cac:Contact>
 		</cac:ConsignorParty>
+		
 		<cac:OriginalDepartureCountry>
 			<cbc:IdentificationCode>SE</cbc:IdentificationCode>
 		</cac:OriginalDepartureCountry>
 		<cac:FinalDestinationCountry>
 			<cbc:IdentificationCode>SE</cbc:IdentificationCode>
 		</cac:FinalDestinationCountry>
+		
 		<cac:DeliveryTerms>
 			<cbc:ID>DAP</cbc:ID>
 		</cac:DeliveryTerms>
 		<cac:PaymentTerms>
 			<cbc:Note>Please send invoice via Peppol to payee party</cbc:Note>
 		</cac:PaymentTerms>
+		
 		<cac:MainCarriageShipmentStage>
 			<cbc:TransportModeCode>3</cbc:TransportModeCode>
 			<cbc:HazardousRiskIndicator>false</cbc:HazardousRiskIndicator>
@@ -304,8 +320,9 @@
 				</cac:Contact>
 			</cac:CarrierParty>
 		</cac:MainCarriageShipmentStage>
+		
 		<cac:TransportHandlingUnit>
-			<cbc:ID>11111222222222</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
 			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
 			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>
 			<cac:MeasurementDimension>
@@ -321,8 +338,9 @@
 				<cbc:Description>Stolpförankring galvaniserad</cbc:Description>
 			</cac:GoodsItem>
 		</cac:TransportHandlingUnit>
+		
 		<cac:TransportHandlingUnit>
-			<cbc:ID>111113333333</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000023</cbc:ID>
 			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
 			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>
 			<cac:MeasurementDimension>
diff --git a/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlanRequest_Example_UseCase1.xml b/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlanRequest_Example_UseCase1.xml
index a20e40b4..257f74e5 100644
--- a/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlanRequest_Example_UseCase1.xml	
+++ b/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlanRequest_Example_UseCase1.xml	
@@ -81,8 +81,8 @@
       <cbc:TransportationServiceDescription>Insurance</cbc:TransportationServiceDescription>  
    </cac:AdditionalTransportationService>
    <cac:Consignment>
-      <cbc:ID>12535157654567654</cbc:ID>     
-      <cbc:GrossWeightMeasure unitCode="KGM">2460</cbc:GrossWeightMeasure>
+	   <cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
+	   <cbc:GrossWeightMeasure unitCode="KGM">2460</cbc:GrossWeightMeasure>
 	  <cbc:GrossVolumeMeasure unitCode="MTQ">3.10</cbc:GrossVolumeMeasure>      
       <cbc:HazardousRiskIndicator>false</cbc:HazardousRiskIndicator>
       <cbc:TotalTransportHandlingUnitQuantity unitCode="EA">2</cbc:TotalTransportHandlingUnitQuantity>
@@ -188,8 +188,8 @@
          <cbc:TransportModeCode>3</cbc:TransportModeCode>                            
       </cac:MainCarriageShipmentStage>
       <cac:TransportHandlingUnit>
-			<cbc:ID>11111222222222</cbc:ID>
-			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
+		  <cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
+		  <cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
 			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>			
 			<cac:MeasurementDimension>
 				<cbc:AttributeID>AAB</cbc:AttributeID>
@@ -205,7 +205,7 @@
 			</cac:GoodsItem>					
 		</cac:TransportHandlingUnit>		
 		<cac:TransportHandlingUnit>
-			<cbc:ID>111113333333</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000023</cbc:ID>
 			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
 			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>
 			<cac:MeasurementDimension>
diff --git a/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlanRequest_Example_UseCase2.xml b/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlanRequest_Example_UseCase2.xml
index a2a63573..2e2e15ac 100644
--- a/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlanRequest_Example_UseCase2.xml	
+++ b/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlanRequest_Example_UseCase2.xml	
@@ -94,8 +94,8 @@
       <cbc:TransportationServiceDescription>Insurance</cbc:TransportationServiceDescription>  
    </cac:AdditionalTransportationService>
    <cac:Consignment>
-      <cbc:ID>12535157654567654</cbc:ID>     
-      <cbc:GrossWeightMeasure unitCode="KGM">2460</cbc:GrossWeightMeasure>
+	   <cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
+	   <cbc:GrossWeightMeasure unitCode="KGM">2460</cbc:GrossWeightMeasure>
 	  <cbc:GrossVolumeMeasure unitCode="MTQ">3.10</cbc:GrossVolumeMeasure>      
       <cbc:HazardousRiskIndicator>false</cbc:HazardousRiskIndicator>
       <cbc:TotalTransportHandlingUnitQuantity unitCode="EA">2</cbc:TotalTransportHandlingUnitQuantity>
@@ -205,8 +205,8 @@
          <cbc:HazardousRiskIndicator>false</cbc:HazardousRiskIndicator>                  
       </cac:MainCarriageShipmentStage>
       <cac:TransportHandlingUnit>
-			<cbc:ID>11111222222222</cbc:ID>
-			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
+		  <cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
+		  <cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
 			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>
 			<cac:MeasurementDimension>
 				<cbc:AttributeID>AAB</cbc:AttributeID>
@@ -222,8 +222,8 @@
       	</cac:GoodsItem>
       </cac:TransportHandlingUnit>		
 		<cac:TransportHandlingUnit>
-		<cbc:ID>111113333333</cbc:ID>
-		<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
+			<cbc:ID schemeID="SSCC">173500538500000023</cbc:ID>
+			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
 		<cbc:ShippingMarks>900206705</cbc:ShippingMarks>
 		<cac:MeasurementDimension>
 			<cbc:AttributeID>AAB</cbc:AttributeID>
diff --git a/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlanRequest_Example_UseCase3.xml b/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlanRequest_Example_UseCase3.xml
index 05f6c3e1..865642c8 100644
--- a/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlanRequest_Example_UseCase3.xml	
+++ b/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlanRequest_Example_UseCase3.xml	
@@ -78,8 +78,8 @@
       <cbc:TransportationServiceDescription>Insurance</cbc:TransportationServiceDescription>  
    </cac:AdditionalTransportationService>
    <cac:Consignment>
-      <cbc:ID>12535157654567654</cbc:ID>     
-      <cbc:GrossWeightMeasure unitCode="KGM">2460</cbc:GrossWeightMeasure>
+	   <cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
+	   <cbc:GrossWeightMeasure unitCode="KGM">2460</cbc:GrossWeightMeasure>
 	  <cbc:GrossVolumeMeasure unitCode="MTQ">3.10</cbc:GrossVolumeMeasure>      
       <cbc:HazardousRiskIndicator>false</cbc:HazardousRiskIndicator>
       <cbc:TotalTransportHandlingUnitQuantity unitCode="EA">2</cbc:TotalTransportHandlingUnitQuantity>
@@ -185,8 +185,8 @@
          <cbc:TransportModeCode>3</cbc:TransportModeCode>                            
       </cac:MainCarriageShipmentStage>
       <cac:TransportHandlingUnit>
-			<cbc:ID>11111222222222</cbc:ID>
-			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
+		  <cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
+		  <cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
 			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>			
 			<cac:MeasurementDimension>
 				<cbc:AttributeID>AAB</cbc:AttributeID>
@@ -202,7 +202,7 @@
 			</cac:GoodsItem>					
 		</cac:TransportHandlingUnit>		
 		<cac:TransportHandlingUnit>
-			<cbc:ID>111113333333</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
 			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
 			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>
 			<cac:MeasurementDimension>
diff --git a/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlan_Example_UseCase1.xml b/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlan_Example_UseCase1.xml
index cfbb5d45..d708fb15 100644
--- a/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlan_Example_UseCase1.xml	
+++ b/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlan_Example_UseCase1.xml	
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
	<cbc:CustomizationID>urn:fdc:peppol.eu:logistics:trns:transport_execution_plan:1</cbc:CustomizationID>
	<cbc:ProfileID>urn:fdc:peppol.eu:logistics:bis:transport_execution_plan_w_request:1</cbc:ProfileID>
	<cbc:ID>691278571829041271246</cbc:ID>
	<cbc:IssueDate>2021-09-29</cbc:IssueDate>
	<cbc:IssueTime>09:49:00+02:00</cbc:IssueTime>
	<cbc:DocumentStatusCode>9</cbc:DocumentStatusCode>
	<cbc:TransportUserRemarks>Some remarks</cbc:TransportUserRemarks>
	<cbc:TransportServiceProviderRemarks>Some remarks</cbc:TransportServiceProviderRemarks>
	<cac:SenderParty>
		<cbc:EndpointID schemeID="0184">33572190</cbc:EndpointID>
		<cac:PartyIdentification>
			<cbc:ID schemeID="0088">7300010000001</cbc:ID>
		</cac:PartyIdentification>
		<cac:PartyName>
			<cbc:Name>NTG Nordic</cbc:Name>
		</cac:PartyName>
		<cac:PostalAddress>
			<cbc:StreetName>Truckvej 5</cbc:StreetName>
			<cbc:CityName>Køge</cbc:CityName>
			<cbc:PostalZone>4600</cbc:PostalZone>
			<cac:Country>
				<cbc:IdentificationCode>DK</cbc:IdentificationCode>
			</cac:Country>
		</cac:PostalAddress>
		<cac:PartyLegalEntity>
			<cbc:RegistrationName>NTG Nordic A/S</cbc:RegistrationName>
			<cbc:CompanyID schemeID="0184">33572190</cbc:CompanyID>
		</cac:PartyLegalEntity>
		<cac:Contact>
			<cbc:Name>Karsten Hansen</cbc:Name>
			<cbc:Telephone>+45889356</cbc:Telephone>
			<cbc:ElectronicMail>kh@ntgnordic.dk</cbc:ElectronicMail>
		</cac:Contact>
	</cac:SenderParty>
	<cac:ReceiverParty>
		<cbc:EndpointID schemeID="0007">5560125220</cbc:EndpointID>
		<cac:PartyIdentification>
			<cbc:ID schemeID="0007">5560125220</cbc:ID>
		</cac:PartyIdentification>
		<cac:PostalAddress>
			<cbc:StreetName>Bällstavägen 102</cbc:StreetName>
			<cbc:CityName>Bromma</cbc:CityName>
			<cbc:PostalZone>168 64</cbc:PostalZone>
			<cac:Country>
				<cbc:IdentificationCode>SE</cbc:IdentificationCode>
			</cac:Country>
		</cac:PostalAddress>
		<cac:PartyLegalEntity>
			<cbc:RegistrationName>Beijer Byggmaterial AB</cbc:RegistrationName>
		</cac:PartyLegalEntity>
		<cac:Contact>
			<cbc:Name>Robin Olsson</cbc:Name>
			<cbc:Telephone>075-241 32304</cbc:Telephone>
			<cbc:ElectronicMail>info.bromma@beijerbygg.se</cbc:ElectronicMail>
		</cac:Contact>
	</cac:ReceiverParty>
	<cac:TransportUserParty>
		<cac:PartyIdentification>
			<cbc:ID schemeID="0007">5560125220</cbc:ID>
		</cac:PartyIdentification>
		<cac:PostalAddress>
			<cbc:StreetName>Bällstavägen 102</cbc:StreetName>
			<cbc:CityName>Bromma</cbc:CityName>
			<cbc:PostalZone>168 64</cbc:PostalZone>
			<cac:Country>
				<cbc:IdentificationCode>SE</cbc:IdentificationCode>
			</cac:Country>
		</cac:PostalAddress>
		<cac:PartyLegalEntity>
			<cbc:RegistrationName>Beijer Byggmaterial AB</cbc:RegistrationName>
		</cac:PartyLegalEntity>
		<cac:Contact>
			<cbc:Name>Robin Olsson</cbc:Name>
			<cbc:Telephone>075-241 32304</cbc:Telephone>
			<cbc:ElectronicMail>info.bromma@beijerbygg.se</cbc:ElectronicMail>
		</cac:Contact>
	</cac:TransportUserParty>
	<cac:TransportServiceProviderParty>
		<cac:PartyIdentification>
			<cbc:ID schemeID="0088">7300010000001</cbc:ID>
		</cac:PartyIdentification>
		<cac:PartyName>
			<cbc:Name>NTG Nordic</cbc:Name>
		</cac:PartyName>
		<cac:PostalAddress>
			<cbc:StreetName>Truckvej 5</cbc:StreetName>
			<cbc:CityName>Køge</cbc:CityName>
			<cbc:PostalZone>4600</cbc:PostalZone>
			<cac:Country>
				<cbc:IdentificationCode>DK</cbc:IdentificationCode>
			</cac:Country>
		</cac:PostalAddress>
		<cac:PartyLegalEntity>
			<cbc:RegistrationName>NTG Nordic A/S</cbc:RegistrationName>
			<cbc:CompanyID schemeID="0184">33572190</cbc:CompanyID>
		</cac:PartyLegalEntity>
		<cac:Contact>
			<cbc:Name>Karsten Hansen</cbc:Name>
			<cbc:Telephone>+45889356</cbc:Telephone>
			<cbc:ElectronicMail>kh@ntgnordic.dk</cbc:ElectronicMail>
		</cac:Contact>
	</cac:TransportServiceProviderParty>
	<cac:BillToParty>
		<cac:PartyIdentification>
			<cbc:ID schemeID="0007">5560339086</cbc:ID>
		</cac:PartyIdentification>
		<cac:PostalAddress>
			<cbc:StreetName>Warfvinges väg 25</cbc:StreetName>
			<cbc:CityName>Stockholm</cbc:CityName>
			<cbc:PostalZone>112 74</cbc:PostalZone>
			<cac:Country>
				<cbc:IdentificationCode>SE</cbc:IdentificationCode>
			</cac:Country>
		</cac:PostalAddress>
		<cac:PartyLegalEntity>
			<cbc:RegistrationName>Skanska Sverige AB</cbc:RegistrationName>
		</cac:PartyLegalEntity>
	</cac:BillToParty>
	<cac:TransportExecutionPlanRequestDocumentReference>
		<cbc:ID>141278571829041241241</cbc:ID>
		<cbc:IssueDate>2021-09-29</cbc:IssueDate>
		<cbc:IssueTime>09:49:00+02:00</cbc:IssueTime>
	</cac:TransportExecutionPlanRequestDocumentReference>
	<cac:MainTransportationService>
		<cbc:TransportServiceCode>3</cbc:TransportServiceCode>
		<cbc:TransportationServiceDescription>Transport from door to door</cbc:TransportationServiceDescription>
	</cac:MainTransportationService>
	<cac:AdditionalTransportationService>
		<cbc:TransportServiceCode>12</cbc:TransportServiceCode>
		<cbc:TransportationServiceDescription>Insurance</cbc:TransportationServiceDescription>
	</cac:AdditionalTransportationService>
	<cac:Consignment>
		<cbc:ID>12535157654567654</cbc:ID>
		<cbc:GrossWeightMeasure unitCode="KGM">2460</cbc:GrossWeightMeasure>
		<cbc:GrossVolumeMeasure unitCode="MTQ">3.10</cbc:GrossVolumeMeasure>
		<cbc:HazardousRiskIndicator>false</cbc:HazardousRiskIndicator>
		<cbc:TotalTransportHandlingUnitQuantity unitCode="EA">2</cbc:TotalTransportHandlingUnitQuantity>
		<cac:RequestedPickupTransportEvent>
			<cbc:IdentificationID>21412312412</cbc:IdentificationID>
			<cac:Location>
				<cbc:Name>Beijer Byggmaterial port 2</cbc:Name>
				<cac:Address>
					<cbc:StreetName>Bällstavägen 102</cbc:StreetName>
					<cbc:CityName>Bromma</cbc:CityName>
					<cbc:PostalZone>168 64</cbc:PostalZone>
					<cac:Country>
						<cbc:IdentificationCode>SE</cbc:IdentificationCode>
					</cac:Country>
				</cac:Address>
			</cac:Location>
			<cac:Period>
				<cbc:StartDate>2021-09-25</cbc:StartDate>
				<cbc:StartTime>12:45:00+02:00</cbc:StartTime>
				<cbc:EndDate>2021-09-25</cbc:EndDate>
				<cbc:EndTime>13:00:00+02:00</cbc:EndTime>
			</cac:Period>
		</cac:RequestedPickupTransportEvent>
		<cac:RequestedDeliveryTransportEvent>
			<cbc:IdentificationID>625435485674654132</cbc:IdentificationID>
			<cac:Location>
				<cbc:ID schemeID="0088">5790000435951</cbc:ID>
				<cbc:Name>Skanska Sverige AB</cbc:Name>
				<cac:Address>
					<cbc:StreetName>Hammarbyvägen 3</cbc:StreetName>
					<cbc:CityName>Stockholm</cbc:CityName>
					<cbc:PostalZone>123 45</cbc:PostalZone>
					<cac:AddressLine>
						<cbc:Line>3:e våningen, Rum 5</cbc:Line>
					</cac:AddressLine>
					<cac:Country>
						<cbc:IdentificationCode>SE</cbc:IdentificationCode>
					</cac:Country>
				</cac:Address>
			</cac:Location>
			<cac:Period>
				<cbc:StartDate>2021-09-29</cbc:StartDate>
				<cbc:StartTime>10:00:00+01:00</cbc:StartTime>
				<cbc:EndDate>2021-09-29</cbc:EndDate>
				<cbc:EndTime>11:00:00+01:00</cbc:EndTime>
			</cac:Period>
		</cac:RequestedDeliveryTransportEvent>
		<cac:PlannedPickupTransportEvent>
			<cbc:IdentificationID>21412312412</cbc:IdentificationID>
			<cac:Location>
				<cbc:Name>Beijer Byggmaterial port 2</cbc:Name>
				<cac:Address>
					<cbc:StreetName>Bällstavägen 102</cbc:StreetName>
					<cbc:CityName>Bromma</cbc:CityName>
					<cbc:PostalZone>168 64</cbc:PostalZone>
					<cac:Country>
						<cbc:IdentificationCode>SE</cbc:IdentificationCode>
					</cac:Country>
				</cac:Address>
			</cac:Location>
			<cac:Period>
				<cbc:StartDate>2021-09-25</cbc:StartDate>
				<cbc:StartTime>12:45:00+02:00</cbc:StartTime>
				<cbc:EndDate>2021-09-25</cbc:EndDate>
				<cbc:EndTime>13:00:00+02:00</cbc:EndTime>
			</cac:Period>
		</cac:PlannedPickupTransportEvent>
		<cac:PlannedDeliveryTransportEvent>
			<cbc:IdentificationID>625435485674654132</cbc:IdentificationID>
			<cac:Location>
				<cbc:ID schemeID="0088">5790000435951</cbc:ID>
				<cbc:Name>Skanska Sverige AB</cbc:Name>
				<cac:Address>
					<cbc:StreetName>Hammarbyvägen 3</cbc:StreetName>
					<cbc:CityName>Stockholm</cbc:CityName>
					<cbc:PostalZone>123 45</cbc:PostalZone>
					<cac:AddressLine>
						<cbc:Line>3:e våningen, Rum 5</cbc:Line>
					</cac:AddressLine>
					<cac:Country>
						<cbc:IdentificationCode>SE</cbc:IdentificationCode>
					</cac:Country>
				</cac:Address>
			</cac:Location>
			<cac:Period>
				<cbc:StartDate>2021-09-29</cbc:StartDate>
				<cbc:StartTime>10:00:00+01:00</cbc:StartTime>
				<cbc:EndDate>2021-09-29</cbc:EndDate>
				<cbc:EndTime>11:00:00+01:00</cbc:EndTime>
			</cac:Period>
		</cac:PlannedDeliveryTransportEvent>
		<cac:ConsigneeParty>
			<cac:PartyIdentification>
				<cbc:ID schemeID="0007">5560339086</cbc:ID>
			</cac:PartyIdentification>
			<cac:PostalAddress>
				<cbc:StreetName>Warfvinges väg 25</cbc:StreetName>
				<cbc:CityName>Stockholm</cbc:CityName>
				<cbc:PostalZone>112 74</cbc:PostalZone>
				<cac:Country>
					<cbc:IdentificationCode>SE</cbc:IdentificationCode>
				</cac:Country>
			</cac:PostalAddress>
			<cac:PartyLegalEntity>
				<cbc:RegistrationName>Skanska Sverige AB</cbc:RegistrationName>
			</cac:PartyLegalEntity>
			<cac:Contact>
				<cbc:Name>Alexander Janving</cbc:Name>
				<cbc:Telephone>010-448 00 004</cbc:Telephone>
				<cbc:ElectronicMail>some.email@skanska.se</cbc:ElectronicMail>
			</cac:Contact>
		</cac:ConsigneeParty>
		<cac:ConsignorParty>
			<cac:PartyIdentification>
				<cbc:ID schemeID="0007">5560125220</cbc:ID>
			</cac:PartyIdentification>
			<cac:PostalAddress>
				<cbc:StreetName>Bällstavägen 102</cbc:StreetName>
				<cbc:CityName>Bromma</cbc:CityName>
				<cbc:PostalZone>168 64</cbc:PostalZone>
				<cac:Country>
					<cbc:IdentificationCode>SE</cbc:IdentificationCode>
				</cac:Country>
			</cac:PostalAddress>
			<cac:PartyLegalEntity>
				<cbc:RegistrationName>Beijer Byggmaterial AB</cbc:RegistrationName>
			</cac:PartyLegalEntity>
			<cac:Contact>
				<cbc:Name>Robin Olsson</cbc:Name>
				<cbc:Telephone>075-241 32304</cbc:Telephone>
				<cbc:ElectronicMail>info.bromma@beijerbygg.se</cbc:ElectronicMail>
			</cac:Contact>
		</cac:ConsignorParty>
		<cac:OriginalDepartureCountry>
			<cbc:IdentificationCode>SE</cbc:IdentificationCode>
		</cac:OriginalDepartureCountry>
		<cac:FinalDestinationCountry>
			<cbc:IdentificationCode>SE</cbc:IdentificationCode>
		</cac:FinalDestinationCountry>
		<cac:DeliveryTerms>
			<cbc:ID>DAP</cbc:ID>
		</cac:DeliveryTerms>
		<cac:PaymentTerms>
			<cbc:Note>Please send invoice via Peppol to payee party</cbc:Note>
		</cac:PaymentTerms>
		<cac:MainCarriageShipmentStage>
			<cbc:TransportModeCode>3</cbc:TransportModeCode>
			<cbc:HazardousRiskIndicator>false</cbc:HazardousRiskIndicator>
			<cac:CarrierParty>
				<cac:PartyIdentification>
					<cbc:ID schemeID="0088">7300010000001</cbc:ID>
				</cac:PartyIdentification>
				<cac:PartyName>
					<cbc:Name>NTG Nordic</cbc:Name>
				</cac:PartyName>
				<cac:PostalAddress>
					<cbc:StreetName>Truckvej 5</cbc:StreetName>
					<cbc:CityName>Køge</cbc:CityName>
					<cbc:PostalZone>4600</cbc:PostalZone>
					<cac:Country>
						<cbc:IdentificationCode>DK</cbc:IdentificationCode>
					</cac:Country>
				</cac:PostalAddress>
				<cac:PartyLegalEntity>
					<cbc:RegistrationName>NTG Nordic A/S</cbc:RegistrationName>
					<cbc:CompanyID schemeID="0184">33572190</cbc:CompanyID>
				</cac:PartyLegalEntity>
				<cac:Contact>
					<cbc:Name>Karsten Hansen</cbc:Name>
					<cbc:Telephone>+45889356</cbc:Telephone>
					<cbc:ElectronicMail>kh@ntgnordic.dk</cbc:ElectronicMail>
				</cac:Contact>
			</cac:CarrierParty>
		</cac:MainCarriageShipmentStage>
		<cac:TransportHandlingUnit>
			<cbc:ID>11111222222222</cbc:ID>
			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>			
			<cac:MeasurementDimension>
				<cbc:AttributeID>AAB</cbc:AttributeID>
				<cbc:Measure unitCode="KGM">1230</cbc:Measure>
			</cac:MeasurementDimension>
			<cac:MeasurementDimension>
				<cbc:AttributeID>AAW</cbc:AttributeID>
				<cbc:Measure unitCode="MTQ">1.55</cbc:Measure>
			</cac:MeasurementDimension>
			<cac:GoodsItem>
				<cbc:ID>1</cbc:ID>
				<cbc:Description>Stolpförankring galvaniserad</cbc:Description>
			</cac:GoodsItem>
		</cac:TransportHandlingUnit>
		<cac:TransportHandlingUnit>
			<cbc:ID>111113333333</cbc:ID>
			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>
			<cac:MeasurementDimension>
				<cbc:AttributeID>AAB</cbc:AttributeID>
				<cbc:Measure unitCode="KGM">1230</cbc:Measure>
			</cac:MeasurementDimension>
			<cac:MeasurementDimension>
				<cbc:AttributeID>AAW</cbc:AttributeID>
				<cbc:Measure unitCode="MTQ">1.55</cbc:Measure>
			</cac:MeasurementDimension>
			<cac:GoodsItem>
				<cbc:ID>1</cbc:ID>
				<cbc:Description>Stolpförankring galvaniserad</cbc:Description>
			</cac:GoodsItem>
		</cac:TransportHandlingUnit>
	</cac:Consignment>
</ubl:TransportExecutionPlan>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<ubl:TransportExecutionPlan xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:TransportExecutionPlan-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
	<cbc:CustomizationID>urn:fdc:peppol.eu:logistics:trns:transport_execution_plan:1</cbc:CustomizationID>
	<cbc:ProfileID>urn:fdc:peppol.eu:logistics:bis:transport_execution_plan_w_request:1</cbc:ProfileID>
	<cbc:ID>691278571829041271246</cbc:ID>
	<cbc:IssueDate>2021-09-29</cbc:IssueDate>
	<cbc:IssueTime>09:49:00+02:00</cbc:IssueTime>
	<cbc:DocumentStatusCode>9</cbc:DocumentStatusCode>
	<cbc:TransportUserRemarks>Some remarks</cbc:TransportUserRemarks>
	<cbc:TransportServiceProviderRemarks>Some remarks</cbc:TransportServiceProviderRemarks>
	<cac:SenderParty>
		<cbc:EndpointID schemeID="0184">33572190</cbc:EndpointID>
		<cac:PartyIdentification>
			<cbc:ID schemeID="0088">7300010000001</cbc:ID>
		</cac:PartyIdentification>
		<cac:PartyName>
			<cbc:Name>NTG Nordic</cbc:Name>
		</cac:PartyName>
		<cac:PostalAddress>
			<cbc:StreetName>Truckvej 5</cbc:StreetName>
			<cbc:CityName>Køge</cbc:CityName>
			<cbc:PostalZone>4600</cbc:PostalZone>
			<cac:Country>
				<cbc:IdentificationCode>DK</cbc:IdentificationCode>
			</cac:Country>
		</cac:PostalAddress>
		<cac:PartyLegalEntity>
			<cbc:RegistrationName>NTG Nordic A/S</cbc:RegistrationName>
			<cbc:CompanyID schemeID="0184">33572190</cbc:CompanyID>
		</cac:PartyLegalEntity>
		<cac:Contact>
			<cbc:Name>Karsten Hansen</cbc:Name>
			<cbc:Telephone>+45889356</cbc:Telephone>
			<cbc:ElectronicMail>kh@ntgnordic.dk</cbc:ElectronicMail>
		</cac:Contact>
	</cac:SenderParty>
	<cac:ReceiverParty>
		<cbc:EndpointID schemeID="0007">5560125220</cbc:EndpointID>
		<cac:PartyIdentification>
			<cbc:ID schemeID="0007">5560125220</cbc:ID>
		</cac:PartyIdentification>
		<cac:PostalAddress>
			<cbc:StreetName>Bällstavägen 102</cbc:StreetName>
			<cbc:CityName>Bromma</cbc:CityName>
			<cbc:PostalZone>168 64</cbc:PostalZone>
			<cac:Country>
				<cbc:IdentificationCode>SE</cbc:IdentificationCode>
			</cac:Country>
		</cac:PostalAddress>
		<cac:PartyLegalEntity>
			<cbc:RegistrationName>Beijer Byggmaterial AB</cbc:RegistrationName>
		</cac:PartyLegalEntity>
		<cac:Contact>
			<cbc:Name>Robin Olsson</cbc:Name>
			<cbc:Telephone>075-241 32304</cbc:Telephone>
			<cbc:ElectronicMail>info.bromma@beijerbygg.se</cbc:ElectronicMail>
		</cac:Contact>
	</cac:ReceiverParty>
	<cac:TransportUserParty>
		<cac:PartyIdentification>
			<cbc:ID schemeID="0007">5560125220</cbc:ID>
		</cac:PartyIdentification>
		<cac:PostalAddress>
			<cbc:StreetName>Bällstavägen 102</cbc:StreetName>
			<cbc:CityName>Bromma</cbc:CityName>
			<cbc:PostalZone>168 64</cbc:PostalZone>
			<cac:Country>
				<cbc:IdentificationCode>SE</cbc:IdentificationCode>
			</cac:Country>
		</cac:PostalAddress>
		<cac:PartyLegalEntity>
			<cbc:RegistrationName>Beijer Byggmaterial AB</cbc:RegistrationName>
		</cac:PartyLegalEntity>
		<cac:Contact>
			<cbc:Name>Robin Olsson</cbc:Name>
			<cbc:Telephone>075-241 32304</cbc:Telephone>
			<cbc:ElectronicMail>info.bromma@beijerbygg.se</cbc:ElectronicMail>
		</cac:Contact>
	</cac:TransportUserParty>
	<cac:TransportServiceProviderParty>
		<cac:PartyIdentification>
			<cbc:ID schemeID="0088">7300010000001</cbc:ID>
		</cac:PartyIdentification>
		<cac:PartyName>
			<cbc:Name>NTG Nordic</cbc:Name>
		</cac:PartyName>
		<cac:PostalAddress>
			<cbc:StreetName>Truckvej 5</cbc:StreetName>
			<cbc:CityName>Køge</cbc:CityName>
			<cbc:PostalZone>4600</cbc:PostalZone>
			<cac:Country>
				<cbc:IdentificationCode>DK</cbc:IdentificationCode>
			</cac:Country>
		</cac:PostalAddress>
		<cac:PartyLegalEntity>
			<cbc:RegistrationName>NTG Nordic A/S</cbc:RegistrationName>
			<cbc:CompanyID schemeID="0184">33572190</cbc:CompanyID>
		</cac:PartyLegalEntity>
		<cac:Contact>
			<cbc:Name>Karsten Hansen</cbc:Name>
			<cbc:Telephone>+45889356</cbc:Telephone>
			<cbc:ElectronicMail>kh@ntgnordic.dk</cbc:ElectronicMail>
		</cac:Contact>
	</cac:TransportServiceProviderParty>
	<cac:BillToParty>
		<cac:PartyIdentification>
			<cbc:ID schemeID="0007">5560339086</cbc:ID>
		</cac:PartyIdentification>
		<cac:PostalAddress>
			<cbc:StreetName>Warfvinges väg 25</cbc:StreetName>
			<cbc:CityName>Stockholm</cbc:CityName>
			<cbc:PostalZone>112 74</cbc:PostalZone>
			<cac:Country>
				<cbc:IdentificationCode>SE</cbc:IdentificationCode>
			</cac:Country>
		</cac:PostalAddress>
		<cac:PartyLegalEntity>
			<cbc:RegistrationName>Skanska Sverige AB</cbc:RegistrationName>
		</cac:PartyLegalEntity>
	</cac:BillToParty>
	<cac:TransportExecutionPlanRequestDocumentReference>
		<cbc:ID>141278571829041241241</cbc:ID>
		<cbc:IssueDate>2021-09-29</cbc:IssueDate>
		<cbc:IssueTime>09:49:00+02:00</cbc:IssueTime>
	</cac:TransportExecutionPlanRequestDocumentReference>
	<cac:MainTransportationService>
		<cbc:TransportServiceCode>3</cbc:TransportServiceCode>
		<cbc:TransportationServiceDescription>Transport from door to door</cbc:TransportationServiceDescription>
	</cac:MainTransportationService>
	<cac:AdditionalTransportationService>
		<cbc:TransportServiceCode>12</cbc:TransportServiceCode>
		<cbc:TransportationServiceDescription>Insurance</cbc:TransportationServiceDescription>
	</cac:AdditionalTransportationService>
	<cac:Consignment>
		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
		<cbc:GrossWeightMeasure unitCode="KGM">2460</cbc:GrossWeightMeasure>
		<cbc:GrossVolumeMeasure unitCode="MTQ">3.10</cbc:GrossVolumeMeasure>
		<cbc:HazardousRiskIndicator>false</cbc:HazardousRiskIndicator>
		<cbc:TotalTransportHandlingUnitQuantity unitCode="EA">2</cbc:TotalTransportHandlingUnitQuantity>
		<cac:RequestedPickupTransportEvent>
			<cbc:IdentificationID>21412312412</cbc:IdentificationID>
			<cac:Location>
				<cbc:Name>Beijer Byggmaterial port 2</cbc:Name>
				<cac:Address>
					<cbc:StreetName>Bällstavägen 102</cbc:StreetName>
					<cbc:CityName>Bromma</cbc:CityName>
					<cbc:PostalZone>168 64</cbc:PostalZone>
					<cac:Country>
						<cbc:IdentificationCode>SE</cbc:IdentificationCode>
					</cac:Country>
				</cac:Address>
			</cac:Location>
			<cac:Period>
				<cbc:StartDate>2021-09-25</cbc:StartDate>
				<cbc:StartTime>12:45:00+02:00</cbc:StartTime>
				<cbc:EndDate>2021-09-25</cbc:EndDate>
				<cbc:EndTime>13:00:00+02:00</cbc:EndTime>
			</cac:Period>
		</cac:RequestedPickupTransportEvent>
		<cac:RequestedDeliveryTransportEvent>
			<cbc:IdentificationID>625435485674654132</cbc:IdentificationID>
			<cac:Location>
				<cbc:ID schemeID="0088">5790000435951</cbc:ID>
				<cbc:Name>Skanska Sverige AB</cbc:Name>
				<cac:Address>
					<cbc:StreetName>Hammarbyvägen 3</cbc:StreetName>
					<cbc:CityName>Stockholm</cbc:CityName>
					<cbc:PostalZone>123 45</cbc:PostalZone>
					<cac:AddressLine>
						<cbc:Line>3:e våningen, Rum 5</cbc:Line>
					</cac:AddressLine>
					<cac:Country>
						<cbc:IdentificationCode>SE</cbc:IdentificationCode>
					</cac:Country>
				</cac:Address>
			</cac:Location>
			<cac:Period>
				<cbc:StartDate>2021-09-29</cbc:StartDate>
				<cbc:StartTime>10:00:00+01:00</cbc:StartTime>
				<cbc:EndDate>2021-09-29</cbc:EndDate>
				<cbc:EndTime>11:00:00+01:00</cbc:EndTime>
			</cac:Period>
		</cac:RequestedDeliveryTransportEvent>
		<cac:PlannedPickupTransportEvent>
			<cbc:IdentificationID>21412312412</cbc:IdentificationID>
			<cac:Location>
				<cbc:Name>Beijer Byggmaterial port 2</cbc:Name>
				<cac:Address>
					<cbc:StreetName>Bällstavägen 102</cbc:StreetName>
					<cbc:CityName>Bromma</cbc:CityName>
					<cbc:PostalZone>168 64</cbc:PostalZone>
					<cac:Country>
						<cbc:IdentificationCode>SE</cbc:IdentificationCode>
					</cac:Country>
				</cac:Address>
			</cac:Location>
			<cac:Period>
				<cbc:StartDate>2021-09-25</cbc:StartDate>
				<cbc:StartTime>12:45:00+02:00</cbc:StartTime>
				<cbc:EndDate>2021-09-25</cbc:EndDate>
				<cbc:EndTime>13:00:00+02:00</cbc:EndTime>
			</cac:Period>
		</cac:PlannedPickupTransportEvent>
		<cac:PlannedDeliveryTransportEvent>
			<cbc:IdentificationID>625435485674654132</cbc:IdentificationID>
			<cac:Location>
				<cbc:ID schemeID="0088">5790000435951</cbc:ID>
				<cbc:Name>Skanska Sverige AB</cbc:Name>
				<cac:Address>
					<cbc:StreetName>Hammarbyvägen 3</cbc:StreetName>
					<cbc:CityName>Stockholm</cbc:CityName>
					<cbc:PostalZone>123 45</cbc:PostalZone>
					<cac:AddressLine>
						<cbc:Line>3:e våningen, Rum 5</cbc:Line>
					</cac:AddressLine>
					<cac:Country>
						<cbc:IdentificationCode>SE</cbc:IdentificationCode>
					</cac:Country>
				</cac:Address>
			</cac:Location>
			<cac:Period>
				<cbc:StartDate>2021-09-29</cbc:StartDate>
				<cbc:StartTime>10:00:00+01:00</cbc:StartTime>
				<cbc:EndDate>2021-09-29</cbc:EndDate>
				<cbc:EndTime>11:00:00+01:00</cbc:EndTime>
			</cac:Period>
		</cac:PlannedDeliveryTransportEvent>
		<cac:ConsigneeParty>
			<cac:PartyIdentification>
				<cbc:ID schemeID="0007">5560339086</cbc:ID>
			</cac:PartyIdentification>
			<cac:PostalAddress>
				<cbc:StreetName>Warfvinges väg 25</cbc:StreetName>
				<cbc:CityName>Stockholm</cbc:CityName>
				<cbc:PostalZone>112 74</cbc:PostalZone>
				<cac:Country>
					<cbc:IdentificationCode>SE</cbc:IdentificationCode>
				</cac:Country>
			</cac:PostalAddress>
			<cac:PartyLegalEntity>
				<cbc:RegistrationName>Skanska Sverige AB</cbc:RegistrationName>
			</cac:PartyLegalEntity>
			<cac:Contact>
				<cbc:Name>Alexander Janving</cbc:Name>
				<cbc:Telephone>010-448 00 004</cbc:Telephone>
				<cbc:ElectronicMail>some.email@skanska.se</cbc:ElectronicMail>
			</cac:Contact>
		</cac:ConsigneeParty>
		<cac:ConsignorParty>
			<cac:PartyIdentification>
				<cbc:ID schemeID="0007">5560125220</cbc:ID>
			</cac:PartyIdentification>
			<cac:PostalAddress>
				<cbc:StreetName>Bällstavägen 102</cbc:StreetName>
				<cbc:CityName>Bromma</cbc:CityName>
				<cbc:PostalZone>168 64</cbc:PostalZone>
				<cac:Country>
					<cbc:IdentificationCode>SE</cbc:IdentificationCode>
				</cac:Country>
			</cac:PostalAddress>
			<cac:PartyLegalEntity>
				<cbc:RegistrationName>Beijer Byggmaterial AB</cbc:RegistrationName>
			</cac:PartyLegalEntity>
			<cac:Contact>
				<cbc:Name>Robin Olsson</cbc:Name>
				<cbc:Telephone>075-241 32304</cbc:Telephone>
				<cbc:ElectronicMail>info.bromma@beijerbygg.se</cbc:ElectronicMail>
			</cac:Contact>
		</cac:ConsignorParty>
		<cac:OriginalDepartureCountry>
			<cbc:IdentificationCode>SE</cbc:IdentificationCode>
		</cac:OriginalDepartureCountry>
		<cac:FinalDestinationCountry>
			<cbc:IdentificationCode>SE</cbc:IdentificationCode>
		</cac:FinalDestinationCountry>
		<cac:DeliveryTerms>
			<cbc:ID>DAP</cbc:ID>
		</cac:DeliveryTerms>
		<cac:PaymentTerms>
			<cbc:Note>Please send invoice via Peppol to payee party</cbc:Note>
		</cac:PaymentTerms>
		<cac:MainCarriageShipmentStage>
			<cbc:TransportModeCode>3</cbc:TransportModeCode>
			<cbc:HazardousRiskIndicator>false</cbc:HazardousRiskIndicator>
			<cac:CarrierParty>
				<cac:PartyIdentification>
					<cbc:ID schemeID="0088">7300010000001</cbc:ID>
				</cac:PartyIdentification>
				<cac:PartyName>
					<cbc:Name>NTG Nordic</cbc:Name>
				</cac:PartyName>
				<cac:PostalAddress>
					<cbc:StreetName>Truckvej 5</cbc:StreetName>
					<cbc:CityName>Køge</cbc:CityName>
					<cbc:PostalZone>4600</cbc:PostalZone>
					<cac:Country>
						<cbc:IdentificationCode>DK</cbc:IdentificationCode>
					</cac:Country>
				</cac:PostalAddress>
				<cac:PartyLegalEntity>
					<cbc:RegistrationName>NTG Nordic A/S</cbc:RegistrationName>
					<cbc:CompanyID schemeID="0184">33572190</cbc:CompanyID>
				</cac:PartyLegalEntity>
				<cac:Contact>
					<cbc:Name>Karsten Hansen</cbc:Name>
					<cbc:Telephone>+45889356</cbc:Telephone>
					<cbc:ElectronicMail>kh@ntgnordic.dk</cbc:ElectronicMail>
				</cac:Contact>
			</cac:CarrierParty>
		</cac:MainCarriageShipmentStage>
		<cac:TransportHandlingUnit>
			<cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>			
			<cac:MeasurementDimension>
				<cbc:AttributeID>AAB</cbc:AttributeID>
				<cbc:Measure unitCode="KGM">1230</cbc:Measure>
			</cac:MeasurementDimension>
			<cac:MeasurementDimension>
				<cbc:AttributeID>AAW</cbc:AttributeID>
				<cbc:Measure unitCode="MTQ">1.55</cbc:Measure>
			</cac:MeasurementDimension>
			<cac:GoodsItem>
				<cbc:ID>1</cbc:ID>
				<cbc:Description>Stolpförankring galvaniserad</cbc:Description>
			</cac:GoodsItem>
		</cac:TransportHandlingUnit>
		<cac:TransportHandlingUnit>
			<cbc:ID schemeID="SSCC">173500538500000023</cbc:ID>
			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>
			<cac:MeasurementDimension>
				<cbc:AttributeID>AAB</cbc:AttributeID>
				<cbc:Measure unitCode="KGM">1230</cbc:Measure>
			</cac:MeasurementDimension>
			<cac:MeasurementDimension>
				<cbc:AttributeID>AAW</cbc:AttributeID>
				<cbc:Measure unitCode="MTQ">1.55</cbc:Measure>
			</cac:MeasurementDimension>
			<cac:GoodsItem>
				<cbc:ID>1</cbc:ID>
				<cbc:Description>Stolpförankring galvaniserad</cbc:Description>
			</cac:GoodsItem>
		</cac:TransportHandlingUnit>
	</cac:Consignment>
</ubl:TransportExecutionPlan>
\ No newline at end of file
diff --git a/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlan_Example_UseCase2.xml b/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlan_Example_UseCase2.xml
index 52bf39e9..5aab891e 100644
--- a/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlan_Example_UseCase2.xml	
+++ b/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlan_Example_UseCase2.xml	
@@ -170,7 +170,7 @@
 		<cbc:TransportationServiceDescription>Insurance</cbc:TransportationServiceDescription>
 	</cac:AdditionalTransportationService>
 	<cac:Consignment>
-		<cbc:ID>12535157654567654</cbc:ID>
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
 		<cbc:GrossWeightMeasure unitCode="KGM">2460</cbc:GrossWeightMeasure>
 		<cbc:GrossVolumeMeasure unitCode="MTQ">3.10</cbc:GrossVolumeMeasure>
 		<cbc:HazardousRiskIndicator>false</cbc:HazardousRiskIndicator>
@@ -347,7 +347,7 @@
 			</cac:CarrierParty>
 		</cac:MainCarriageShipmentStage>
 		<cac:TransportHandlingUnit>
-			<cbc:ID>11111222222222</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
 			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
 			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>
 			<cac:MeasurementDimension>
@@ -364,7 +364,7 @@
 			</cac:GoodsItem>
 		</cac:TransportHandlingUnit>
 		<cac:TransportHandlingUnit>
-			<cbc:ID>111113333333</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000023</cbc:ID>
 			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
 			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>
 			<cac:MeasurementDimension>
diff --git a/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlan_Example_UseCase3.xml b/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlan_Example_UseCase3.xml
index 49417402..564f28ab 100644
--- a/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlan_Example_UseCase3.xml	
+++ b/rules/examples/Transport Execution Plan With Request use cases/TransportExecutionPlan_Example_UseCase3.xml	
@@ -126,7 +126,7 @@
 		<cbc:TransportationServiceDescription>Insurance</cbc:TransportationServiceDescription>
 	</cac:AdditionalTransportationService>
 	<cac:Consignment>
-		<cbc:ID>12535157654567654</cbc:ID>
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
 		<cbc:GrossWeightMeasure unitCode="KGM">2460</cbc:GrossWeightMeasure>
 		<cbc:GrossVolumeMeasure unitCode="MTQ">3.10</cbc:GrossVolumeMeasure>
 		<cbc:HazardousRiskIndicator>false</cbc:HazardousRiskIndicator>
@@ -303,7 +303,7 @@
 			</cac:CarrierParty>
 		</cac:MainCarriageShipmentStage>
 		<cac:TransportHandlingUnit>
-			<cbc:ID>11111222222222</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
 			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
 			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>
 			<cac:MeasurementDimension>
@@ -320,7 +320,7 @@
 			</cac:GoodsItem>
 		</cac:TransportHandlingUnit>
 		<cac:TransportHandlingUnit>
-			<cbc:ID>111113333333</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000023</cbc:ID>
 			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
 			<cbc:ShippingMarks>900206705</cbc:ShippingMarks>
 			<cac:MeasurementDimension>
diff --git a/rules/examples/Transportation Status Only/TransportationStatus_Example_UseCase1.xml b/rules/examples/Transportation Status Only/TransportationStatus_Example_UseCase1.xml
index c50f387a..b568e712 100644
--- a/rules/examples/Transportation Status Only/TransportationStatus_Example_UseCase1.xml	
+++ b/rules/examples/Transportation Status Only/TransportationStatus_Example_UseCase1.xml	
@@ -10,19 +10,19 @@
 	<cbc:TransportationStatusTypeCode>4</cbc:TransportationStatusTypeCode>
 	<cbc:TransportExecutionStatusCode>13</cbc:TransportExecutionStatusCode>
 	<cac:Consignment>
-		<cbc:ID>12535157654567654</cbc:ID>
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
 		<cac:Status>
 			<cbc:Description>Pickup at Beijer Byggmaterial completed</cbc:Description>
 		</cac:Status>
 		<cac:TransportHandlingUnit>
-			<cbc:ID>11111222222222</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
 			<cac:Status>
 				<cbc:ConditionCode listID="zzz">1</cbc:ConditionCode>
 				<cbc:Description>Ok</cbc:Description>
 			</cac:Status>
 		</cac:TransportHandlingUnit>
 		<cac:TransportHandlingUnit>
-			<cbc:ID>111113333333</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000023</cbc:ID>
 			<cac:Status>
 				<cbc:ConditionCode listID="zzz">1</cbc:ConditionCode>
 				<cbc:Description>Ok</cbc:Description>
diff --git a/rules/examples/Transportation Status Only/TransportationStatus_Example_UseCase2.xml b/rules/examples/Transportation Status Only/TransportationStatus_Example_UseCase2.xml
index 66b7be98..fdee212c 100644
--- a/rules/examples/Transportation Status Only/TransportationStatus_Example_UseCase2.xml	
+++ b/rules/examples/Transportation Status Only/TransportationStatus_Example_UseCase2.xml	
@@ -10,19 +10,19 @@
 	<cbc:TransportationStatusTypeCode>4</cbc:TransportationStatusTypeCode>
 	<cbc:TransportExecutionStatusCode>21</cbc:TransportExecutionStatusCode>
 	<cac:Consignment>
-		<cbc:ID>12535157654567654</cbc:ID>
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
 		<cac:Status>
 			<cbc:Description>Pickup at Beijer Byggmaterial completed</cbc:Description>
 		</cac:Status>
 		<cac:TransportHandlingUnit>
-			<cbc:ID>11111222222222</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
 			<cac:Status>
 				<cbc:ConditionCode listID="zzz">1</cbc:ConditionCode>
 				<cbc:Description>Ok</cbc:Description>
 			</cac:Status>
 		</cac:TransportHandlingUnit>
 		<cac:TransportHandlingUnit>
-			<cbc:ID>111113333333</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000023</cbc:ID>
 			<cac:Status>
 				<cbc:ConditionCode listID="zzz">1</cbc:ConditionCode>
 				<cbc:Description>Ok</cbc:Description>
diff --git a/rules/examples/Transportation Status Only/TransportationStatus_Example_UseCase3.xml b/rules/examples/Transportation Status Only/TransportationStatus_Example_UseCase3.xml
index abf72f82..fef9c0ce 100644
--- a/rules/examples/Transportation Status Only/TransportationStatus_Example_UseCase3.xml	
+++ b/rules/examples/Transportation Status Only/TransportationStatus_Example_UseCase3.xml	
@@ -10,19 +10,19 @@
 	<cbc:TransportationStatusTypeCode>3</cbc:TransportationStatusTypeCode>
 	<cbc:TransportExecutionStatusCode>13</cbc:TransportExecutionStatusCode>
 	<cac:Consignment>
-		<cbc:ID>12535157654567654</cbc:ID>
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
 		<cac:Status>
 			<cbc:Description>Pickup at Beijer Byggmaterial completed</cbc:Description>
 		</cac:Status>
 		<cac:TransportHandlingUnit>
-			<cbc:ID>11111222222222</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
 			<cac:Status>
 				<cbc:ConditionCode listID="zzz">1</cbc:ConditionCode>
 				<cbc:Description>Ok</cbc:Description>
 			</cac:Status>
 		</cac:TransportHandlingUnit>
 		<cac:TransportHandlingUnit>
-			<cbc:ID>111113333333</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000023</cbc:ID>
 			<cac:Status>
 				<cbc:ConditionCode listID="zzz">1</cbc:ConditionCode>
 				<cbc:Description>Ok</cbc:Description>
diff --git a/rules/examples/Transportation Status With Request use cases/TransportationStatusRequest_Example_usecase1.xml b/rules/examples/Transportation Status With Request use cases/TransportationStatusRequest_Example_usecase1.xml
index 7320d9ea..fa70e228 100644
--- a/rules/examples/Transportation Status With Request use cases/TransportationStatusRequest_Example_usecase1.xml	
+++ b/rules/examples/Transportation Status With Request use cases/TransportationStatusRequest_Example_usecase1.xml	
@@ -63,8 +63,8 @@
 		<cbc:IssueTime>09:49:00+02:00</cbc:IssueTime>  
    </cac:TransportExecutionPlanDocumentReference>
    <cac:Consignment>
-      <cbc:ID>12535157654567654</cbc:ID>
-      <cac:TransportEvent>
+	   <cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
+	   <cac:TransportEvent>
          <cbc:IdentificationID>625435485674654132</cbc:IdentificationID>            
       </cac:TransportEvent>      
    </cac:Consignment>
diff --git a/rules/examples/Transportation Status With Request use cases/TransportationStatusRequest_Example_usecase3.xml b/rules/examples/Transportation Status With Request use cases/TransportationStatusRequest_Example_usecase3.xml
index fe6a9692..9d444933 100644
--- a/rules/examples/Transportation Status With Request use cases/TransportationStatusRequest_Example_usecase3.xml	
+++ b/rules/examples/Transportation Status With Request use cases/TransportationStatusRequest_Example_usecase3.xml	
@@ -63,9 +63,9 @@
 		<cbc:IssueTime>09:49:00+02:00</cbc:IssueTime>  
    </cac:TransportExecutionPlanDocumentReference> 
    <cac:Consignment>
-      <cbc:ID>12535157654567654</cbc:ID>
-      <cac:TransportHandlingUnit>
-         <cbc:ID schemeID="sscc">11111222222222</cbc:ID>    
-      </cac:TransportHandlingUnit>      
+	   <cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
+	   <cac:TransportHandlingUnit>
+		  <cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
+	  </cac:TransportHandlingUnit>      
    </cac:Consignment>  
 </ubl:TransportationStatusRequest>
diff --git a/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase1.xml b/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase1.xml
index ea655bdd..fdd2ee6b 100644
--- a/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase1.xml	
+++ b/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase1.xml	
@@ -10,7 +10,7 @@
 	<cbc:TransportationStatusTypeCode>3</cbc:TransportationStatusTypeCode>
 	<cbc:TransportExecutionStatusCode>1</cbc:TransportExecutionStatusCode>
 	<cac:Consignment>
-		<cbc:ID>12535157654567654</cbc:ID>
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
 		<cac:Status>
 			<cbc:Description>Delivered</cbc:Description>
 		</cac:Status>
diff --git a/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase2.xml b/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase2.xml
index 0426e729..51f25d33 100644
--- a/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase2.xml	
+++ b/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase2.xml	
@@ -10,20 +10,20 @@
 	<cbc:TransportationStatusTypeCode>3</cbc:TransportationStatusTypeCode>
 	<cbc:TransportExecutionStatusCode>1</cbc:TransportExecutionStatusCode>
 	<cac:Consignment>
-      <cbc:ID>12535157654567654</cbc:ID>
-      <cac:Status>         
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
+		<cac:Status>         
          <cbc:Description>Delivered</cbc:Description>    
       </cac:Status>      
       <cac:TransportHandlingUnit>
-         <cbc:ID>11111222222222</cbc:ID>
-         <cac:Status>
+		  <cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
+		  <cac:Status>
             <cbc:ConditionCode listID="zzz">1</cbc:ConditionCode>
             <cbc:Description>Ok</cbc:Description>      
          </cac:Status>    
       </cac:TransportHandlingUnit> 
       <cac:TransportHandlingUnit>
-         <cbc:ID>111113333333</cbc:ID>
-         <cac:Status>
+		  <cbc:ID schemeID="SSCC">173500538500000023</cbc:ID>
+		  <cac:Status>
             <cbc:ConditionCode listID="zzz">1</cbc:ConditionCode>
             <cbc:Description>Ok</cbc:Description>      
          </cac:Status>    
diff --git a/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase3.xml b/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase3.xml
index d6e1e01f..fd58f315 100644
--- a/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase3.xml	
+++ b/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase3.xml	
@@ -10,19 +10,19 @@
 	<cbc:TransportationStatusTypeCode>3</cbc:TransportationStatusTypeCode>
 	<cbc:TransportExecutionStatusCode>1</cbc:TransportExecutionStatusCode>
 	<cac:Consignment>
-		<cbc:ID>12535157654567654</cbc:ID>
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
 		<cac:Status>
 			<cbc:Description>Delivered</cbc:Description>
 		</cac:Status>
 		<cac:TransportHandlingUnit>
-			<cbc:ID>11111222222222</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
 			<cac:Status>
 				<cbc:ConditionCode listID="zzz">1</cbc:ConditionCode>
 				<cbc:Description>Ok</cbc:Description>
 			</cac:Status>
 		</cac:TransportHandlingUnit>
 		<cac:TransportHandlingUnit>
-			<cbc:ID>111113333333</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000023</cbc:ID>
 			<cac:Status>
 				<cbc:ConditionCode listID="zzz">1</cbc:ConditionCode>
 				<cbc:Description>Ok</cbc:Description>
diff --git a/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase4.xml b/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase4.xml
index 5f9800aa..ebef0b97 100644
--- a/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase4.xml	
+++ b/rules/examples/Transportation Status With Request use cases/TransportationStatus_Example_UseCase4.xml	
@@ -10,12 +10,12 @@
 	<cbc:TransportationStatusTypeCode>3</cbc:TransportationStatusTypeCode>
 	<cbc:TransportExecutionStatusCode>18</cbc:TransportExecutionStatusCode>
 	<cac:Consignment>
-		<cbc:ID>12535157654567654</cbc:ID>
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
 		<cac:Status>
 			<cbc:Description>Delivered</cbc:Description>
 		</cac:Status>
 		<cac:TransportHandlingUnit>
-			<cbc:ID>11111222222222</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
 			<cac:Status>
 				<cbc:ConditionCode listID="zzz">5</cbc:ConditionCode>
 				<cbc:Description>Package broken</cbc:Description>
diff --git a/rules/snippets/transport-execution-plan-request/snippet-1.xml b/rules/snippets/transport-execution-plan-request/snippet-1.xml
index ac6ea458..bcc3c766 100644
--- a/rules/snippets/transport-execution-plan-request/snippet-1.xml
+++ b/rules/snippets/transport-execution-plan-request/snippet-1.xml
@@ -97,7 +97,7 @@
 	<!-- end::transport-service-provider-party[] -->
 
 	<cac:Consignment>
-		<cbc:ID>12535157654567654 </cbc:ID>
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
 		<cbc:GrossWeightMeasure unitCode="KGM">1030</cbc:GrossWeightMeasure>
 		<cbc:GrossVolumeMeasure unitCode="MTQ">20</cbc:GrossVolumeMeasure>
 		<cbc:LoadingLengthMeasure unitCode="MTR">0.4</cbc:LoadingLengthMeasure>
@@ -290,7 +290,7 @@
 
 		<!-- tag::transport-handling-unit[] -->
 		<cac:TransportHandlingUnit>
-			<cbc:ID>11111222222222</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
 			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
 			<cbc:HandlingCode>CCC</cbc:HandlingCode>
 			<cbc:HandlingInstructions>To be set vertical</cbc:HandlingInstructions>
diff --git a/rules/snippets/transport-execution-plan/snippet-1.xml b/rules/snippets/transport-execution-plan/snippet-1.xml
index 8d6543f3..2f92630e 100644
--- a/rules/snippets/transport-execution-plan/snippet-1.xml
+++ b/rules/snippets/transport-execution-plan/snippet-1.xml
@@ -200,7 +200,7 @@
 		<cbc:TransportationServiceDescription>Insurance</cbc:TransportationServiceDescription>  
 	</cac:AdditionalTransportationService>
 	<cac:Consignment>
-		<cbc:ID>CON_1</cbc:ID>
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
 		<cbc:GrossWeightMeasure unitCode="KGM">50000</cbc:GrossWeightMeasure>
 		<cbc:GrossVolumeMeasure unitCode="MTQ">78</cbc:GrossVolumeMeasure>
 		<cbc:LoadingLengthMeasure unitCode="MTR">12</cbc:LoadingLengthMeasure>
@@ -380,7 +380,7 @@
 		<!-- end::main-shipment-stage[] -->
 		<!-- tag::transport-handling-unit[] -->
 		<cac:TransportHandlingUnit>
-			<cbc:ID>11111222222222</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
 			<cbc:TransportHandlingUnitTypeCode>AG</cbc:TransportHandlingUnitTypeCode>
 			<cbc:HandlingCode>CCC</cbc:HandlingCode>
 			<cbc:HandlingInstructions>To be set vertical</cbc:HandlingInstructions>
diff --git a/rules/snippets/transportation-status-request/snippet-1.xml b/rules/snippets/transportation-status-request/snippet-1.xml
index 71f58da3..ba1af3f5 100644
--- a/rules/snippets/transportation-status-request/snippet-1.xml
+++ b/rules/snippets/transportation-status-request/snippet-1.xml
@@ -129,12 +129,12 @@
    </cac:TransportExecutionPlanDocumentReference>
    <!-- tag::consignment[] -->
    <cac:Consignment>
-      <cbc:ID>12535157654567654</cbc:ID>
-      <cac:TransportEvent>
+	   <cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
+	   <cac:TransportEvent>
          <cbc:IdentificationID>21412312412</cbc:IdentificationID>
       </cac:TransportEvent>
       <cac:TransportHandlingUnit>
-         <cbc:ID schemeID="sscc">11111222222222</cbc:ID>
+		  <cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
       </cac:TransportHandlingUnit>
    </cac:Consignment>
    <!-- end::consignment[] -->
diff --git a/rules/snippets/transportation-status/snippet-1.xml b/rules/snippets/transportation-status/snippet-1.xml
index c1ad1bd7..8d9333bb 100644
--- a/rules/snippets/transportation-status/snippet-1.xml
+++ b/rules/snippets/transportation-status/snippet-1.xml
@@ -20,8 +20,8 @@
   	<!-- end::transportation-status-type-code[] -->
     <!-- tag::consignment[] -->
    <cac:Consignment>
-      <cbc:ID>12535157654567654</cbc:ID>
-     <cac:Status>
+	   <cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001</cbc:ID>
+	   <cac:Status>
          <cbc:ConditionCode listID="zzz">4</cbc:ConditionCode>
          <cbc:Description>Description</cbc:Description>    
       </cac:Status>
@@ -38,7 +38,7 @@
          </cac:Period>
       </cac:TransportEvent>
       <cac:TransportHandlingUnit>
-         <cbc:ID schemeID="sscc">11111222222222</cbc:ID>
+		  <cbc:ID schemeID="SSCC">173500538500000016</cbc:ID>
           <cac:Status>
             <cbc:ConditionCode listID="zzz">4</cbc:ConditionCode>
             <cbc:Description>Package with id 2342556523 is damaged</cbc:Description>      
diff --git a/structure/source/ubl-transport-execution-plan-request.xml b/structure/source/ubl-transport-execution-plan-request.xml
index ab8ae3a4..ddc1fc7c 100644
--- a/structure/source/ubl-transport-execution-plan-request.xml
+++ b/structure/source/ubl-transport-execution-plan-request.xml
@@ -573,13 +573,20 @@
 	</cac:AdditionalTransportationService>
 	<cac:Consignment>
 		<?Name Consignment information ?>
+		<?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.?>
 		<?Cardinality 1..1?>
-		<cbc:ID>12535157654567654
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001
 			<?Name Consignment identifier ?>
+			<?Description Id for the consignment, often a number from the Transport Service provider. If this ID is in the GINC format, it should be 
+				indicated in the attribute @schemeID. Use N/A if not applicable.?>
 			<?Cardinality 1..1?>
-			<?schemeID-Name Scheme identifier?>
-			<?schemeID-Description Scheme identifier for electronic address?>
+			<?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 
+				transported for a specific journey. The consignment number must be allocated by a freight forwarder (or a carrier acting as a
+				freight forwarder) or a consignor, but only if prior agreement of the freight forwarder is given.?>
 			<?schemeID-usage Optional?>
+			<?schemeID-Codelist ConsignmentIDType?>
 		</cbc:ID>
 		<cbc:ConsigneeAssignedID>0160110
 			<?Name Consignee reference ?>
@@ -1544,11 +1551,13 @@
 			<?Name Transport handling unit ?>
 			<?Description Used to specify how the goods are packed. ?>
 			<?Cardinality 0..n?>
-			<cbc:ID>11111222222222
+			<cbc:ID schemeID="SSCC">173500538500000016
 				<?Name Identifier transport handling unit ?>
-				<?Description The SSCC identification code of this Transport Handling Unit. ?>
+				<?Description The Transport Handling Unit is identified with a Serial Shipping Container Code (SSCC). The GS1 identification key used to 
+					identify logistics units. The key comprises an extension digit, GS1 Company Prefix, serial reference and check digit. ?>
 				<?Cardinality 1..1?>
 				<?schemeID-usage Optional?>
+				<?schemeID-CodeList TransportHandlingUnitIDType?>
 			</cbc:ID>
 			<cbc:TransportHandlingUnitTypeCode>AG
 				<?Name Handling unit type code ?>
diff --git a/structure/source/ubl-transport-execution-plan.xml b/structure/source/ubl-transport-execution-plan.xml
index 178f2edf..c5d1ae4b 100644
--- a/structure/source/ubl-transport-execution-plan.xml
+++ b/structure/source/ubl-transport-execution-plan.xml
@@ -896,10 +896,20 @@
 	</cac:AdditionalTransportationService>
 	<cac:Consignment>
 		<?Name Consignment information ?>
+		<?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.?>
 		<?Cardinality 1..1?>
-		<cbc:ID>12535157654567654
-		<?Name Consignment identifier ?>
-		<?Description Id for the consignment, often a number from the Transport Service provider. Use N/A if not applicable.?>
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001
+			<?Name Consignment identifier ?>
+			<?Description Id for the consignment, often a number from the Transport Service provider. If this ID is in the GINC format, it should be 
+				indicated in the attribute @schemeID. Use N/A if not applicable.?>
+			<?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 
+				transported for a specific journey. The consignment number must be allocated by a freight forwarder (or a carrier acting as a
+				freight forwarder) or a consignor, but only if prior agreement of the freight forwarder is given.?>
+			<?schemeID-usage Optional?>
+			<?schemeID-Codelist ConsignmentIDType?>
+
 		</cbc:ID>
 		<cbc:ConsigneeAssignedID>0160110
 			<?Name Consignee reference ?>
@@ -3078,11 +3088,13 @@
 			<?Name Transport handling unit ?>
 			<?Description Used to specify how the goods is packed. ?>
 			<?Cardinality 0..n?>
-			<cbc:ID>11111222222222
+			<cbc:ID schemeID="SSCC">173500538500000016
 				<?Name Identifier transport handling unit ?>
-				<?Description The SSCC identification code of this Transport Handling Unit. ?>
+				<?Description The Transport Handling Unit is identified with a Serial Shipping Container Code (SSCC). The GS1 identification key used to 
+					identify logistics units. The key comprises an extension digit, GS1 Company Prefix, serial reference and check digit. ?>
 				<?Cardinality 1..1?>
 				<?schemeID-usage Optional?>
+				<?schemeID-CodeList TransportHandlingUnitIDType?>
 			</cbc:ID>
 			<cbc:TransportHandlingUnitTypeCode>AG
 				<?Name Handling unit type code ?>
diff --git a/structure/source/ubl-transportation-status-request.xml b/structure/source/ubl-transportation-status-request.xml
index 663ff782..f1650691 100644
--- a/structure/source/ubl-transportation-status-request.xml
+++ b/structure/source/ubl-transportation-status-request.xml
@@ -374,11 +374,19 @@
 	</cac:TransportExecutionPlanDocumentReference>
 	<cac:Consignment>
 		<?Name Consignment information ?>
-		<?Description The consignment related to this Transportation Status.?>
+		<?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.?>
 		<?Cardinality 0..1?>
-		<cbc:ID>12535157654567654
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001
 			<?Name Consignment identifier ?>
-			<?Description Id for the consignment, often a number from the transport service provider. ?>
+			<?Description Id for the consignment, often a number from the Transport Service provider. If this ID is in the GINC format, it should be 
+				indicated in the attribute @schemeID. Use N/A if not applicable.?>
+			<?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 
+				transported for a specific journey. The consignment number must be allocated by a freight forwarder (or a carrier acting as a
+				freight forwarder) or a consignor, but only if prior agreement of the freight forwarder is given.?>
+			<?schemeID-usage Optional?>
+			<?schemeID-Codelist ConsignmentIDType?>
 			<?Cardinality 1..1?>
 		</cbc:ID>
 		<cac:TransportEvent>
@@ -401,11 +409,13 @@
 			<?Name Transport handling unit ?>
 			<?Description A transport handling unit from which a status is requested. ?>
 			<?Cardinality 0..n?>
-			<cbc:ID schemeID = "sscc">11111222222222
+			<cbc:ID schemeID="SSCC">173500538500000016
 				<?Name Identifier transport handling unit ?>
-				<?Description The SSCC identification code of this transport handling unit. ?>
+				<?Description The Transport Handling Unit is identified with a Serial Shipping Container Code (SSCC). The GS1 identification key used to 
+					identify logistics units. The key comprises an extension digit, GS1 Company Prefix, serial reference and check digit. ?>
 				<?Cardinality 1..1?>
 				<?schemeID-usage Optional?>
+				<?schemeID-CodeList TransportHandlingUnitIDType?>
 			</cbc:ID>
 		</cac:TransportHandlingUnit>
 	</cac:Consignment>
diff --git a/structure/source/ubl-transportation-status.xml b/structure/source/ubl-transportation-status.xml
index de51857b..16e4570c 100644
--- a/structure/source/ubl-transportation-status.xml
+++ b/structure/source/ubl-transportation-status.xml
@@ -47,15 +47,25 @@
 		<?Cardinality 1..1?>
 		<?CodeList TransportationStatusCode?>
 	</cbc:TransportExecutionStatusCode>
+	
 	<cac:Consignment>
 		<?Name Consignment information ?>
-		<?Description The consignment related to this Transportation Status.?>
+		<?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.?>
 		<?Cardinality 0..1?>
-		<cbc:ID>12535157654567654
-		<?Name Consignment identifier ?>
-		<?Description Id for the consignment, often a number from the Transport Service Provider. ?>
-		<?Cardinality 1..1?>
+		<cbc:ID schemeID="GINC">735005233GS1TRANSPORT000001
+			<?Name Consignment identifier ?>
+			<?Description Id for the consignment, often a number from the Transport Service provider. If this ID is in the GINC format, it should be 
+				indicated in the attribute @schemeID. Use N/A if not applicable.?>
+			<?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 
+				transported for a specific journey. The consignment number must be allocated by a freight forwarder (or a carrier acting as a
+				freight forwarder) or a consignor, but only if prior agreement of the freight forwarder is given.?>
+			<?schemeID-usage Optional?>
+			<?schemeID-Codelist ConsignmentIDType?>
+			<?Cardinality 1..1?>
 		</cbc:ID>
+		
 		<cac:Status>
 			<?Name Status ?>
 			<?Description Staus related to the consignment as a whole. ?>
@@ -72,6 +82,7 @@
 				<?Cardinality 1..1?>
 			</cbc:Description>
 		</cac:Status>
+		
 		<cac:TransportEvent>
 			<?Name Transport Event ?>
 			<?Description A transport event associated to this Transportation Status. ?>
@@ -102,6 +113,7 @@
 				<?Description A code specifying the requested transport event type. ?>
 				<?Cardinality 0..1?>
 			</cbc:CompletionIndicator>
+			
 			<cac:CurrentStatus>
 				<?Name Status ?>
 				<?Description Staus related to the consignment as a whole. ?>
@@ -129,22 +141,25 @@
 					<?Cardinality 0..1?>
 				</cbc:StatusReason>
 			</cac:CurrentStatus>
+			
 			<cac:Signature>
 				<?Name Signature?>
 				<?Description A signature applied to this transport event. ?>
 				<?Cardinality 0..1?>
 				<cbc:ID>3453
-				<?Name Identifier Signature ?>
-				<?Description The Id of the Signature.?>
-				<?Cardinality 1..1?>						
-			</cbc:ID>
+					<?Name Identifier Signature ?>
+					<?Description The Id of the Signature.?>
+					<?Cardinality 1..1?>						
+				</cbc:ID>
 				<cbc:ValidationDate>2021-09-29
-				<?Description The date upon which this signature was verified. Format = "YYYY-MM-DD". ?>
-				<?Cardinality 0..1?>
-			</cbc:ValidationDate>
-				<cbc:ValidationTime>09:49:00+01:00<?Description The local time at which this signature was verified. Format = "hh:mm:ss". ?>
-				<?Cardinality 0..1?>
-			</cbc:ValidationTime>
+					<?Description The date upon which this signature was verified. Format = "YYYY-MM-DD". ?>
+					<?Cardinality 0..1?>
+				</cbc:ValidationDate>
+				<cbc:ValidationTime>09:49:00+01:00
+					<?Description The local time at which this signature was verified. Format = "hh:mm:ss". ?>
+					<?Cardinality 0..1?>
+				</cbc:ValidationTime>
+				
 				<cac:SignatoryParty>
 					<?Name Signature party ?>
 					<?Description The party signing this event. ?>
@@ -234,6 +249,7 @@
 						</cbc:JobTitle>
 					</cac:Person>
 				</cac:SignatoryParty>
+				
 				<cac:DigitalSignatureAttachment>
 					<?Name Attachment?>
 					<?Cardinality 0..1?>
@@ -254,6 +270,7 @@
 					</cac:ExternalReference>
 				</cac:DigitalSignatureAttachment>
 			</cac:Signature>
+			
 			<cac:Period>
 				<?Name Period?>
 				<?Description The updated period for this transport event. Unse only if the event has not occured. ?>
@@ -272,11 +289,19 @@
 				</cbc:EndTime>
 			</cac:Period>
 		</cac:TransportEvent>
+		
 		<cac:TransportHandlingUnit>
 			<?Name Transport handling Unit ?>
 			<?Description The transport handling unit refered to in this Transportation Status. ?>
 			<?Cardinality 0..n?>
-			<cbc:ID>CON_THU_1</cbc:ID>
+			<cbc:ID schemeID="SSCC">173500538500000016
+				<?Name Identifier transport handling unit ?>
+				<?Description The Transport Handling Unit is identified with a Serial Shipping Container Code (SSCC). The GS1 identification key used to 
+					identify logistics units. The key comprises an extension digit, GS1 Company Prefix, serial reference and check digit. ?>
+				<?Cardinality 1..1?>
+				<?schemeID-usage Optional?>
+				<?schemeID-CodeList TransportHandlingUnitIDType?>
+			</cbc:ID>
 			<cac:Status>
 				<?Name Status ?>
 				<?Description Status related to the transport handling unit. ?>
@@ -295,6 +320,7 @@
 			</cac:Status>
 		</cac:TransportHandlingUnit>
 	</cac:Consignment>
+	
 	<cac:TransportEvent>
 		<?Name Transport Event ?>
 		<?Description A transport event related to this Transportation Status.?>
@@ -320,10 +346,11 @@
 			<?CodeList TransportEventTypeCode?>
 		</cbc:TransportEventTypeCode>
 		<cbc:CompletionIndicator>true
-				<?Name Completion Indicator ?>
-				<?Description A code specifying the requested transport event type. ?>
-				<?Cardinality 0..1?>
-			</cbc:CompletionIndicator>
+			<?Name Completion Indicator ?>
+			<?Description A code specifying the requested transport event type. ?>
+			<?Cardinality 0..1?>
+		</cbc:CompletionIndicator>
+		
 		<cac:CurrentStatus>
 			<?Name Status ?>
 			<?Description Staus related to the consignment as a whole. ?>
@@ -333,24 +360,25 @@
 					<?Description Specifies the status condition of the related object.  ?>
 					<?Cardinality 0..1?>
 					<?listID-usage Mandatory?>
-				</cbc:ConditionCode>
+			</cbc:ConditionCode>
 			<cbc:Description>Description
 					<?Name Status ?>
 					<?Description Description of the status. ?>
 					<?Cardinality 1..1?>
-				</cbc:Description>
+			</cbc:Description>
 			<cbc:StatusReasonCode listID="zzz">80
 					<?Name Status Reason code?>
 					<?Description The reason of the status expressed as a code. ?>
 					<?Cardinality 0..1?>
 					<?listID-usage Mandatory?>
-				</cbc:StatusReasonCode>
+			</cbc:StatusReasonCode>
 			<cbc:StatusReason>Prolonged coffebreak
 					<?Name Status Reason?>
 					<?Description The reason for this status expressed as text. ?>
 					<?Cardinality 0..1?>
 				</cbc:StatusReason>
 		</cac:CurrentStatus>
+		
 		<cac:Signature>
 			<?Name Signature?>
 			<?Description A signature applied to this transport event. ?>
@@ -367,6 +395,7 @@
 			<cbc:ValidationTime>09:49:00+01:00<?Description The local time at which this signature was verified.. Format = "hh:mm:ss". ?>
 				<?Cardinality 0..1?>
 			</cbc:ValidationTime>
+			
 			<cac:SignatoryParty>
 				<?Name Signature party ?>
 				<?Description The party signing this event. ?>
@@ -456,6 +485,7 @@
 						</cbc:JobTitle>
 				</cac:Person>
 			</cac:SignatoryParty>
+			
 			<cac:DigitalSignatureAttachment>
 				<?Name Attachment?>
 				<?Cardinality 0..1?>
@@ -476,24 +506,26 @@
 				</cac:ExternalReference>
 			</cac:DigitalSignatureAttachment>
 		</cac:Signature>
+		
 		<cac:Period>
-				<?Name Period?>
-				<?Description The updated period for this transport event. Unse only if the event has not occured. ?>
+			<?Name Period?>
+			<?Description The updated period for this transport event. Unse only if the event has not occured. ?>
+			<?Cardinality 0..1?>
+			<cbc:StartDate>2021-09-25<?Description The start date of the period. ?>
 				<?Cardinality 0..1?>
-				<cbc:StartDate>2021-09-25<?Description The start date of the period. ?>
-					<?Cardinality 0..1?>
-				</cbc:StartDate>
-				<cbc:StartTime>12:00:00+01:00<?Description The start time of the period. ?>
-					<?Cardinality 0..1?>
-				</cbc:StartTime>
-				<cbc:EndDate>2021-09-27<?Description The end date of the period. ?>
-					<?Cardinality 0..1?>
-				</cbc:EndDate>
-				<cbc:EndTime>12:00:00+01:00<?Description The end time of the period. ?>
-					<?Cardinality 0..1?>
-				</cbc:EndTime>
-			</cac:Period>
+			</cbc:StartDate>
+			<cbc:StartTime>12:00:00+01:00<?Description The start time of the period. ?>
+				<?Cardinality 0..1?>
+			</cbc:StartTime>
+			<cbc:EndDate>2021-09-27<?Description The end date of the period. ?>
+				<?Cardinality 0..1?>
+			</cbc:EndDate>
+			<cbc:EndTime>12:00:00+01:00<?Description The end time of the period. ?>
+				<?Cardinality 0..1?>
+			</cbc:EndTime>
+		</cac:Period>
 	</cac:TransportEvent>
+	
 	<cac:DocumentReference>
 		<?Name Document reference?>
 		<?Description Reference to additional documents relevant for this Transportation Status such as pictures of damages. ?>
@@ -532,6 +564,7 @@
 			</cac:ExternalReference>
 		</cac:Attachment>
 	</cac:DocumentReference>
+	
 	<cac:Signature>
 		<?Name Signature?>
 		<?Description A signature applied to this Transportation Status. ?>
@@ -638,6 +671,7 @@
 					</cbc:JobTitle>
 			</cac:Person>
 		</cac:SignatoryParty>
+		
 		<cac:DigitalSignatureAttachment>
 			<?Name Attachment?>
 			<?Cardinality 0..1?>
@@ -658,6 +692,7 @@
 			</cac:ExternalReference>
 		</cac:DigitalSignatureAttachment>
 	</cac:Signature>
+	
 	<cac:SenderParty>
 		<?Name Sender party ?>
 		<?Description The party sending the Transportation Status. ?>
@@ -815,6 +850,7 @@
 			</cbc:ElectronicMail>
 		</cac:Contact>
 	</cac:SenderParty>
+	
 	<cac:ReceiverParty>
 		<?Name Receiver Party ?>
 		<?Description The party receiving the Transportation Status. ?>
@@ -977,6 +1013,7 @@
 			</cbc:ElectronicMail>
 		</cac:Contact>
 	</cac:ReceiverParty>
+	
 	<cac:TransportationStatusRequestDocumentReference>
 		<?Name Additional document reference?>
 		<?Description Reference to a Transportation Status Request. ?>
@@ -996,6 +1033,7 @@
 			<?Cardinality 0..1?>
 		</cbc:IssueTime>
 	</cac:TransportationStatusRequestDocumentReference>
+	
 	<cac:TransportExecutionPlanDocumentReference>
 		<?Name Additional document reference?>
 		<?Description Reference to a Transport Execution Plan. ?>
diff --git a/structure/source/ubl-waybill.xml b/structure/source/ubl-waybill.xml
index dbd1bfa1..a15630d7 100644
--- a/structure/source/ubl-waybill.xml
+++ b/structure/source/ubl-waybill.xml
@@ -723,7 +723,7 @@
 						to identify logistics units. The key comprises an extension digit, GS1 Company Prefix, serial reference and check digit. ?>
 					<?Cardinality 1..1?>
 					<?schemeID-usage Optional?>
-					<?schemeID-CodeList ´TransportHandlingUnitIDType?>
+					<?schemeID-CodeList TransportHandlingUnitIDType?>
 				</cbc:ID>
 				<cbc:TransportHandlingUnitTypeCode>AG
 					<?Name Handling unit type code ?>