diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index cb1ebf00a8ea4f642b451defe2405f68a3e2d0ea..73a038022e1b1e779402c164c1d407f300c08fce 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.5.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.6.1">
 	<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
 	<!-- Message containers -->
 	<xs:element name="X1Request" type="RequestContainer"/>
@@ -58,7 +58,7 @@
 	<!-- See section 6.1 -->
 	<xs:simpleType name="Version">
 		<xs:restriction base="xs:string">
-			<xs:pattern value="v1.5.1"/>
+			<xs:pattern value="v1.6.1"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<!-- Error Reponse -->
@@ -130,6 +130,7 @@
 			<xs:element name="listOfMediationDetails" type="ListOfMediationDetails" minOccurs="0"/>
 			<xs:element name="correlationID" type="xs:nonNegativeInteger" minOccurs="0"/>
 			<xs:element name="implicitDeactivationAllowed" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="productID" type="XId" minOccurs="0"/>
 			<xs:element name="taskDetailsExtensions" type="TaskDetailsExtensions" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
@@ -230,7 +231,7 @@
 			<xs:element name="serviceScopingOptions" type="ServiceScopingOptions" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name=" ServiceScopingOptions">
+	<xs:complexType name="ServiceScopingOptions">
 		<xs:sequence>
 			<xs:element name="serviceType" type="ListOfServiceTypes" minOccurs="0"/>
 			<xs:element name="locationType" type="LocationTypeOptions" minOccurs="0"/>
@@ -258,7 +259,7 @@
 			<xs:element name="listOfLocationTypes" type="ListOfLocationTypes"/>
 		</xs:choice>
 	</xs:complexType>
-	 <xs:complexType name=" ListOfLocationTypes ">
+	 <xs:complexType name="ListOfLocationTypes">
 		<xs:sequence>
 			<xs:element name="locationType" type="LocationType" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
diff --git a/103221-1/examples/ActivateTaskRequest_example.xml b/103221-1/examples/ActivateTaskRequest_example.xml
index 76f510b0b4a6c8ff397a4137d5a8e8a20fba0d9c..42df4fdfb69a90d39f85d9c3ade16c59ca67cbf9 100644
--- a/103221-1/examples/ActivateTaskRequest_example.xml
+++ b/103221-1/examples/ActivateTaskRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.247432Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</ns1:x1TransactionId>
     <ns1:taskDetails>
       <ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
diff --git a/103221-1/examples/ActivateTaskResponse_example.xml b/103221-1/examples/ActivateTaskResponse_example.xml
index 9a04c2a9ae8e1c79e5baa1191f6b09bc99f29f9f..38d98059bcbd99fc844f75f2c8507f065100f364 100644
--- a/103221-1/examples/ActivateTaskResponse_example.xml
+++ b/103221-1/examples/ActivateTaskResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.401571Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/examples/CreateDestinationRequest_example.xml b/103221-1/examples/CreateDestinationRequest_example.xml
index 89b1a373acf661623eb3bfaadaa47685b1f7110f..6203866fe78b08cfe80f05f250253d04dea1ec85 100644
--- a/103221-1/examples/CreateDestinationRequest_example.xml
+++ b/103221-1/examples/CreateDestinationRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.446605Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>8e8ca539-e4dd-41f3-b1cb-acc2a5edece0</ns1:x1TransactionId>
     <ns1:destinationDetails>
       <ns1:dId>b0ce308c-aa17-42bd-a27b-287bcb5b3468</ns1:dId>
diff --git a/103221-1/examples/CreateDestinationResponse_example.xml b/103221-1/examples/CreateDestinationResponse_example.xml
index 8eae1ded73503272db4872cae6cbb89174d12243..b16339cf9f52362fbabbbddc8d06b72ffe51bc46 100644
--- a/103221-1/examples/CreateDestinationResponse_example.xml
+++ b/103221-1/examples/CreateDestinationResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.446605Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>8e8ca539-e4dd-41f3-b1cb-acc2a5edece0</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/examples/DeactivateTaskRequest_example.xml b/103221-1/examples/DeactivateTaskRequest_example.xml
index 10797cf6baa7869528f9362dd8193c6ec2654bdb..38be7e42ed96591e9d3178c54680f3a5ed8c96bf 100644
--- a/103221-1/examples/DeactivateTaskRequest_example.xml
+++ b/103221-1/examples/DeactivateTaskRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.429594Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>3da0df97-7bd5-4413-936d-74bebd7512fe</ns1:x1TransactionId>
     <ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
   </ns1:x1RequestMessage>
diff --git a/103221-1/examples/DeactivateTaskResponse_example.xml b/103221-1/examples/DeactivateTaskResponse_example.xml
index c34ec569a9a988750ff66d8c65d7c2c820a6c4ac..82bbff83147761be080791beb8c935091d39d62b 100644
--- a/103221-1/examples/DeactivateTaskResponse_example.xml
+++ b/103221-1/examples/DeactivateTaskResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.430594Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>3da0df97-7bd5-4413-936d-74bebd7512fe</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/examples/GetAllDetailsRequest_example.xml b/103221-1/examples/GetAllDetailsRequest_example.xml
index cdbb8eec3653b1c0a6ed12507722919e66d307aa..31e8e7309df6a747d69e8d5fc04e8c9127f3ac03 100644
--- a/103221-1/examples/GetAllDetailsRequest_example.xml
+++ b/103221-1/examples/GetAllDetailsRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.496243Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>bfd0c982-b7d6-4a8e-80a0-89dab964aafd</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/examples/GetAllDetailsResponse_example.xml b/103221-1/examples/GetAllDetailsResponse_example.xml
index 287296e1b47bb889d748a1b61807329634c6c124..5bb79987c2ccf60e9a2a1bf03fdfad7b51648814 100644
--- a/103221-1/examples/GetAllDetailsResponse_example.xml
+++ b/103221-1/examples/GetAllDetailsResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.496743Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>bfd0c982-b7d6-4a8e-80a0-89dab964aafd</ns1:x1TransactionId>
     <ns1:neStatusDetails>
       <ns1:neStatus>OK</ns1:neStatus>
diff --git a/103221-1/examples/GetDestinationDetailsRequest_example.xml b/103221-1/examples/GetDestinationDetailsRequest_example.xml
index bc1ffa70b3bfc81d1f4a0d157ff26310c8de647f..7719ac5b5f50d47dc57fb24f2ac76c14bcab9f8d 100644
--- a/103221-1/examples/GetDestinationDetailsRequest_example.xml
+++ b/103221-1/examples/GetDestinationDetailsRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.462616Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>7de5709c-8269-417f-a123-7087d3971f8c</ns1:x1TransactionId>
     <ns1:dId>b0ce308c-aa17-42bd-a27b-287bcb5b3468</ns1:dId>
   </ns1:x1RequestMessage>
diff --git a/103221-1/examples/GetDestinationDetailsResponse_example.xml b/103221-1/examples/GetDestinationDetailsResponse_example.xml
index bbd6b9cc15f83dead85beae3cbcf28824612c776..aa0de43ae220b2454522b07eaaa8e749745cb138 100644
--- a/103221-1/examples/GetDestinationDetailsResponse_example.xml
+++ b/103221-1/examples/GetDestinationDetailsResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.462616Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>7de5709c-8269-417f-a123-7087d3971f8c</ns1:x1TransactionId>
     <ns1:destinationResponseDetails>
       <ns1:destinationDetails>
diff --git a/103221-1/examples/GetNEStatusRequest_example.xml b/103221-1/examples/GetNEStatusRequest_example.xml
index 29c15b6c617dedee9673a76f76d4f37a7b079aa1..807ec7eb1f3f2380195536a2183c27d4ed31bcb5 100644
--- a/103221-1/examples/GetNEStatusRequest_example.xml
+++ b/103221-1/examples/GetNEStatusRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.487158Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>93d571cb-3793-4385-8b59-2c14097ed743</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/examples/GetNEStatusResponse_example.xml b/103221-1/examples/GetNEStatusResponse_example.xml
index ba19ff3ac4e489ab68d2e0116ff176e5fb38816a..ade1b67d952e94fdf731d5910e9fedf833727a8b 100644
--- a/103221-1/examples/GetNEStatusResponse_example.xml
+++ b/103221-1/examples/GetNEStatusResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.488659Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>93d571cb-3793-4385-8b59-2c14097ed743</ns1:x1TransactionId>
     <ns1:neStatusDetails>
       <ns1:neStatus>OK</ns1:neStatus>
diff --git a/103221-1/examples/GetTaskDetailsRequest_example.xml b/103221-1/examples/GetTaskDetailsRequest_example.xml
index 491c90e230d2b8a7df6b7eb65c7c8207eca41235..ec9d12b0b7a06eec72be4cbb1c307cfba83dc674 100644
--- a/103221-1/examples/GetTaskDetailsRequest_example.xml
+++ b/103221-1/examples/GetTaskDetailsRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.418584Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>609dcabd-5ab1-4c95-9681-a24681f105ac</ns1:x1TransactionId>
     <ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
   </ns1:x1RequestMessage>
diff --git a/103221-1/examples/GetTaskDetailsResponse_example.xml b/103221-1/examples/GetTaskDetailsResponse_example.xml
index 5115b7641450a2a48da1d3278fcf77377d3ffd74..63a66f5227777c24646d2e49089c6e0126ea644d 100644
--- a/103221-1/examples/GetTaskDetailsResponse_example.xml
+++ b/103221-1/examples/GetTaskDetailsResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.420587Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>609dcabd-5ab1-4c95-9681-a24681f105ac</ns1:x1TransactionId>
     <ns1:taskResponseDetails>
       <ns1:taskDetails>
diff --git a/103221-1/examples/KeepaliveRequest_example.xml b/103221-1/examples/KeepaliveRequest_example.xml
index 330e8dbc4ed373c0e6415b8c2b82d7741d7c396b..47650f1242566ec5737dcec1901f80549f9c1cf5 100644
--- a/103221-1/examples/KeepaliveRequest_example.xml
+++ b/103221-1/examples/KeepaliveRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.541784Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>6420aa0f-e5e6-4a32-9dff-15b836589257</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/examples/KeepaliveResponse_example.xml b/103221-1/examples/KeepaliveResponse_example.xml
index 923bbaa143a2f7ec04b336b7692c5193cfb34401..995fed3ea2159798420f1a772960b238bbdf3abf 100644
--- a/103221-1/examples/KeepaliveResponse_example.xml
+++ b/103221-1/examples/KeepaliveResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.542783Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>6420aa0f-e5e6-4a32-9dff-15b836589257</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/examples/ListAllDetailsRequest_example.xml b/103221-1/examples/ListAllDetailsRequest_example.xml
index b3f70b3934f19997c05400961285f0ddf3dc0859..82c7e8d2ca7c5132918dcb989c494e044e09e434 100644
--- a/103221-1/examples/ListAllDetailsRequest_example.xml
+++ b/103221-1/examples/ListAllDetailsRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.508330Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>09529160-2e44-49c6-bf54-204ca5edcfab</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/examples/ListAllDetailsResponse_example.xml b/103221-1/examples/ListAllDetailsResponse_example.xml
index d762e087b73365559c800809505fc2cf785a6dbc..e5e9096d5182c6ee70d4a2b985f98926054fca27 100644
--- a/103221-1/examples/ListAllDetailsResponse_example.xml
+++ b/103221-1/examples/ListAllDetailsResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.508330Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>09529160-2e44-49c6-bf54-204ca5edcfab</ns1:x1TransactionId>
     <ns1:ListOfXIDs>
       <ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
diff --git a/103221-1/examples/ModifyTaskRequest_example.xml b/103221-1/examples/ModifyTaskRequest_example.xml
index bb48bac309fe3f2b89de5c5b1ae0911202196c6f..3aa287f6bdc3c1d206acde9728eb15baaf90f052 100644
--- a/103221-1/examples/ModifyTaskRequest_example.xml
+++ b/103221-1/examples/ModifyTaskRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.411587Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>fcfc97de-1c77-413d-9925-d1630acbf763</ns1:x1TransactionId>
     <ns1:taskDetails>
       <ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
diff --git a/103221-1/examples/ModifyTaskResponse_example.xml b/103221-1/examples/ModifyTaskResponse_example.xml
index adfa3b5eda67629c8c5eb0c3ca076c28f29f3b10..35a9696e376a23a8b1a639fb93da0264c92e78e0 100644
--- a/103221-1/examples/ModifyTaskResponse_example.xml
+++ b/103221-1/examples/ModifyTaskResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.411587Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>fcfc97de-1c77-413d-9925-d1630acbf763</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/examples/PingRequest_example.xml b/103221-1/examples/PingRequest_example.xml
index d9687b61f0d7b232a508748cb0eec9659a693ab5..5eda3b55f8db5a3dfaddf6b8ee7f19b563b13adc 100644
--- a/103221-1/examples/PingRequest_example.xml
+++ b/103221-1/examples/PingRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.547786Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>8f9fc2c5-923a-4a75-b70c-9e0c058bba45</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/examples/PingResponse_example.xml b/103221-1/examples/PingResponse_example.xml
index 9e4dadb53482fe836f4138724fc017773db79adf..7a916ebea5cdab3fbb106608ad3e4c4810e46c3d 100644
--- a/103221-1/examples/PingResponse_example.xml
+++ b/103221-1/examples/PingResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.547786Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>8f9fc2c5-923a-4a75-b70c-9e0c058bba45</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/examples/RemoveAllDestinationsRequest_example.xml b/103221-1/examples/RemoveAllDestinationsRequest_example.xml
index 6b2736585e894f02eb491523f328eced1f0d96d4..8971c0f17c4c357cc07f41e1492515e13a6b8d5e 100644
--- a/103221-1/examples/RemoveAllDestinationsRequest_example.xml
+++ b/103221-1/examples/RemoveAllDestinationsRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.480627Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>88611050-d8e2-4ada-96fc-626b5dbd9cdf</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/examples/RemoveAllDestinationsResponse_example.xml b/103221-1/examples/RemoveAllDestinationsResponse_example.xml
index a057bc2b5a706a1ce4fd372575720521914fe471..a9fb41ff18e9eafa949995a68ea76a05873ee039 100644
--- a/103221-1/examples/RemoveAllDestinationsResponse_example.xml
+++ b/103221-1/examples/RemoveAllDestinationsResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.481629Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>88611050-d8e2-4ada-96fc-626b5dbd9cdf</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/examples/RemoveDestinationRequest_example.xml b/103221-1/examples/RemoveDestinationRequest_example.xml
index a5d3ce1e7b7060411d87a6cb7547cd1aba3ec0c6..655195ff4dd9190ab512d1b9b857f74aac78bbdf 100644
--- a/103221-1/examples/RemoveDestinationRequest_example.xml
+++ b/103221-1/examples/RemoveDestinationRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.473630Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>8c229735-9acf-43ed-8d72-71602625b349</ns1:x1TransactionId>
     <ns1:dId>b0ce308c-aa17-42bd-a27b-287bcb5b3468</ns1:dId>
   </ns1:x1RequestMessage>
diff --git a/103221-1/examples/RemoveDestinationResponse_example.xml b/103221-1/examples/RemoveDestinationResponse_example.xml
index ec910e3ccb2ec6f5d5df97f505e7eb3c41be72ed..81d74cae760f7db062919610c0786424588ba3cf 100644
--- a/103221-1/examples/RemoveDestinationResponse_example.xml
+++ b/103221-1/examples/RemoveDestinationResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.474625Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>8c229735-9acf-43ed-8d72-71602625b349</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/examples/ReportDestinationIssueRequest_example.xml b/103221-1/examples/ReportDestinationIssueRequest_example.xml
index 0f33e2b08470c34d3c9b514b209fd5d496cf8a22..3b8418cf4ac63a36b9d5d998074675cde5f72f1c 100644
--- a/103221-1/examples/ReportDestinationIssueRequest_example.xml
+++ b/103221-1/examples/ReportDestinationIssueRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.526329Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>7e3ff959-55b0-47bd-a417-0d0383252150</ns1:x1TransactionId>
     <ns1:dId>b0ce308c-aa17-42bd-a27b-287bcb5b3468</ns1:dId>
     <ns1:destinationReportType>NonTerminatingFault</ns1:destinationReportType>
diff --git a/103221-1/examples/ReportDestinationIssueResponse_example.xml b/103221-1/examples/ReportDestinationIssueResponse_example.xml
index 44f33816710a252971b05425a44a3bf672235aec..ec35dfb03c1d6dcab446eb5a02bbec06ce52766d 100644
--- a/103221-1/examples/ReportDestinationIssueResponse_example.xml
+++ b/103221-1/examples/ReportDestinationIssueResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.526329Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>7e3ff959-55b0-47bd-a417-0d0383252150</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/examples/ReportNEIssueRequest_example.xml b/103221-1/examples/ReportNEIssueRequest_example.xml
index b06c96960007fa640bd60492803b1874ae42bb58..5df53cb7f72ab8b5eb318289368437a36138d99e 100644
--- a/103221-1/examples/ReportNEIssueRequest_example.xml
+++ b/103221-1/examples/ReportNEIssueRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.531784Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b</ns1:x1TransactionId>
     <ns1:typeOfNeIssueMessage>Warning</ns1:typeOfNeIssueMessage>
     <ns1:description>Example NE issue</ns1:description>
diff --git a/103221-1/examples/ReportNEIssueResponse_example.xml b/103221-1/examples/ReportNEIssueResponse_example.xml
index ab2a6b8088ea27604e656bb0ce5e778bfa3dcd2f..d18e2812f95794d38382bd855f81e6cb113b4415 100644
--- a/103221-1/examples/ReportNEIssueResponse_example.xml
+++ b/103221-1/examples/ReportNEIssueResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.531784Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/examples/ReportTaskIssueRequest_example.xml b/103221-1/examples/ReportTaskIssueRequest_example.xml
index ddbe803817b8ec7061fcd2f3d3de2e75e78b3a61..162bd255f29eb04f66237a872fc44c4f9b063ff7 100644
--- a/103221-1/examples/ReportTaskIssueRequest_example.xml
+++ b/103221-1/examples/ReportTaskIssueRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.516321Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295</ns1:x1TransactionId>
     <ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
     <ns1:taskReportType>NonTerminatingFault</ns1:taskReportType>
diff --git a/103221-1/examples/ReportTaskIssueResponse_example.xml b/103221-1/examples/ReportTaskIssueResponse_example.xml
index eac29799a50d22f2d273ac67fd82e81f64151c08..a46017ff6cf642b3173ed82d11b6a01659cd30c7 100644
--- a/103221-1/examples/ReportTaskIssueResponse_example.xml
+++ b/103221-1/examples/ReportTaskIssueResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.517323Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/examples/validate_examples.py b/103221-1/examples/validate_examples.py
index 0faa18a76d037313e6e238222c49acaa559b4c16..a22c986f0c122fe00ec025acad8bd8805a03ce3b 100644
--- a/103221-1/examples/validate_examples.py
+++ b/103221-1/examples/validate_examples.py
@@ -1,5 +1,6 @@
 import glob
 import sys
+from pathlib import Path
 
 
 XS = 'http://www.w3.org/2001/XMLSchema'
@@ -46,7 +47,8 @@ def load_schema(xsd):
     imports = xsd_doc.xpath('//*/xs:import', namespaces={'xs': XS})
 
     for xsd_import in imports:
-        xsd_import.attrib['schemaLocation'] = common_xsd[0]
+        xsd_import.attrib['schemaLocation'] = str(Path(common_xsd[0]))
+        print (xsd_import.attrib)
 
     # Load TS 103 221-1 XSD as a schema
 
diff --git a/103221-1/portal/TS_103_221_01_v010501.xsd b/103221-1/portal/TS_103_221_01_v010601.xsd
similarity index 99%
rename from 103221-1/portal/TS_103_221_01_v010501.xsd
rename to 103221-1/portal/TS_103_221_01_v010601.xsd
index cb1ebf00a8ea4f642b451defe2405f68a3e2d0ea..73a038022e1b1e779402c164c1d407f300c08fce 100644
--- a/103221-1/portal/TS_103_221_01_v010501.xsd
+++ b/103221-1/portal/TS_103_221_01_v010601.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.5.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.6.1">
 	<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
 	<!-- Message containers -->
 	<xs:element name="X1Request" type="RequestContainer"/>
@@ -58,7 +58,7 @@
 	<!-- See section 6.1 -->
 	<xs:simpleType name="Version">
 		<xs:restriction base="xs:string">
-			<xs:pattern value="v1.5.1"/>
+			<xs:pattern value="v1.6.1"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<!-- Error Reponse -->
@@ -130,6 +130,7 @@
 			<xs:element name="listOfMediationDetails" type="ListOfMediationDetails" minOccurs="0"/>
 			<xs:element name="correlationID" type="xs:nonNegativeInteger" minOccurs="0"/>
 			<xs:element name="implicitDeactivationAllowed" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="productID" type="XId" minOccurs="0"/>
 			<xs:element name="taskDetailsExtensions" type="TaskDetailsExtensions" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
@@ -230,7 +231,7 @@
 			<xs:element name="serviceScopingOptions" type="ServiceScopingOptions" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name=" ServiceScopingOptions">
+	<xs:complexType name="ServiceScopingOptions">
 		<xs:sequence>
 			<xs:element name="serviceType" type="ListOfServiceTypes" minOccurs="0"/>
 			<xs:element name="locationType" type="LocationTypeOptions" minOccurs="0"/>
@@ -258,7 +259,7 @@
 			<xs:element name="listOfLocationTypes" type="ListOfLocationTypes"/>
 		</xs:choice>
 	</xs:complexType>
-	 <xs:complexType name=" ListOfLocationTypes ">
+	 <xs:complexType name="ListOfLocationTypes">
 		<xs:sequence>
 			<xs:element name="locationType" type="LocationType" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
diff --git a/103221-1/portal/ActivateTaskRequest_example.xml b/103221-1/portal/examples/ActivateTaskRequest_example.xml
similarity index 96%
rename from 103221-1/portal/ActivateTaskRequest_example.xml
rename to 103221-1/portal/examples/ActivateTaskRequest_example.xml
index 76f510b0b4a6c8ff397a4137d5a8e8a20fba0d9c..42df4fdfb69a90d39f85d9c3ade16c59ca67cbf9 100644
--- a/103221-1/portal/ActivateTaskRequest_example.xml
+++ b/103221-1/portal/examples/ActivateTaskRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.247432Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</ns1:x1TransactionId>
     <ns1:taskDetails>
       <ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
diff --git a/103221-1/portal/ActivateTaskResponse_example.xml b/103221-1/portal/examples/ActivateTaskResponse_example.xml
similarity index 93%
rename from 103221-1/portal/ActivateTaskResponse_example.xml
rename to 103221-1/portal/examples/ActivateTaskResponse_example.xml
index 9a04c2a9ae8e1c79e5baa1191f6b09bc99f29f9f..38d98059bcbd99fc844f75f2c8507f065100f364 100644
--- a/103221-1/portal/ActivateTaskResponse_example.xml
+++ b/103221-1/portal/examples/ActivateTaskResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.401571Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/portal/CreateDestinationRequest_example.xml b/103221-1/portal/examples/CreateDestinationRequest_example.xml
similarity index 96%
rename from 103221-1/portal/CreateDestinationRequest_example.xml
rename to 103221-1/portal/examples/CreateDestinationRequest_example.xml
index 89b1a373acf661623eb3bfaadaa47685b1f7110f..6203866fe78b08cfe80f05f250253d04dea1ec85 100644
--- a/103221-1/portal/CreateDestinationRequest_example.xml
+++ b/103221-1/portal/examples/CreateDestinationRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.446605Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>8e8ca539-e4dd-41f3-b1cb-acc2a5edece0</ns1:x1TransactionId>
     <ns1:destinationDetails>
       <ns1:dId>b0ce308c-aa17-42bd-a27b-287bcb5b3468</ns1:dId>
diff --git a/103221-1/portal/CreateDestinationResponse_example.xml b/103221-1/portal/examples/CreateDestinationResponse_example.xml
similarity index 93%
rename from 103221-1/portal/CreateDestinationResponse_example.xml
rename to 103221-1/portal/examples/CreateDestinationResponse_example.xml
index 8eae1ded73503272db4872cae6cbb89174d12243..b16339cf9f52362fbabbbddc8d06b72ffe51bc46 100644
--- a/103221-1/portal/CreateDestinationResponse_example.xml
+++ b/103221-1/portal/examples/CreateDestinationResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.446605Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>8e8ca539-e4dd-41f3-b1cb-acc2a5edece0</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/portal/DeactivateTaskRequest_example.xml b/103221-1/portal/examples/DeactivateTaskRequest_example.xml
similarity index 93%
rename from 103221-1/portal/DeactivateTaskRequest_example.xml
rename to 103221-1/portal/examples/DeactivateTaskRequest_example.xml
index 10797cf6baa7869528f9362dd8193c6ec2654bdb..38be7e42ed96591e9d3178c54680f3a5ed8c96bf 100644
--- a/103221-1/portal/DeactivateTaskRequest_example.xml
+++ b/103221-1/portal/examples/DeactivateTaskRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.429594Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>3da0df97-7bd5-4413-936d-74bebd7512fe</ns1:x1TransactionId>
     <ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
   </ns1:x1RequestMessage>
diff --git a/103221-1/portal/DeactivateTaskResponse_example.xml b/103221-1/portal/examples/DeactivateTaskResponse_example.xml
similarity index 93%
rename from 103221-1/portal/DeactivateTaskResponse_example.xml
rename to 103221-1/portal/examples/DeactivateTaskResponse_example.xml
index c34ec569a9a988750ff66d8c65d7c2c820a6c4ac..82bbff83147761be080791beb8c935091d39d62b 100644
--- a/103221-1/portal/DeactivateTaskResponse_example.xml
+++ b/103221-1/portal/examples/DeactivateTaskResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.430594Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>3da0df97-7bd5-4413-936d-74bebd7512fe</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/portal/GetAllDetailsRequest_example.xml b/103221-1/portal/examples/GetAllDetailsRequest_example.xml
similarity index 93%
rename from 103221-1/portal/GetAllDetailsRequest_example.xml
rename to 103221-1/portal/examples/GetAllDetailsRequest_example.xml
index cdbb8eec3653b1c0a6ed12507722919e66d307aa..31e8e7309df6a747d69e8d5fc04e8c9127f3ac03 100644
--- a/103221-1/portal/GetAllDetailsRequest_example.xml
+++ b/103221-1/portal/examples/GetAllDetailsRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.496243Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>bfd0c982-b7d6-4a8e-80a0-89dab964aafd</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/portal/GetAllDetailsResponse_example.xml b/103221-1/portal/examples/GetAllDetailsResponse_example.xml
similarity index 98%
rename from 103221-1/portal/GetAllDetailsResponse_example.xml
rename to 103221-1/portal/examples/GetAllDetailsResponse_example.xml
index 287296e1b47bb889d748a1b61807329634c6c124..5bb79987c2ccf60e9a2a1bf03fdfad7b51648814 100644
--- a/103221-1/portal/GetAllDetailsResponse_example.xml
+++ b/103221-1/portal/examples/GetAllDetailsResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.496743Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>bfd0c982-b7d6-4a8e-80a0-89dab964aafd</ns1:x1TransactionId>
     <ns1:neStatusDetails>
       <ns1:neStatus>OK</ns1:neStatus>
diff --git a/103221-1/portal/GetDestinationDetailsRequest_example.xml b/103221-1/portal/examples/GetDestinationDetailsRequest_example.xml
similarity index 93%
rename from 103221-1/portal/GetDestinationDetailsRequest_example.xml
rename to 103221-1/portal/examples/GetDestinationDetailsRequest_example.xml
index bc1ffa70b3bfc81d1f4a0d157ff26310c8de647f..7719ac5b5f50d47dc57fb24f2ac76c14bcab9f8d 100644
--- a/103221-1/portal/GetDestinationDetailsRequest_example.xml
+++ b/103221-1/portal/examples/GetDestinationDetailsRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.462616Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>7de5709c-8269-417f-a123-7087d3971f8c</ns1:x1TransactionId>
     <ns1:dId>b0ce308c-aa17-42bd-a27b-287bcb5b3468</ns1:dId>
   </ns1:x1RequestMessage>
diff --git a/103221-1/portal/GetDestinationDetailsResponse_example.xml b/103221-1/portal/examples/GetDestinationDetailsResponse_example.xml
similarity index 97%
rename from 103221-1/portal/GetDestinationDetailsResponse_example.xml
rename to 103221-1/portal/examples/GetDestinationDetailsResponse_example.xml
index bbd6b9cc15f83dead85beae3cbcf28824612c776..aa0de43ae220b2454522b07eaaa8e749745cb138 100644
--- a/103221-1/portal/GetDestinationDetailsResponse_example.xml
+++ b/103221-1/portal/examples/GetDestinationDetailsResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.462616Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>7de5709c-8269-417f-a123-7087d3971f8c</ns1:x1TransactionId>
     <ns1:destinationResponseDetails>
       <ns1:destinationDetails>
diff --git a/103221-1/portal/GetNEStatusRequest_example.xml b/103221-1/portal/examples/GetNEStatusRequest_example.xml
similarity index 92%
rename from 103221-1/portal/GetNEStatusRequest_example.xml
rename to 103221-1/portal/examples/GetNEStatusRequest_example.xml
index 29c15b6c617dedee9673a76f76d4f37a7b079aa1..807ec7eb1f3f2380195536a2183c27d4ed31bcb5 100644
--- a/103221-1/portal/GetNEStatusRequest_example.xml
+++ b/103221-1/portal/examples/GetNEStatusRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.487158Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>93d571cb-3793-4385-8b59-2c14097ed743</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/portal/GetNEStatusResponse_example.xml b/103221-1/portal/examples/GetNEStatusResponse_example.xml
similarity index 94%
rename from 103221-1/portal/GetNEStatusResponse_example.xml
rename to 103221-1/portal/examples/GetNEStatusResponse_example.xml
index ba19ff3ac4e489ab68d2e0116ff176e5fb38816a..ade1b67d952e94fdf731d5910e9fedf833727a8b 100644
--- a/103221-1/portal/GetNEStatusResponse_example.xml
+++ b/103221-1/portal/examples/GetNEStatusResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.488659Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>93d571cb-3793-4385-8b59-2c14097ed743</ns1:x1TransactionId>
     <ns1:neStatusDetails>
       <ns1:neStatus>OK</ns1:neStatus>
diff --git a/103221-1/portal/GetTaskDetailsRequest_example.xml b/103221-1/portal/examples/GetTaskDetailsRequest_example.xml
similarity index 93%
rename from 103221-1/portal/GetTaskDetailsRequest_example.xml
rename to 103221-1/portal/examples/GetTaskDetailsRequest_example.xml
index 491c90e230d2b8a7df6b7eb65c7c8207eca41235..ec9d12b0b7a06eec72be4cbb1c307cfba83dc674 100644
--- a/103221-1/portal/GetTaskDetailsRequest_example.xml
+++ b/103221-1/portal/examples/GetTaskDetailsRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.418584Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>609dcabd-5ab1-4c95-9681-a24681f105ac</ns1:x1TransactionId>
     <ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
   </ns1:x1RequestMessage>
diff --git a/103221-1/portal/GetTaskDetailsResponse_example.xml b/103221-1/portal/examples/GetTaskDetailsResponse_example.xml
similarity index 96%
rename from 103221-1/portal/GetTaskDetailsResponse_example.xml
rename to 103221-1/portal/examples/GetTaskDetailsResponse_example.xml
index 5115b7641450a2a48da1d3278fcf77377d3ffd74..63a66f5227777c24646d2e49089c6e0126ea644d 100644
--- a/103221-1/portal/GetTaskDetailsResponse_example.xml
+++ b/103221-1/portal/examples/GetTaskDetailsResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.420587Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>609dcabd-5ab1-4c95-9681-a24681f105ac</ns1:x1TransactionId>
     <ns1:taskResponseDetails>
       <ns1:taskDetails>
diff --git a/103221-1/portal/KeepaliveRequest_example.xml b/103221-1/portal/examples/KeepaliveRequest_example.xml
similarity index 92%
rename from 103221-1/portal/KeepaliveRequest_example.xml
rename to 103221-1/portal/examples/KeepaliveRequest_example.xml
index 330e8dbc4ed373c0e6415b8c2b82d7741d7c396b..47650f1242566ec5737dcec1901f80549f9c1cf5 100644
--- a/103221-1/portal/KeepaliveRequest_example.xml
+++ b/103221-1/portal/examples/KeepaliveRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.541784Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>6420aa0f-e5e6-4a32-9dff-15b836589257</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/portal/KeepaliveResponse_example.xml b/103221-1/portal/examples/KeepaliveResponse_example.xml
similarity index 93%
rename from 103221-1/portal/KeepaliveResponse_example.xml
rename to 103221-1/portal/examples/KeepaliveResponse_example.xml
index 923bbaa143a2f7ec04b336b7692c5193cfb34401..995fed3ea2159798420f1a772960b238bbdf3abf 100644
--- a/103221-1/portal/KeepaliveResponse_example.xml
+++ b/103221-1/portal/examples/KeepaliveResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.542783Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>6420aa0f-e5e6-4a32-9dff-15b836589257</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/portal/ListAllDetailsRequest_example.xml b/103221-1/portal/examples/ListAllDetailsRequest_example.xml
similarity index 93%
rename from 103221-1/portal/ListAllDetailsRequest_example.xml
rename to 103221-1/portal/examples/ListAllDetailsRequest_example.xml
index b3f70b3934f19997c05400961285f0ddf3dc0859..82c7e8d2ca7c5132918dcb989c494e044e09e434 100644
--- a/103221-1/portal/ListAllDetailsRequest_example.xml
+++ b/103221-1/portal/examples/ListAllDetailsRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.508330Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>09529160-2e44-49c6-bf54-204ca5edcfab</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/portal/ListAllDetailsResponse_example.xml b/103221-1/portal/examples/ListAllDetailsResponse_example.xml
similarity index 94%
rename from 103221-1/portal/ListAllDetailsResponse_example.xml
rename to 103221-1/portal/examples/ListAllDetailsResponse_example.xml
index d762e087b73365559c800809505fc2cf785a6dbc..e5e9096d5182c6ee70d4a2b985f98926054fca27 100644
--- a/103221-1/portal/ListAllDetailsResponse_example.xml
+++ b/103221-1/portal/examples/ListAllDetailsResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.508330Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>09529160-2e44-49c6-bf54-204ca5edcfab</ns1:x1TransactionId>
     <ns1:ListOfXIDs>
       <ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
diff --git a/103221-1/portal/ModifyTaskRequest_example.xml b/103221-1/portal/examples/ModifyTaskRequest_example.xml
similarity index 96%
rename from 103221-1/portal/ModifyTaskRequest_example.xml
rename to 103221-1/portal/examples/ModifyTaskRequest_example.xml
index bb48bac309fe3f2b89de5c5b1ae0911202196c6f..3aa287f6bdc3c1d206acde9728eb15baaf90f052 100644
--- a/103221-1/portal/ModifyTaskRequest_example.xml
+++ b/103221-1/portal/examples/ModifyTaskRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.411587Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>fcfc97de-1c77-413d-9925-d1630acbf763</ns1:x1TransactionId>
     <ns1:taskDetails>
       <ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
diff --git a/103221-1/portal/ModifyTaskResponse_example.xml b/103221-1/portal/examples/ModifyTaskResponse_example.xml
similarity index 93%
rename from 103221-1/portal/ModifyTaskResponse_example.xml
rename to 103221-1/portal/examples/ModifyTaskResponse_example.xml
index adfa3b5eda67629c8c5eb0c3ca076c28f29f3b10..35a9696e376a23a8b1a639fb93da0264c92e78e0 100644
--- a/103221-1/portal/ModifyTaskResponse_example.xml
+++ b/103221-1/portal/examples/ModifyTaskResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.411587Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>fcfc97de-1c77-413d-9925-d1630acbf763</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/portal/PingRequest_example.xml b/103221-1/portal/examples/PingRequest_example.xml
similarity index 92%
rename from 103221-1/portal/PingRequest_example.xml
rename to 103221-1/portal/examples/PingRequest_example.xml
index d9687b61f0d7b232a508748cb0eec9659a693ab5..5eda3b55f8db5a3dfaddf6b8ee7f19b563b13adc 100644
--- a/103221-1/portal/PingRequest_example.xml
+++ b/103221-1/portal/examples/PingRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.547786Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>8f9fc2c5-923a-4a75-b70c-9e0c058bba45</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/portal/PingResponse_example.xml b/103221-1/portal/examples/PingResponse_example.xml
similarity index 93%
rename from 103221-1/portal/PingResponse_example.xml
rename to 103221-1/portal/examples/PingResponse_example.xml
index 9e4dadb53482fe836f4138724fc017773db79adf..7a916ebea5cdab3fbb106608ad3e4c4810e46c3d 100644
--- a/103221-1/portal/PingResponse_example.xml
+++ b/103221-1/portal/examples/PingResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.547786Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>8f9fc2c5-923a-4a75-b70c-9e0c058bba45</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/portal/RemoveAllDestinationsRequest_example.xml b/103221-1/portal/examples/RemoveAllDestinationsRequest_example.xml
similarity index 93%
rename from 103221-1/portal/RemoveAllDestinationsRequest_example.xml
rename to 103221-1/portal/examples/RemoveAllDestinationsRequest_example.xml
index 6b2736585e894f02eb491523f328eced1f0d96d4..8971c0f17c4c357cc07f41e1492515e13a6b8d5e 100644
--- a/103221-1/portal/RemoveAllDestinationsRequest_example.xml
+++ b/103221-1/portal/examples/RemoveAllDestinationsRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.480627Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>88611050-d8e2-4ada-96fc-626b5dbd9cdf</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/portal/RemoveAllDestinationsResponse_example.xml b/103221-1/portal/examples/RemoveAllDestinationsResponse_example.xml
similarity index 93%
rename from 103221-1/portal/RemoveAllDestinationsResponse_example.xml
rename to 103221-1/portal/examples/RemoveAllDestinationsResponse_example.xml
index a057bc2b5a706a1ce4fd372575720521914fe471..a9fb41ff18e9eafa949995a68ea76a05873ee039 100644
--- a/103221-1/portal/RemoveAllDestinationsResponse_example.xml
+++ b/103221-1/portal/examples/RemoveAllDestinationsResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.481629Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>88611050-d8e2-4ada-96fc-626b5dbd9cdf</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/portal/RemoveDestinationRequest_example.xml b/103221-1/portal/examples/RemoveDestinationRequest_example.xml
similarity index 93%
rename from 103221-1/portal/RemoveDestinationRequest_example.xml
rename to 103221-1/portal/examples/RemoveDestinationRequest_example.xml
index a5d3ce1e7b7060411d87a6cb7547cd1aba3ec0c6..655195ff4dd9190ab512d1b9b857f74aac78bbdf 100644
--- a/103221-1/portal/RemoveDestinationRequest_example.xml
+++ b/103221-1/portal/examples/RemoveDestinationRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.473630Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>8c229735-9acf-43ed-8d72-71602625b349</ns1:x1TransactionId>
     <ns1:dId>b0ce308c-aa17-42bd-a27b-287bcb5b3468</ns1:dId>
   </ns1:x1RequestMessage>
diff --git a/103221-1/portal/RemoveDestinationResponse_example.xml b/103221-1/portal/examples/RemoveDestinationResponse_example.xml
similarity index 93%
rename from 103221-1/portal/RemoveDestinationResponse_example.xml
rename to 103221-1/portal/examples/RemoveDestinationResponse_example.xml
index ec910e3ccb2ec6f5d5df97f505e7eb3c41be72ed..81d74cae760f7db062919610c0786424588ba3cf 100644
--- a/103221-1/portal/RemoveDestinationResponse_example.xml
+++ b/103221-1/portal/examples/RemoveDestinationResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.474625Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>8c229735-9acf-43ed-8d72-71602625b349</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/portal/ReportDestinationIssueRequest_example.xml b/103221-1/portal/examples/ReportDestinationIssueRequest_example.xml
similarity index 95%
rename from 103221-1/portal/ReportDestinationIssueRequest_example.xml
rename to 103221-1/portal/examples/ReportDestinationIssueRequest_example.xml
index 0f33e2b08470c34d3c9b514b209fd5d496cf8a22..3b8418cf4ac63a36b9d5d998074675cde5f72f1c 100644
--- a/103221-1/portal/ReportDestinationIssueRequest_example.xml
+++ b/103221-1/portal/examples/ReportDestinationIssueRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.526329Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>7e3ff959-55b0-47bd-a417-0d0383252150</ns1:x1TransactionId>
     <ns1:dId>b0ce308c-aa17-42bd-a27b-287bcb5b3468</ns1:dId>
     <ns1:destinationReportType>NonTerminatingFault</ns1:destinationReportType>
diff --git a/103221-1/portal/ReportDestinationIssueResponse_example.xml b/103221-1/portal/examples/ReportDestinationIssueResponse_example.xml
similarity index 93%
rename from 103221-1/portal/ReportDestinationIssueResponse_example.xml
rename to 103221-1/portal/examples/ReportDestinationIssueResponse_example.xml
index 44f33816710a252971b05425a44a3bf672235aec..ec35dfb03c1d6dcab446eb5a02bbec06ce52766d 100644
--- a/103221-1/portal/ReportDestinationIssueResponse_example.xml
+++ b/103221-1/portal/examples/ReportDestinationIssueResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.526329Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>7e3ff959-55b0-47bd-a417-0d0383252150</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/portal/ReportNEIssueRequest_example.xml b/103221-1/portal/examples/ReportNEIssueRequest_example.xml
similarity index 94%
rename from 103221-1/portal/ReportNEIssueRequest_example.xml
rename to 103221-1/portal/examples/ReportNEIssueRequest_example.xml
index b06c96960007fa640bd60492803b1874ae42bb58..5df53cb7f72ab8b5eb318289368437a36138d99e 100644
--- a/103221-1/portal/ReportNEIssueRequest_example.xml
+++ b/103221-1/portal/examples/ReportNEIssueRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.531784Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b</ns1:x1TransactionId>
     <ns1:typeOfNeIssueMessage>Warning</ns1:typeOfNeIssueMessage>
     <ns1:description>Example NE issue</ns1:description>
diff --git a/103221-1/portal/ReportNEIssueResponse_example.xml b/103221-1/portal/examples/ReportNEIssueResponse_example.xml
similarity index 93%
rename from 103221-1/portal/ReportNEIssueResponse_example.xml
rename to 103221-1/portal/examples/ReportNEIssueResponse_example.xml
index ab2a6b8088ea27604e656bb0ce5e778bfa3dcd2f..d18e2812f95794d38382bd855f81e6cb113b4415 100644
--- a/103221-1/portal/ReportNEIssueResponse_example.xml
+++ b/103221-1/portal/examples/ReportNEIssueResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.531784Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/portal/ReportTaskIssueRequest_example.xml b/103221-1/portal/examples/ReportTaskIssueRequest_example.xml
similarity index 94%
rename from 103221-1/portal/ReportTaskIssueRequest_example.xml
rename to 103221-1/portal/examples/ReportTaskIssueRequest_example.xml
index ddbe803817b8ec7061fcd2f3d3de2e75e78b3a61..162bd255f29eb04f66237a872fc44c4f9b063ff7 100644
--- a/103221-1/portal/ReportTaskIssueRequest_example.xml
+++ b/103221-1/portal/examples/ReportTaskIssueRequest_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.516321Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295</ns1:x1TransactionId>
     <ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
     <ns1:taskReportType>NonTerminatingFault</ns1:taskReportType>
diff --git a/103221-1/portal/ReportTaskIssueResponse_example.xml b/103221-1/portal/examples/ReportTaskIssueResponse_example.xml
similarity index 93%
rename from 103221-1/portal/ReportTaskIssueResponse_example.xml
rename to 103221-1/portal/examples/ReportTaskIssueResponse_example.xml
index eac29799a50d22f2d273ac67fd82e81f64151c08..a46017ff6cf642b3173ed82d11b6a01659cd30c7 100644
--- a/103221-1/portal/ReportTaskIssueResponse_example.xml
+++ b/103221-1/portal/examples/ReportTaskIssueResponse_example.xml
@@ -4,7 +4,7 @@
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
     <ns1:messageTimestamp>2017-10-06T18:46:21.517323Z</ns1:messageTimestamp>
-    <ns1:version>v1.5.1</ns1:version>
+    <ns1:version>v1.6.1</ns1:version>
     <ns1:x1TransactionId>5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295</ns1:x1TransactionId>
     <ns1:oK>AcknowledgedAndCompleted</ns1:oK>
   </ns1:x1ResponseMessage>
diff --git a/103221-1/portal/examples/desktop.ini b/103221-1/portal/examples/desktop.ini
new file mode 100644
index 0000000000000000000000000000000000000000..8b699c692d358fa29d7ac0976e524fe25c5da053
Binary files /dev/null and b/103221-1/portal/examples/desktop.ini differ
diff --git a/103221-1/portal/validate_examples.py b/103221-1/portal/validate_examples.py
index 0faa18a76d037313e6e238222c49acaa559b4c16..a22c986f0c122fe00ec025acad8bd8805a03ce3b 100644
--- a/103221-1/portal/validate_examples.py
+++ b/103221-1/portal/validate_examples.py
@@ -1,5 +1,6 @@
 import glob
 import sys
+from pathlib import Path
 
 
 XS = 'http://www.w3.org/2001/XMLSchema'
@@ -46,7 +47,8 @@ def load_schema(xsd):
     imports = xsd_doc.xpath('//*/xs:import', namespaces={'xs': XS})
 
     for xsd_import in imports:
-        xsd_import.attrib['schemaLocation'] = common_xsd[0]
+        xsd_import.attrib['schemaLocation'] = str(Path(common_xsd[0]))
+        print (xsd_import.attrib)
 
     # Load TS 103 221-1 XSD as a schema